[richfaces-svn-commits] JBoss Rich Faces SVN: r14149 - trunk/test-applications/jsp/src/main/webapp/ColorPicker.

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

Author: Vadim Mikovoz
Date: 2009-05-13 04:54:52 -0400 (Wed, 13 May 2009)
New Revision: 14149

Modified:
   trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp
   trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp
Log:


Modified: trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp	2009-05-13 01:25:30 UTC (rev 14148)
+++ trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp	2009-05-13 08:54:52 UTC (rev 14149)
@@ -16,28 +16,25 @@
 		onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
 		onmouseup="#{event.onmouseup}"
 		rendered="#{colorPicker.rendered and !colorPicker.facets}"
-		
-		
+		required="#{colorPicker.required}"
+		value="#{colorPicker.value}"
 		showEvent="#{colorPicker.showEvent}"
 		validator="#{colorPicker.validate}"
 		validatorMessage="#{colorPicker.validatorMessage}"
-		value="#{colorPicker.value}"
 		valueChangeListener="#{colorPicker.changeValue}">
 	</rich:colorPicker>
 
-	<rich:colorPicker colorMode="#{colorPicker.colorMode}" flat="#{colorPicker.flat}"
-		id="colorPickerIDFacets" onclick="#{event.onclick}"
-		ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}"
-		onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}"
-		onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}"
-		onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
-		onmouseup="#{event.onmouseup}"
+	<rich:colorPicker colorMode="#{colorPicker.colorMode}"
+		flat="#{colorPicker.flat}" id="colorPickerIDFacets"
+		onclick="#{event.onclick}" ondblclick="#{event.ondblclick}"
+		onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}"
+		onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
+		onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
+		onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"
 		rendered="#{colorPicker.rendered and colorPicker.facets}"
-		
-		
-		showEvent="#{colorPicker.showEvent}" validator="#{colorPicker.validate}"
+		showEvent="#{colorPicker.showEvent}"
+		validator="#{colorPicker.validate}"
 		validatorMessage="#{colorPicker.validatorMessage}"
-		value="#{colorPicker.facetsValue}"
 		valueChangeListener="#{colorPicker.changeValue}">
 		<f:facet name="icon">
 			<h:graphicImage value="/ColorPicker/images/colorPicker_ico.png"
@@ -50,5 +47,4 @@
 	</rich:colorPicker>
 
 
-
 </f:subview>

Modified: trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp	2009-05-13 01:25:30 UTC (rev 14148)
+++ trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPickerProperty.jsp	2009-05-13 08:54:52 UTC (rev 14149)
@@ -1,4 +1,5 @@
- <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
 <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
 <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
@@ -29,10 +30,6 @@
 		<h:selectBooleanCheckbox value="#{colorPicker.immediate}">
 		</h:selectBooleanCheckbox>
 
-		<h:outputText value="localValueSet" />
-		<h:selectBooleanCheckbox value="#{colorPicker.localValueSet}">
-		</h:selectBooleanCheckbox>
-
 		<h:outputText value="rendered" />
 		<h:selectBooleanCheckbox value="#{colorPicker.rendered}">
 		</h:selectBooleanCheckbox>
@@ -49,10 +46,6 @@
 		<h:inputText value="#{colorPicker.requiredMessage}">
 		</h:inputText>
 
-		<h:outputText value="valid" />
-		<h:selectBooleanCheckbox value="#{colorPicker.valid}">
-		</h:selectBooleanCheckbox>
-
 		<h:outputText value="validatorMessage: "></h:outputText>
 		<h:inputText value="#{colorPicker.validatorMessage}">
 		</h:inputText>