Author: ayanul Date: 2007-09-17 11:23:49 -0400 (Mon, 17 Sep 2007) New Revision: 2960 Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml Log: Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-09-17 14:25:25 UTC (rev 2959) +++ trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-09-17 15:23:49 UTC (rev 2960) @@ -25,6 +25,7 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; +import java.util.StringTokenizer; import java.util.TimeZone; import javax.faces.event.ValueChangeEvent; @@ -56,8 +57,8 @@ private boolean required; private Date currentDate; private Date selectedDate; - private Date preloadDateRangeBegin; - private Date preloadDateRangeEnd; + private String preloadDateRangeBegin; + private String preloadDateRangeEnd; private String weekDay; private String month; private String height; @@ -149,10 +150,47 @@ weekDay = "none"; month = "none"; timeZone = "Eastern European Time"; - preloadDateRangeBegin = new Date("January 01, 2007"); - preloadDateRangeEnd = new Date(); + preloadDateRangeBegin = "2007.7.3"; + preloadDateRangeEnd = "2008.7.3"; } + + public Date getPrDateRangeBegin() { + Calendar cal = Calendar.getInstance(); + StringTokenizer st = new StringTokenizer(preloadDateRangeBegin,"."); + String [] date = new String[3]; + try { + if(st.hasMoreElements()) { + cal.set(Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken())); + } + } catch (Exception e) { + e.printStackTrace(); + cal.set(Calendar.DAY_OF_YEAR, Calendar.DAY_OF_MONTH, Calendar.DAY_OF_WEEK); + System.out.println(cal.getTime()); + return cal.getTime(); + } + System.out.println(cal.getTime()); + return cal.getTime(); + + } + public Date getPrDateRangeEnd() { + Calendar cal = Calendar.getInstance(); + StringTokenizer st = new StringTokenizer(preloadDateRangeEnd, "."); + String [] date = new String[3]; + try { + if(st.hasMoreElements()) { + cal.set(Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken())); + } + } catch (Exception e) { + e.printStackTrace(); + cal.set(Calendar.DAY_OF_YEAR, Calendar.DAY_OF_MONTH, Calendar.DAY_OF_WEEK); + System.out.println(cal.getTime()); + return cal.getTime(); + } + System.out.println(cal.getTime()); + return cal.getTime(); + } + public boolean isShowInput() { return showInput; } @@ -389,27 +427,27 @@ this.label = label; } - public Date getPreloadDateRangeBegin() { + public TimeZone getTmZone() { + TimeZone tZone = TimeZone.getDefault(); + System.out.println("timeZone" + timeZone + " tZone " + tZone); + tZone.setID(timeZone); + System.out.println("timeZone" + timeZone + " tZone " + tZone); + return tZone; + } + + public String getPreloadDateRangeBegin() { return preloadDateRangeBegin; } - public void setPreloadDateRangeBegin(Date preloadDateRangeBegin) { + public void setPreloadDateRangeBegin(String preloadDateRangeBegin) { this.preloadDateRangeBegin = preloadDateRangeBegin; } - public Date getPreloadDateRangeEnd() { + public String getPreloadDateRangeEnd() { return preloadDateRangeEnd; } - public void setPreloadDateRangeEnd(Date preloadDateRangeEnd) { + public void setPreloadDateRangeEnd(String preloadDateRangeEnd) { this.preloadDateRangeEnd = preloadDateRangeEnd; } - - public TimeZone getTmZone() { - TimeZone tZone = TimeZone.getDefault(); - System.out.println("timeZone" + timeZone + " tZone " + tZone); - tZone.setID(timeZone); - System.out.println("timeZone" + timeZone + " tZone " + tZone); - return tZone; - } } Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-17 14:25:25 UTC (rev 2959) +++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-17 15:23:49 UTC (rev 2960) @@ -24,8 +24,8 @@ <rich:calendar id="calendarID" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" datePattern="#{calendarBean.pattern}" - preloadDateRangeBegin="#{calendarBean.pDateRangeBegin}" - preloadDateRangeEnd="#{calendarBean.pDateRangeEnd}" + preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" + preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" weekDayLabels="#{calendarBean.weekDayLabels}" weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" monthLabels="#{calendarBean.monthLabels}"