[richfaces-svn-commits] JBoss Rich Faces SVN: r2968 - in trunk/test-applications/jsp/src/main: webapp/Calendar and 1 other directory.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Sep 17 13:42:06 EDT 2007
Author: ayanul
Date: 2007-09-17 13:42:05 -0400 (Mon, 17 Sep 2007)
New Revision: 2968
Modified:
trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
Log:
update
Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-09-17 17:42:00 UTC (rev 2967)
+++ trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-09-17 17:42:05 UTC (rev 2968)
@@ -21,38 +21,50 @@
package calendar;
+import java.lang.reflect.Array;
import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
+import java.util.StringTokenizer;
import java.util.TimeZone;
+
+import javax.faces.component.UIComponent;
import javax.faces.event.ValueChangeEvent;
+import javax.faces.webapp.UIComponentTag;
import org.richfaces.event.CurrentDateChangeEvent;
public class CalendarBean {
- private static final String [] WEEK_DAY_LABELS = new String [] { "Sun *",
+ private static final String [] WEEK_DAY_SHORT = 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 String preloadDateRangeBegin;
+ private String preloadDateRangeEnd;
+ private String weekDay;
+ private String month;
private String height;
private String width;
private String pattern;
@@ -63,9 +75,19 @@
private String toolTipMode;
private String scrollMode;
private String label;
+ private String timeZone;
private int zindex;
private int counter;
+
+ public String getTimeZone() {
+ return timeZone;
+ }
+
+ public void setTimeZone(String timeZone) {
+ this.timeZone = timeZone;
+ }
+
public void changeIcons() {
if (icon != null) {
icon = null;
@@ -75,7 +97,7 @@
label = null;
}
}
-
+
public Locale getLocale() {
return locale;
}
@@ -97,7 +119,7 @@
}
public void setPattern(String pattern) {
-
+
this.pattern = pattern;
}
@@ -118,8 +140,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 +151,38 @@
toolTipMode = "none";
scrollMode = "client";
required = false;
- useCustomDay = false;
- useCustomDayLabels = false;
- useCustomMountLabels = false;
- useCustomMountLabelsShort = false;
+ weekDay = "none";
+ month = "none";
+ timeZone = "Eastern European Time";
+ preloadDateRangeBegin = "10.09.2007";
+ preloadDateRangeEnd = "11.10.2007";
}
-
+ public Date getPrDateRangeBegin() {
+ Calendar cal = Calendar.getInstance();
+ StringTokenizer st = new StringTokenizer(preloadDateRangeBegin,".");
+ ArrayList<Integer> date = new ArrayList<Integer>();
+ while(st.hasMoreTokens()) {
+ date.add(Integer.parseInt(st.nextToken()));
+ }
+ cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0);
+ System.out.println(cal.getTime());
+ return cal.getTime();
+
+ }
+
+ public Date getPrDateRangeEnd() {
+ Calendar cal = Calendar.getInstance();
+ StringTokenizer st = new StringTokenizer(preloadDateRangeEnd, ".");
+ ArrayList<Integer> date = new ArrayList<Integer>();
+ while(st.hasMoreTokens()) {
+ date.add(Integer.parseInt(st.nextToken()));
+ }
+ cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0);
+ System.out.println(cal.getTime());
+ return cal.getTime();
+ }
+
public boolean isShowInput() {
return showInput;
}
@@ -169,46 +216,40 @@
}
}
- public boolean isUseCustomDayLabels() {
- return useCustomDayLabels;
+ public Object getWeekDayLabels() {
+ if(weekDay.equals("long"))
+ return CalendarBean.WEEK_DAY;
+ else return null;
}
- public void setUseCustomDayLabels(boolean useCustomDayLabels) {
- this.useCustomDayLabels = useCustomDayLabels;
+ public Object getWeekDayLabelsShort() {
+ if(weekDay.equals("short"))
+ return CalendarBean.WEEK_DAY_SHORT;
+ else return null;
}
- public Object getUseCustomMountLabelsShort() {
- if (isUseCustomMountLabelsShort()) {
- return CalendarBean.MOUNT_LABELS_SHORT;
- } else {
- return null;
- }
- }
-
- public Object getUseCustomMountLabels() {
- if (isUseCustomMountLabels()) {
+ public Object getMonthLabels() {
+ if(month.equals("long"))
return CalendarBean.MOUNT_LABELS;
- } else {
- return null;
- }
+ else return null;
}
-
- public Object getWeekDayLabelsShort() {
- if (isUseCustomDayLabels()) {
- return CalendarBean.WEEK_DAY_LABELS;
- } else {
- return null;
- }
+
+ public void weekDay(ValueChangeEvent event) {
+ weekDay = (String) event.getNewValue();
}
- public Object getWeekDayLabels() {
- if (isUseCustomDay()) {
- return CalendarBean.WEEK_DAY;
- } else {
- return null;
- }
+ public Object getMonthLabelsShort() {
+ if(month.equals("short"))
+ return CalendarBean.MOUNT_LABELS_SHORT;
+ else return null;
+
}
+
+ public void month(ValueChangeEvent event) {
+ month = (String) event.getNewValue();
+ }
+
public String getCurrentDateAsText() {
Date currentDate = getCurrentDate();
if (currentDate != null) {
@@ -266,14 +307,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 +403,6 @@
this.width = width;
}
-
-
- public boolean isUseCustomDay() {
- return useCustomDay;
- }
-
-
-
- public void setUseCustomDay(boolean useCustomDay) {
- this.useCustomDay = useCustomDay;
- }
-
public boolean isRequired() {
return required;
}
@@ -380,27 +411,35 @@
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 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 void setUseCustomMountLabelsShort(boolean useCustomMountLabelsShort) {
- this.useCustomMountLabelsShort = useCustomMountLabelsShort;
+ public String getPreloadDateRangeBegin() {
+ return preloadDateRangeBegin;
}
- public String getLabel() {
- return label;
+ public void setPreloadDateRangeBegin(String preloadDateRangeBegin) {
+ this.preloadDateRangeBegin = preloadDateRangeBegin;
}
- public void setLabel(String label) {
- this.label = label;
+ public String getPreloadDateRangeEnd() {
+ return preloadDateRangeEnd;
}
+
+ public void setPreloadDateRangeEnd(String preloadDateRangeEnd) {
+ this.preloadDateRangeEnd = preloadDateRangeEnd;
+ }
}
Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-09-17 17:42:00 UTC (rev 2967)
+++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-09-17 17:42:05 UTC (rev 2968)
@@ -20,16 +20,18 @@
<rich:calendar id="calendarID" dataModel="#{calendarDataModel}"
locale="#{calendarBean.locale}" popup="#{calendarBean.popup}"
datePattern="#{calendarBean.pattern}"
- weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}"
- weekDayLabels="#{calendarBean.weekDayLabels}"
- monthLabels="#{calendarBean.useCustomMountLabels}"
- monthLabelsShort="#{calendarBean.useCustomMountLabelsShort}"
- value="#{calendarBean.selectedDate}" buttonLabel="#{calendarBean.label}"
+ preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}"
+ preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}"
+ weekDayLabels="#{calendarBean.weekDayLabels}"
+ weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}"
+ monthLabels="#{calendarBean.monthLabels}"
+ monthLabelsShort="#{calendarBean.monthLabelsShort}"
+ value="#{calendarBean.selectedDate}"
currentDate="#{calendarBean.currentDate}"
jointPoint="#{calendarBean.jointPoint}"
- direction="#{calendarBean.direction}"
+ direction="#{calendarBean.direction}"
enableManualInput="#{calendarBean.enableManualInput}"
- showInput="#{calendarBean.showInput}"
+ showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}"
boundaryDatesMode="#{calendarBean.boundary}"
currentDateChangeListener="#{calendarBean.dcl}"
valueChangeListener="#{calendarBean.ddd}" reRender="counter"
@@ -46,6 +48,7 @@
scrollMode="#{calendarBean.scrollMode}"
rendered="#{calendarBean.rendered}"
focus="popupModeID"
+ timeZone="#{calendarBean.tmZone}"
required="#{calendarBean.required}"
requiredMessage="Required Message">
<f:facet name="optionalHeader">
@@ -82,23 +85,22 @@
<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 valueChangeListener="#{calendarBean.weekDay}"
+ 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 month labels" />
+ <h:selectOneRadio valueChangeListener="#{calendarBean.month}"
+ 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: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}">
@@ -111,7 +113,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(d.m.y)" />
+ <h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/>
+
+ <h:outputText value="Preload date range end(d.m.y)" />
+ <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>
@@ -153,6 +161,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="Eastern European Time" itemValue="Eastern European Time"/>
+ <f:selectItem itemLabel="Turkmenistan Time" itemValue="Turkmenistan Time"/>
+ <f:selectItem itemLabel="Korea Standard Time" itemValue="Korea Standard Time"/>
+ </h:selectOneRadio>
+
<h:outputText value="ToolTip Mode:" />
<h:selectOneRadio value="#{calendarBean.toolTipMode}" onchange="submit();">
@@ -201,12 +217,14 @@
<f:verbatim></f:verbatim>
<h:commandButton value="Submit" />
+
+ <rich:messages showDetail="true"></rich:messages>
</h:panelGrid>
<f:verbatim>
<br />
</f:verbatim>
- <h:commandLink value="Back" action="main"></h:commandLink>
+ <h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:subview>
More information about the richfaces-svn-commits
mailing list