WICKET-2445 clean up deprecations
git-svn-id: https://svn.apache.org/repos/asf/wicket/branches/wicket-1.4.x@818988 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
index c831460..fdff464 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
@@ -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 RequiredTextField<Integer>("integerInRangeProperty").add(NumberValidator.range(
- 0, 100)));
+ 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 CheckBox("booleanProperty"));
+
add(new Multiply("multiply"));
+
// display the multiply result
Label multiplyLabel = new Label("multiplyLabel", new PropertyModel<Integer>(
getDefaultModel(), "multiply"));
