Author: ayanul Date: 2007-09-15 07:19:28 -0400 (Sat, 15 Sep 2007) New Revision: 2950 Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml Log: update Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-09-15 00:10:06 UTC (rev 2949) +++ trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-09-15 11:19:28 UTC (rev 2950) @@ -22,37 +22,46 @@ package calendar; import java.text.DateFormat; +import java.util.Calendar; import java.util.Date; import java.util.Locale; import java.util.TimeZone; + import javax.faces.event.ValueChangeEvent; import org.richfaces.event.CurrentDateChangeEvent; public class CalendarBean { - private static final String [] WEEK_DAY_LABELS = new String [] { "Sun *", + private static final String[] WEEK_DAY_LABELS = new String[] { "Sun *", "Mon +", "Tue +", "Wed +", "Thu +", "Fri +", "Sat *" }; - private static final String [] WEEK_DAY = new String [] {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"}; - private static final String [] MOUNT_LABELS = new String [] {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}; - private static final String [] MOUNT_LABELS_SHORT = new String [] {"Jan +", "Feb +", "Mar +", "Apr +", "May +", "Jun +", "Jul +", "Aug +", "Sep +", "Oct +", "Nov +", "Dec +"}; - + private static final String[] WEEK_DAY = new String[] { "Monday", + "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday" }; + private static final String[] MOUNT_LABELS = new String[] { "January", + "February", "March", "April", "May", "June", "July", "August", + "September", "October", "November", "December" }; + private static final String[] MOUNT_LABELS_SHORT = new String[] { "Jan +", + "Feb +", "Mar +", "Apr +", "May +", "Jun +", "Jul +", "Aug +", + "Sep +", "Oct +", "Nov +", "Dec +" }; + private Locale locale; private boolean popup; private boolean readonly; private boolean showInput; - private boolean enableManualInput; + private boolean enableManualInput; private boolean ajaxSingle; private boolean disabled; private boolean bypassUpdates; private boolean rendered; - private boolean useCustomDayLabels; - private boolean useCustomDay; - private boolean useCustomMountLabels; - private boolean useCustomMountLabelsShort; private boolean required; private Date currentDate; private Date selectedDate; + private Date preloadDateRangeBegin; + private Date preloadDateRangeEnd; + private String useWeekDayLabels; + private String useWeekDay; + private String useCustomMountLabels; + private String useCustomMountLabelsShort; private String height; private String width; private String pattern; @@ -63,9 +72,19 @@ private String toolTipMode; private String scrollMode; private String label; + + private TimeZone timeZone; private int zindex; private int counter; - + + public TimeZone getTimeZone() { + return timeZone; + } + + public void setTimeZone(TimeZone timeZone) { + this.timeZone = timeZone; + } + public void changeIcons() { if (icon != null) { icon = null; @@ -75,7 +94,7 @@ label = null; } } - + public Locale getLocale() { return locale; } @@ -97,7 +116,7 @@ } public void setPattern(String pattern) { - + this.pattern = pattern; } @@ -118,8 +137,8 @@ jointPoint = "bottom-left"; direction = "bottom-right"; readonly = true; - enableManualInput=false; - showInput=true; + enableManualInput = false; + showInput = true; boundary = "inactive"; icon = null; disabled = false; @@ -129,13 +148,15 @@ toolTipMode = "none"; scrollMode = "client"; required = false; - useCustomDay = false; - useCustomDayLabels = false; - useCustomMountLabels = false; - useCustomMountLabelsShort = false; + useWeekDay = "none"; + useWeekDayLabels = "none"; + useCustomMountLabels = "none"; + useCustomMountLabelsShort = "none"; + timeZone = TimeZone.getDefault(); + preloadDateRangeBegin = new Date("January 01, 2007"); + preloadDateRangeEnd = new Date(); } - - + public boolean isShowInput() { return showInput; } @@ -169,46 +190,75 @@ } } - public boolean isUseCustomDayLabels() { - return useCustomDayLabels; - } + // public Object getMonthLabelsShort() { + // if (isUseCustomMountLabelsShort()) { + // return CalendarBean.MOUNT_LABELS_SHORT; + // } else { + // return null; + // } + // } - public void setUseCustomDayLabels(boolean useCustomDayLabels) { - this.useCustomDayLabels = useCustomDayLabels; - } - - public Object getUseCustomMountLabelsShort() { - if (isUseCustomMountLabelsShort()) { + public Object getMonthLabels() { + if (useCustomMountLabels == "long") + return CalendarBean.MOUNT_LABELS; + else if (useCustomMountLabelsShort == "short") return CalendarBean.MOUNT_LABELS_SHORT; - } else { + else return null; - } - } - public Object getUseCustomMountLabels() { - if (isUseCustomMountLabels()) { - return CalendarBean.MOUNT_LABELS; - } else { - return null; - } } - public Object getWeekDayLabelsShort() { - if (isUseCustomDayLabels()) { + // public Object getWeekDayLabelsShort() { + // if (isUseWeekDayLabels()) { + // return CalendarBean.WEEK_DAY_LABELS; + // } else { + // return null; + // } + // } + + + public Object getWeekDayLabels() { + if (useWeekDay == "long") + return CalendarBean.WEEK_DAY; + else if (useWeekDayLabels == "short") return CalendarBean.WEEK_DAY_LABELS; - } else { + else return null; - } + } - public Object getWeekDayLabels() { - if (isUseCustomDay()) { - return CalendarBean.WEEK_DAY; - } else { - return null; - } + public String getUseWeekDayLabels() { + return useWeekDayLabels; } + public void setUseWeekDayLabels(String useWeekDayLabels) { + this.useWeekDayLabels = useWeekDayLabels; + } + + public String getUseWeekDay() { + return useWeekDay; + } + + public void setUseWeekDay(String useWeekDay) { + this.useWeekDay = useWeekDay; + } + + public String getUseCustomMountLabels() { + return useCustomMountLabels; + } + + public void setUseCustomMountLabels(String useCustomMountLabels) { + this.useCustomMountLabels = useCustomMountLabels; + } + + public String getUseCustomMountLabelsShort() { + return useCustomMountLabelsShort; + } + + public void setUseCustomMountLabelsShort(String useCustomMountLabelsShort) { + this.useCustomMountLabelsShort = useCustomMountLabelsShort; + } + public String getCurrentDateAsText() { Date currentDate = getCurrentDate(); if (currentDate != null) { @@ -266,14 +316,16 @@ public void setBoundary(String boundary) { this.boundary = boundary; } - public void dcl(CurrentDateChangeEvent event){ + + public void dcl(CurrentDateChangeEvent event) { System.out.println(event.getCurrentDateString()); System.out.println("ajvhckndskncs"); } - public void ddd(ValueChangeEvent event){ + + public void ddd(ValueChangeEvent event) { System.out.println(event.getOldValue()); System.out.println(event.getNewValue()); - + } public int getCounter() { @@ -360,18 +412,6 @@ this.width = width; } - - - public boolean isUseCustomDay() { - return useCustomDay; - } - - - - public void setUseCustomDay(boolean useCustomDay) { - this.useCustomDay = useCustomDay; - } - public boolean isRequired() { return required; } @@ -380,27 +420,27 @@ this.required = required; } - public boolean isUseCustomMountLabels() { - return useCustomMountLabels; + public String getLabel() { + return label; } - public void setUseCustomMountLabels(boolean useCustomMountLabels) { - this.useCustomMountLabels = useCustomMountLabels; + public void setLabel(String label) { + this.label = label; } - public boolean isUseCustomMountLabelsShort() { - return useCustomMountLabelsShort; + public Date getPreloadDateRangeBegin() { + return preloadDateRangeBegin; } - public void setUseCustomMountLabelsShort(boolean useCustomMountLabelsShort) { - this.useCustomMountLabelsShort = useCustomMountLabelsShort; + public void setPreloadDateRangeBegin(Date preloadDateRangeBegin) { + this.preloadDateRangeBegin = preloadDateRangeBegin; } - public String getLabel() { - return label; + public Date getPreloadDateRangeEnd() { + return preloadDateRangeEnd; } - public void setLabel(String label) { - this.label = label; + public void setPreloadDateRangeEnd(Date preloadDateRangeEnd) { + this.preloadDateRangeEnd = preloadDateRangeEnd; } } Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-15 00:10:06 UTC (rev 2949) +++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-15 11:19:28 UTC (rev 2950) @@ -24,10 +24,12 @@ <rich:calendar id="calendarID" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" datePattern="#{calendarBean.pattern}" - weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" + preloadDateRangeBegin="#{calendarBean.preloadDateRangeBegin}" + preloadDateRangeEnd="#{calendarBean.preloadDateRangeEnd}" + weekDayLabelsShort="#{calendarBean.weekDayLabels}" weekDayLabels="#{calendarBean.weekDayLabels}" - monthLabels="#{calendarBean.useCustomMountLabels}" - monthLabelsShort="#{calendarBean.useCustomMountLabelsShort}" + monthLabels="#{calendarBean.monthLabels}" + monthLabelsShort="#{calendarBean.monthLabels}" value="#{calendarBean.selectedDate}" currentDate="#{calendarBean.currentDate}" jointPoint="#{calendarBean.jointPoint}" @@ -50,6 +52,7 @@ scrollMode="#{calendarBean.scrollMode}" rendered="#{calendarBean.rendered}" focus="popupModeID" + timeZone="#{calendarBean.timeZone}" required="#{calendarBean.required}" requiredMessage="Required Message"> <f:facet name="optionalHeader"> @@ -86,23 +89,23 @@ <h:selectBooleanCheckbox id="popupModeID" value="#{calendarBean.popup}" onclick="submit()" /> - <h:outputText value="Custom day labels short:" /> - <h:selectBooleanCheckbox value="#{calendarBean.useCustomDayLabels}" - onclick="submit()" /> - <h:outputText value="Custom day labels" /> - <h:selectBooleanCheckbox value="#{calendarBean.useCustomDay}" - onclick="submit()" /> - + <h:selectOneRadio value="#{calendarBean.useWeekDay}" + onclick="submit()" > + <f:selectItem itemLabel="none" itemValue="none"/> + <f:selectItem itemLabel="day labels" itemValue="long"/> + <f:selectItem itemLabel="day labels short" itemValue="short"/> + </h:selectOneRadio> + <h:outputText value="Custom mount labels" /> - <h:selectBooleanCheckbox value="#{calendarBean.useCustomMountLabels}" - onclick="submit()" /> + <h:selectOneRadio value="#{calendarBean.useCustomMountLabels}" + onclick="submit()" > + <f:selectItem itemLabel="none" itemValue="none"/> + <f:selectItem itemLabel="day labels" itemValue="long"/> + <f:selectItem itemLabel="day labels short" itemValue="short"/> + </h:selectOneRadio> - <h:outputText value="Custom mount labels short" /> - <h:selectBooleanCheckbox value="#{calendarBean.useCustomMountLabelsShort}" - onclick="submit()" /> - <h:outputText value="Select Date Pattern:" /> <h:selectOneMenu value="MMM d, yyyy" onchange="submit()" valueChangeListener="#{calendarBean.selectPattern}"> @@ -115,7 +118,13 @@ <h:inputText id="selectdate" /> <h:commandButton type="button" value="Select Date" onclick="$(this.form.id+':calendarID').component.selectDate(this.form[this.form.id+':selectdate'].value);" /> - + + <h:outputText value="Preload date range begin" /> + <h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/> + + <h:outputText value="Preload date range end" /> + <h:inputText value="#{calendarBean.preloadDateRangeEnd}" onchange="submit();"/> + <h:outputText value="z-index:" /> <h:inputText value="#{calendarBean.zindex}"> <a4j:support event="onchange" reRender="calendarID"></a4j:support> @@ -157,6 +166,14 @@ <f:selectItem itemLabel="top-left" itemValue="top-left" /> <f:selectItem itemLabel="auto" itemValue="auto" /> </h:selectOneRadio> + + <h:outputText value="Time Zone:" /> + <h:selectOneRadio value="#{calendarBean.timeZone}" onchange="submit();"> + <f:selectItem itemLabel="GMT+20:00" itemValue="GMT+20:00"/> + <f:selectItem itemLabel="GMT+50:00" itemValue="GMT+50:00"/> + <f:selectItem itemLabel="GMT+90:00" itemValue="GMT+90:00"/> + </h:selectOneRadio> + <h:outputText value="ToolTip Mode:" /> <h:selectOneRadio value="#{calendarBean.toolTipMode}" onchange="submit();">