svn commit: r815838 - in /wicket/trunk: testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ wicket-quickstart/src/main/java/org/apache/wicket/quickstart/

[ivaynberg]

Author: ivaynberg
Date: Wed Sep 16 15:30:25 2009
New Revision: 815838

URL: http://svn.apache.org/viewvc?rev=815838&view=rev
Log:
WICKET-2470

Modified:
    
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
    
wicket/trunk/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartApplication.java
    
wicket/trunk/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartSession.java

Modified: 
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java?rev=815838&r1=815837&r2=815838&view=diff
==============================================================================
--- 
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
 (original)
+++ 
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
 Wed Sep 16 15:30:25 2009
@@ -57,7 +57,8 @@
 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.MinimumValidator;
+import org.apache.wicket.validation.validator.RangeValidator;
 import org.apache.wicket.version.undo.Change;
 
 /**
@@ -124,13 +125,13 @@
                        add(stringTextField);
                        TextField<Integer> integerTextField = new 
TextField<Integer>("integerProperty",
                                Integer.class);
-                       add(integerTextField.add(NumberValidator.POSITIVE));
+                       add(integerTextField.add(new 
MinimumValidator<Integer>(0)));
                        add(new TextField<Double>("doubleProperty", 
Double.class));
                        WebMarkupContainer dateLabel = new 
WebMarkupContainer("dateLabel");
                        add(dateLabel);
                        TextField<Date> datePropertyTextField = new 
TextField<Date>("dateProperty", Date.class);
                        add(datePropertyTextField);
-                       add(new TextField<Integer>("integerInRangeProperty", 
Integer.class).add(NumberValidator.range(
+                       add(new TextField<Integer>("integerInRangeProperty", 
Integer.class).add(new RangeValidator<Integer>(
                                0, 100)));
                        add(new CheckBox("booleanProperty"));
                        RadioChoice<String> rc = new 
RadioChoice<String>("numberRadioChoice", NUMBERS).setSuffix("");

Modified: 
wicket/trunk/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartApplication.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartApplication.java?rev=815838&r1=815837&r2=815838&view=diff
==============================================================================
--- 
wicket/trunk/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartApplication.java
 (original)
+++ 
wicket/trunk/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartApplication.java
 Wed Sep 16 15:30:25 2009
@@ -45,6 +45,7 @@
        /**
         * @see org.apache.wicket.Application#getHomePage()
         */
+       @Override
        public Class getHomePage()
        {
                return Index.class;
@@ -53,14 +54,16 @@
        /**
         * @see 
org.apache.wicket.protocol.http.WebApplication#newSession(Request, Response)
         */
+       @Override
        public Session newSession(Request request, Response response)
        {
-               return new QuickStartSession(QuickStartApplication.this, 
request);
+               return new QuickStartSession(request);
        }
 
        /**
         * @see org.apache.wicket.protocol.http.WebApplication#init()
         */
+       @Override
        protected void init()
        {
                // put any configuration here

Modified: 
wicket/trunk/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartSession.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartSession.java?rev=815838&r1=815837&r2=815838&view=diff
==============================================================================
--- 
wicket/trunk/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartSession.java
 (original)
+++ 
wicket/trunk/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartSession.java
 Wed Sep 16 15:30:25 2009
@@ -17,7 +17,6 @@
 package org.apache.wicket.quickstart;
 
 import org.apache.wicket.Request;
-import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.protocol.http.WebSession;
 
 /**
@@ -33,15 +32,11 @@
        /**
         * Constructor
         * 
-        * @param application
-        *            The application
         * @param request
         *            The request
-        * @param response
-        *            The response
         */
-       protected QuickStartSession(final WebApplication application, final 
Request request)
+       protected QuickStartSession(final Request request)
        {
-               super(application, request);
+               super(request);
        }
 }