svn commit: r818988 - /wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java

[ivaynberg]

Author: ivaynberg
Date: Fri Sep 25 20:16:53 2009
New Revision: 818988

URL: http://svn.apache.org/viewvc?rev=818988&view=rev
Log:
WICKET-2445 clean up deprecations

Modified:
    
wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java

Modified: 
wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java?rev=818988&r1=818987&r2=818988&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
 Fri Sep 25 20:16:53 2009
@@ -35,7 +35,6 @@
 import org.apache.wicket.markup.html.form.Radio;
 import org.apache.wicket.markup.html.form.RadioChoice;
 import org.apache.wicket.markup.html.form.RadioGroup;
-import org.apache.wicket.markup.html.form.RequiredTextField;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.list.ListItem;
@@ -48,7 +47,7 @@
 import org.apache.wicket.util.convert.ConversionException;
 import org.apache.wicket.util.convert.IConverter;
 import org.apache.wicket.util.convert.MaskConverter;
-import org.apache.wicket.validation.validator.NumberValidator;
+import org.apache.wicket.validation.validator.RangeValidator;
 
 
 /**
@@ -88,19 +87,21 @@
                                }
                        });
 
-                       RequiredTextField<String> stringTextField = new 
RequiredTextField<String>(
-                               "stringProperty");
-                       stringTextField.setLabel(new Model<String>("String"));
-                       add(stringTextField);
-                       RequiredTextField<Integer> integerTextField = new 
RequiredTextField<Integer>(
-                               "integerProperty");
-                       add(integerTextField.add(NumberValidator.POSITIVE));
-                       add(new RequiredTextField<Double>("doubleProperty"));
+                       add(new 
TextField<String>("stringProperty").setRequired(true).setLabel(
+                               new Model<String>("String")));
+
+                       add(new TextField<Integer>("integerProperty", 
Integer.class).setRequired(true).add(
+                               new RangeValidator<Integer>(1, 
Integer.MAX_VALUE)));
+
+                       add(new TextField<Double>("doubleProperty", 
Double.class).setRequired(true));
+
+                       add(new 
TextField<Integer>("integerInRangeProperty").setRequired(true).add(
+                               new RangeValidator<Integer>(0, 100)));
 
-                       add(new 
RequiredTextField<Integer>("integerInRangeProperty").add(NumberValidator.range(
-                               0, 100)));
                        add(new CheckBox("booleanProperty"));
+
                        add(new Multiply("multiply"));
+
                        // display the multiply result
                        Label multiplyLabel = new Label("multiplyLabel", new 
PropertyModel<Integer>(
                                getDefaultModel(), "multiply"));