[richfaces-svn-commits] JBoss Rich Faces SVN: r2967 - 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 13:42:00 -0400 (Mon, 17 Sep 2007)
New Revision: 2967

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-17 16:29:20 UTC (rev 2966)
+++ trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java	2007-09-17 17:42:00 UTC (rev 2967)
@@ -21,14 +21,18 @@
 
 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;
 
@@ -150,24 +154,18 @@
 		weekDay = "none";
 		month = "none";
 		timeZone = "Eastern European Time";
-		preloadDateRangeBegin = "2007.7.3";
-		preloadDateRangeEnd = "2008.7.3";
+		preloadDateRangeBegin = "10.09.2007";
+		preloadDateRangeEnd = "11.10.2007";
 	}
 	
 	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();
+		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();
 		
@@ -176,17 +174,11 @@
 	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();
+		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();
 	}

Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml	2007-09-17 16:29:20 UTC (rev 2966)
+++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml	2007-09-17 17:42:00 UTC (rev 2967)
@@ -118,10 +118,10 @@
 		<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:outputText value="Preload date range begin(d.m.y)" />
 		<h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/>
 		
-		<h:outputText value="Preload date range end" />
+		<h:outputText value="Preload date range end(d.m.y)" />
 		<h:inputText value="#{calendarBean.preloadDateRangeEnd}" onchange="submit();"/>
 		
 		<h:outputText value="z-index:" />