[richfaces-svn-commits] JBoss Rich Faces SVN: r2084 - in trunk/ui/calendar/src: main/java/org/richfaces/component and 2 other directories.

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

Author: akushunin
Date: 2007-08-06 13:15:54 -0400 (Mon, 06 Aug 2007)
New Revision: 2084

Modified:
   trunk/ui/calendar/src/main/config/component/calendar.xml
   trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
   trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
   trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java
Log:
added atrribute disabled
added reset button

Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml	2007-08-06 16:56:37 UTC (rev 2083)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml	2007-08-06 17:15:54 UTC (rev 2084)
@@ -108,6 +108,12 @@
 			<defaultvalue>true</defaultvalue>
 		</property>
 		<property>
+			<name>disabled</name>
+			<classname>boolean</classname>
+			<description></description>
+			<defaultvalue>false</defaultvalue>
+		</property>
+		<property>
 			<name>jointPoint</name>
 			<classname>java.lang.String</classname>
 			<description></description>

Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java	2007-08-06 16:56:37 UTC (rev 2083)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java	2007-08-06 17:15:54 UTC (rev 2084)
@@ -120,7 +120,12 @@
 	public abstract boolean isPopup();
 
 	public abstract void setPopup(boolean popup);
+	
+	public abstract boolean isDisabled();
 
+	public abstract void setDisabled(boolean disabled);
+
+
 	public abstract String getButtonLabel();
 
 	public abstract void setButtonLabel(String buttonLabel);

Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx	2007-08-06 16:56:37 UTC (rev 2083)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx	2007-08-06 17:15:54 UTC (rev 2084)
@@ -32,6 +32,7 @@
 				direction: '#{component.direction}',
 				toolTipMode:'#{component.toolTipMode}',
 				popup: #{component.popup},
+				disabled: #{component.disabled},
 				<f:call name="writeSymbols" />,
 				firstWeekDay: #{this:getFirstWeekDay(context, component)}, 
 				minDaysInFirstWeek: #{this:getMinDaysInFirstWeek(context, component)},
@@ -108,7 +109,8 @@
 	 			onclick="$(this.form.id+':calendar').component.doExpand();"	 			
 				style="#{component.attributes['style']}"
 				tabindex="#{component.attributes['tabindex']}"
-				type="button">
+				type="button"
+				disabled="#{component.attributes['disabled']}">
 				#{component.attributes['buttonLabel']}
 		</button>
 		<jsp:scriptlet>
@@ -120,7 +122,7 @@
 		id="#{clientId}ResetButton"
 		type="button"		
 		onclick="$(this.form.id+':calendar').component.resetSelectedDate();"
-		>	
+		disabled="#{component.attributes['disabled']}">	
 		Reset	
 		</button>
 		<jsp:scriptlet>

Modified: trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java
===================================================================
--- trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java	2007-08-06 16:56:37 UTC (rev 2083)
+++ trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java	2007-08-06 17:15:54 UTC (rev 2084)
@@ -66,6 +66,8 @@
 			System.out.println(strarr[i]);	
 		}	*/	
 		calendar.setButtonLabel("PopUp");
+		//TODO test popup false
+		//TODO test CurrentDate = null
 		calendar.setPopup(true);
 		Calendar calendarObject = Calendar.getInstance();
 		calendarObject.set(2001, Calendar.SEPTEMBER, 11,1,1,1);
@@ -174,7 +176,7 @@
 	}
 	
 	public void testCalendarDecode() throws Exception{
-		
+		//TODO Add set Date and time
 		calendar.decode(facesContext);
 		assertEquals("Tue Sep 11 01:01:01 EEST 2001", calendar.getSubmittedValue().toString());
 		Calendar calendarObject = Calendar.getInstance();