Changeset 251

Show
Ignore:
Timestamp:
03/02/06 23:21:24
Author:
douglm
Message:

Locale + unused

Remove unused class

Make use of locale more obvious to highlight need to recreate objects when locale is changed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/appcommon/src/org/bedework/appcommon/EventFormatter.java

    r47 r251  
    6161 
    6262import java.io.Serializable; 
     63import java.util.Date; 
     64import java.util.Locale; 
    6365 
    6466import org.apache.log4j.Logger; 
    …… 
    144146  public MyCalendarVO getToday() { 
    145147    if (today == null) { 
    146       // XXX Locale? 
    147       today = new MyCalendarVO(); 
     148      Locale loc = Locale.getDefault();  // XXX Locale 
     149      today = new MyCalendarVO(new Date(System.currentTimeMillis()), loc); 
    148150    } 
    149151 

  • trunk/calendar3/appcommon/src/org/bedework/appcommon/MyCalendarVO.java

    r2 r251  
    2929package org.bedework.appcommon; 
    3030 
    31 import org.bedework.calfacade.BwDateTime; 
    32 import org.bedework.calfacade.CalFacadeException; 
    33 import org.bedework.calfacade.CalFacadeUtil; 
    34  
    3531import java.io.Serializable; 
    3632import java.text.DateFormat; 
    …… 
    6157  private DateFormat isoformat = new SimpleDateFormat("yyyyMMdd"); 
    6258 
    63   /** Create a MyCalendarVO object representing the current date and time. 
    64    */ 
    65   public MyCalendarVO() { 
    66     this(new Date(System.currentTimeMillis()), Locale.getDefault()); 
    67   } 
    68  
    69   /** Create a MyCalendarVO object representing a particular date and time. 
    70    * 
    71    * @param date   Non-null Date object. 
    72    */ 
    73   public MyCalendarVO(Date date) { 
    74     this(date, Locale.getDefault()); 
    75   } 
    76  
    7759  /** Create a MyCalendarVO object representing a particular date and time 
    7860   * in the given locale. 
    …… 
    8971 
    9072    calendar.setTime(date); 
    91   } 
    92  
    93   /** Create a MyCalendarVO object representing a particular DateTime 
    94    * object. 
    95    * 
    96    * @param dtm   Non-null BwDateTime object. 
    97    * @throws CalFacadeException 
    98    */ 
    99   public MyCalendarVO(BwDateTime dtm) throws CalFacadeException { 
    100     this(CalFacadeUtil.getDate(dtm)); 
    10173  } 
    10274 

  • trunk/calendar3/appcommon/src/org/bedework/appcommon/TimeView.java

    r191 r251  
    6868import java.io.Serializable; 
    6969import java.util.Collection; 
     70import java.util.Date; 
    7071import java.util.Iterator; 
     72import java.util.Locale; 
    7173import java.util.Vector; 
    7274 
    …… 
    432434      gtpi.year = String.valueOf(gtpi.currentDay.getYear()); 
    433435 
    434       gtpi.todaysMonth = new MyCalendarVO().getTwoDigitMonth(); 
     436      Locale loc = Locale.getDefault(); // XXX Locale 
     437      gtpi.todaysMonth = new MyCalendarVO(   // XXX Expensive?? 
     438                                          new Date(System.currentTimeMillis()),  
     439                                          loc).getTwoDigitMonth(); 
    435440 
    436441      if (debug) { 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwActionForm.java

    r55 r251  
    5555package org.bedework.webclient; 
    5656 
     57import java.util.Date; 
     58import java.util.Locale; 
     59 
    5760import org.bedework.appcommon.CheckData; 
    5861import org.bedework.appcommon.EventFormatter; 
    …… 
    151154  public void setDate(String val) { 
    152155    if (!CheckData.checkDateString(val)) { 
    153       date = new MyCalendarVO().getDateDigits(); 
     156      Locale loc = Locale.getDefault();  // XXX Locale 
     157      date = new MyCalendarVO(new Date(System.currentTimeMillis()), loc).getDateDigits(); 
    154158    } else { 
    155159      date = val; 

  • trunk/calendar3/webclient/src/org/bedework/webclient/BwGoToAction.java

    r85 r251  
    6161import org.bedework.webcommon.TimeDateComponents; 
    6262 
    63  
     63import java.util.Date; 
     64import java.util.Locale; 
    6465 
    6566import javax.servlet.http.HttpServletRequest; 
    …… 
    115116    MyCalendarVO dt; 
    116117    TimeView tv = form.getCurTimeView(); 
     118    Locale loc = Locale.getDefault();  // XXX Locale 
    117119 
    118120    if (newViewTypeI == BedeworkDefs.todayView) { 
    119121      // dt = new MyCalendarVO(new Date(System.currentTimeMillis())); 
    120       dt = new MyCalendarVO(); 
     122      Date jdt = new Date(System.currentTimeMillis()); 
     123      dt = new MyCalendarVO(jdt, loc); 
    121124      newView = true; 
    122125      newViewTypeI = BedeworkDefs.dayView; 
    …… 
    124127      if (newViewTypeI == BedeworkDefs.dayView) { 
    125128        // selected specific day to display from personal event entry screen. 
    126         dt = new MyCalendarVO(form.getViewStartDate().getDateTime()); 
     129         
     130        Date jdt = CalFacadeUtil.getDate(form.getViewStartDate().getDateTime()); 
     131        dt = new MyCalendarVO(jdt, loc); 
    127132        newView = true; 
    128133      } else { 
    …… 
    139144      } 
    140145 
    141       dt = new MyCalendarVO(CalFacadeUtil.fromISODate(date)); 
     146      Date jdt = CalFacadeUtil.fromISODate(date); 
     147      dt = new MyCalendarVO(jdt, loc); 
    142148      newView = true; 
    143149    } 
    …… 
    170176        newView = true; 
    171177        newViewTypeI = form.getCurViewPeriod(); 
    172         dt = new MyCalendarVO(CalFacadeUtil.fromISODate(vsdate)); 
     178        Date jdt = CalFacadeUtil.fromISODate(vsdate); 
     179        dt = new MyCalendarVO(jdt, loc); 
    173180      } 
    174181    } 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/BwActionFormBase.java

    r249 r251  
    9090import java.text.Collator; 
    9191import java.util.Collection; 
     92import java.util.Date; 
    9293import java.util.HashMap; 
    9394import java.util.Iterator; 
     95import java.util.Locale; 
    9496import java.util.TreeMap; 
    9597import java.util.Vector; 
    …… 
    838840  public MyCalendarVO getToday() { 
    839841    if (today == null) { 
    840       // XXX locale 
    841       today = new MyCalendarVO(); 
     842      Locale loc = Locale.getDefault();  // XXX Locale 
     843      today = new MyCalendarVO(new Date(System.currentTimeMillis()), loc); 
    842844    } 
    843845    return today; 
    …… 
    11251127        } 
    11261128 
    1127         setViewMcDate(new MyCalendarVO()); 
     1129        Locale loc = Locale.getDefault();  // XXX Locale 
     1130        setViewMcDate(new MyCalendarVO(new Date(System.currentTimeMillis()), loc)); 
    11281131        refreshView(); 
    11291132      }