[seam-commits] Seam SVN: r11147 - in branches/community/Seam_2_2: examples/ui/view and 3 other directories.

[seam-commits at lists.jboss.org]

Author: danielc.roth
Date: 2009-06-12 19:25:22 -0400 (Fri, 12 Jun 2009)
New Revision: 11147

Modified:
   branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Controls.xml
   branches/community/Seam_2_2/examples/ui/view/equalityValidator.xhtml
   branches/community/Seam_2_2/ui/src/main/config/component/equalityValidator.xml
   branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java
   branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/renderkit/EqualityValidatorRendererBase.java
Log:
Added support for user to define if validator requires a value as per JBSEAM-4172

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Controls.xml
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Controls.xml	2009-06-12 22:00:27 UTC (rev 11146)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Controls.xml	2009-06-12 23:25:22 UTC (rev 11147)
@@ -498,6 +498,11 @@
                </listitem>
                <listitem>
                   <para>
+                     <literal>required</literal> &#8212; False will disable a check that a value at all is inputted in fields. 
+                  </para>
+               </listitem>
+               <listitem>
+                  <para>
                      <literal>messageId</literal> &#8212; Message id to show on failure.
                   </para>
                </listitem>

Modified: branches/community/Seam_2_2/examples/ui/view/equalityValidator.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/ui/view/equalityValidator.xhtml	2009-06-12 22:00:27 UTC (rev 11146)
+++ branches/community/Seam_2_2/examples/ui/view/equalityValidator.xhtml	2009-06-12 23:25:22 UTC (rev 11147)
@@ -4,14 +4,14 @@
 	<ui:param name="tagName" value="s:validateEquality" />
 	<ui:define name="body">
 		<h:form>
-			<p>Validates that two java.lang.String inputs are equal</p>
+			<p>Validates that two java.lang.String inputs are equal (may be empty)</p>
 			<h:panelGrid columns="3">
 				<s:label for="name">Name</s:label>
 				<h:inputText id="name" value="#{equalityValidatorBean.name}" />
 				<h:message for="name" />
 				<s:label for="nameVerification">Name Verification</s:label>
 				<h:inputText id="nameVerification">
-					<s:validateEquality for="name" message="Must be the same as name!" />
+					<s:validateEquality for="name" message="Must be the same as name!" required="false" />
 				</h:inputText>
 				<h:message for="nameVerification" />
 				<h:commandButton action="#{equalityValidatorBean.check}" value="Check name" />

Modified: branches/community/Seam_2_2/ui/src/main/config/component/equalityValidator.xml
===================================================================
--- branches/community/Seam_2_2/ui/src/main/config/component/equalityValidator.xml	2009-06-12 22:00:27 UTC (rev 11146)
+++ branches/community/Seam_2_2/ui/src/main/config/component/equalityValidator.xml	2009-06-12 23:25:22 UTC (rev 11147)
@@ -40,7 +40,13 @@
 			<name>operator</name>
 			<classname>java.lang.String</classname>
 			<description>Operation to use.</description>
-		</property>		
+		</property>	
+		<property>
+			<name>required</name>
+			<classname>boolean</classname>
+			<description>True if a value is required for the filed to validate (default:true)</description>
+			<defaultvalue>true</defaultvalue>
+		</property>				
 
 	</component>
 

Modified: branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java
===================================================================
--- branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java	2009-06-12 22:00:27 UTC (rev 11146)
+++ branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java	2009-06-12 23:25:22 UTC (rev 11147)
@@ -26,4 +26,8 @@
    
    public abstract String getOperator();
 
+   public abstract void setRequired(boolean required);
+   
+   public abstract boolean isRequired();
+   
 }

Modified: branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/renderkit/EqualityValidatorRendererBase.java
===================================================================
--- branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/renderkit/EqualityValidatorRendererBase.java	2009-06-12 22:00:27 UTC (rev 11146)
+++ branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/renderkit/EqualityValidatorRendererBase.java	2009-06-12 23:25:22 UTC (rev 11147)
@@ -43,7 +43,7 @@
       if (!hasEqualityValidator(evh))
       {
          evh.addValidator(new EqualityValidator(ev.getFor(), ev.getMessage(), ev.getMessageId(), ev.getOperator()));
-         evh.setRequired(true);
+         evh.setRequired(ev.isRequired());
       }
 
       renderChildren(context, component);