[richfaces-svn-commits] JBoss Rich Faces SVN: r2951 - in trunk/test-applications/facelets/src/main: webapp/Calendar and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: ayanul
Date: 2007-09-17 02:40:24 -0400 (Mon, 17 Sep 2007)
New Revision: 2951

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 11:19:28 UTC (rev 2950)
+++ trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java	2007-09-17 06:40:24 UTC (rev 2951)
@@ -33,7 +33,7 @@
 
 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" };
@@ -58,10 +58,8 @@
 	private Date selectedDate;
 	private Date preloadDateRangeBegin;
 	private Date preloadDateRangeEnd;
-	private String useWeekDayLabels;
-	private String useWeekDay;
-	private String useCustomMountLabels;
-	private String useCustomMountLabelsShort;
+	private String weekDay;
+	private String month;
 	private String height;
 	private String width;
 	private String pattern;
@@ -148,10 +146,8 @@
 		toolTipMode = "none";
 		scrollMode = "client";
 		required = false;
-		useWeekDay = "none";
-		useWeekDayLabels = "none";
-		useCustomMountLabels = "none";
-		useCustomMountLabelsShort = "none";
+		weekDay = "none";
+		month = "none";
 		timeZone = TimeZone.getDefault();
 		preloadDateRangeBegin = new Date("January 01, 2007");
 		preloadDateRangeEnd = new Date();
@@ -190,75 +186,40 @@
 		}
 	}
 
-	// public Object getMonthLabelsShort() {
-	// if (isUseCustomMountLabelsShort()) {
-	// return CalendarBean.MOUNT_LABELS_SHORT;
-	// } else {
-	// return null;
-	// }
-	// }
-
-	public Object getMonthLabels() {
-		if (useCustomMountLabels == "long")
-			return CalendarBean.MOUNT_LABELS;
-		else if (useCustomMountLabelsShort == "short")
-			return CalendarBean.MOUNT_LABELS_SHORT;
-		else
-			return null;
-
-	}
-
-	// public Object getWeekDayLabelsShort() {
-	// if (isUseWeekDayLabels()) {
-	// return CalendarBean.WEEK_DAY_LABELS;
-	// } else {
-	// return null;
-	// }
-	// }
-
-
 	public Object getWeekDayLabels() {
-		if (useWeekDay == "long")
+		if(weekDay.equals("long"))
 			return CalendarBean.WEEK_DAY;
-		else if (useWeekDayLabels == "short")
-			return CalendarBean.WEEK_DAY_LABELS;
-		else
-			return null;
-
+		else return null;
 	}
-	
-	public String getUseWeekDayLabels() {
-		return useWeekDayLabels;
-	}
 
-	public void setUseWeekDayLabels(String useWeekDayLabels) {
-		this.useWeekDayLabels = useWeekDayLabels;
+	public Object getWeekDayLabelsShort() {
+		if(weekDay.equals("short"))
+			return CalendarBean.WEEK_DAY_SHORT;
+		else return null;
 	}
 
-	public String getUseWeekDay() {
-		return useWeekDay;
+	public Object getMonthLabels() {
+		if(month.equals("long"))
+			return CalendarBean.MOUNT_LABELS;
+		else return null;
 	}
-
-	public void setUseWeekDay(String useWeekDay) {
-		this.useWeekDay = useWeekDay;
+	
+	public void weekDay(ValueChangeEvent event) {
+		weekDay = (String) event.getNewValue();
 	}
-
-	public String getUseCustomMountLabels() {
-		return useCustomMountLabels;
+	
+	public Object getMonthLabelsShort() {
+		if(month.equals("short"))
+			return CalendarBean.MOUNT_LABELS_SHORT;
+		else return null;
+		
 	}
 
-	public void setUseCustomMountLabels(String useCustomMountLabels) {
-		this.useCustomMountLabels = useCustomMountLabels;
-	}
 
-	public String getUseCustomMountLabelsShort() {
-		return useCustomMountLabelsShort;
+	public void month(ValueChangeEvent event) {
+		month = (String) event.getNewValue();
 	}
 
-	public void setUseCustomMountLabelsShort(String useCustomMountLabelsShort) {
-		this.useCustomMountLabelsShort = useCustomMountLabelsShort;
-	}
-
 	public String getCurrentDateAsText() {
 		Date currentDate = getCurrentDate();
 		if (currentDate != null) {

Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml	2007-09-15 11:19:28 UTC (rev 2950)
+++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml	2007-09-17 06:40:24 UTC (rev 2951)
@@ -26,10 +26,10 @@
 		datePattern="#{calendarBean.pattern}"
 		preloadDateRangeBegin="#{calendarBean.preloadDateRangeBegin}"
 		preloadDateRangeEnd="#{calendarBean.preloadDateRangeEnd}"
-		weekDayLabelsShort="#{calendarBean.weekDayLabels}"
-		weekDayLabels="#{calendarBean.weekDayLabels}" 
+		weekDayLabels="#{calendarBean.weekDayLabels}"
+		weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" 
 		monthLabels="#{calendarBean.monthLabels}"
-		monthLabelsShort="#{calendarBean.monthLabels}"
+		monthLabelsShort="#{calendarBean.monthLabelsShort}"
 		value="#{calendarBean.selectedDate}"
 		currentDate="#{calendarBean.currentDate}"
 		jointPoint="#{calendarBean.jointPoint}"
@@ -90,22 +90,21 @@
 			onclick="submit()" />
 		
 		<h:outputText value="Custom day labels" />
-		<h:selectOneRadio value="#{calendarBean.useWeekDay}"
+		<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 mount labels" />
-		<h:selectOneRadio value="#{calendarBean.useCustomMountLabels}"
+		<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="Select Date Pattern:" />
 		<h:selectOneMenu value="MMM d, yyyy" onchange="submit()"
 			valueChangeListener="#{calendarBean.selectPattern}">