svn commit: r1148397 - in /wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard: NewUserWizard$UserNameStep.html NewUserWizard.java

[svenmeier]

Author: svenmeier
Date: Tue Jul 19 15:29:10 2011
New Revision: 1148397

URL: http://svn.apache.org/viewvc?rev=1148397&view=rev
Log:
show wizardStep's FormValidator

Modified:
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard$UserNameStep.html
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard$UserNameStep.html
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard%24UserNameStep.html?rev=1148397&r1=1148396&r2=1148397&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard$UserNameStep.html
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard$UserNameStep.html
 Tue Jul 19 15:29:10 2011
@@ -8,5 +8,9 @@
           <td><wicket:message key="email">Email Adress</wicket:message></td>
           <td><input type="text" wicket:id="user.email" /></td>
          </tr>
+         <tr>
+          <td><wicket:message key="email">Email Adress</wicket:message></td>
+          <td><input type="text" wicket:id="emailRepeat" /></td>
+         </tr>
         </table>
 </wicket:panel>

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java?rev=1148397&r1=1148396&r2=1148397&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
 Tue Jul 19 15:29:10 2011
@@ -31,12 +31,12 @@ import org.apache.wicket.markup.html.for
 import org.apache.wicket.markup.html.form.RequiredTextField;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.form.validation.AbstractFormValidator;
+import org.apache.wicket.markup.html.form.validation.EqualInputValidator;
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.ResourceModel;
 import org.apache.wicket.model.StringResourceModel;
-import org.apache.wicket.validation.IValidationError;
 import org.apache.wicket.validation.ValidationError;
 import org.apache.wicket.validation.validator.EmailAddressValidator;
 
@@ -100,8 +100,17 @@ public class NewUserWizard extends Wizar
                public UserNameStep()
                {
                        super(new ResourceModel("username.title"), new 
ResourceModel("username.summary"));
+
                        add(new RequiredTextField<String>("user.userName"));
-                       add(new 
RequiredTextField<String>("user.email").add(EmailAddressValidator.getInstance()));
+
+                       FormComponent<String> email = new 
RequiredTextField<String>("user.email").add(EmailAddressValidator.getInstance());
+                       add(email);
+
+                       TextField<String> emailRepeat = new 
TextField<String>("emailRepeat",
+                               new Model<String>());
+                       add(emailRepeat);
+
+                       add(new EqualInputValidator(email, emailRepeat));
                }
        }
 
@@ -139,7 +148,7 @@ public class NewUserWizard extends Wizar
                                        {
                                                if 
("".equals(rolesSetNameField.getInput()))
                                                {
-                                                       
rolesSetNameField.error((IValidationError)new 
ValidationError().addMessageKey("error.noSetNameForRoles"));
+                                                       
rolesSetNameField.error(new 
ValidationError().addMessageKey("error.noSetNameForRoles"));
                                                }
                                        }
                                }
@@ -156,7 +165,8 @@ public class NewUserWizard extends Wizar
        }
 
        /** cheap ass roles database. */
-       private static final List<String> allRoles = Arrays.asList("admin", 
"user", "moderator", "joker", "slacker");
+       private static final List<String> allRoles = Arrays.asList("admin", 
"user", "moderator",
+               "joker", "slacker");
 
        /** Whether the assign roles step should be executed. */
        private boolean assignRoles = false;