svn commit: r634841 - in /wicket/trunk: jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java

[jcompagner]

Author: jcompagner
Date: Fri Mar  7 14:10:54 2008
New Revision: 634841

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

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java
    
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java?rev=634841&r1=634840&r2=634841&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractTextComponent.java
 Fri Mar  7 14:10:54 2008
@@ -104,6 +104,13 @@
                return false;
        }
 
+       protected void convertInput()
+       {
+               // Stateless forms don't have to be rendered first, 
convertInput could be called before
+               // onBeforeRender calling resolve type here again to check if 
the type is correctly set.
+               resolveType();
+               super.convertInput();
+       }
 
        /**
         * If the type is not set try to guess it if the model supports it.
@@ -113,6 +120,11 @@
        protected void onBeforeRender()
        {
                super.onBeforeRender();
+               resolveType();
+       }
+
+       private void resolveType()
+       {
                if (!getFlag(TYPE_RESOLVED) && getType() == null)
                {
                        // Set the type, but only if it's not a String (see 
WICKET-606).

Modified: 
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java?rev=634841&r1=634840&r2=634841&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
 (original)
+++ 
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java
 Fri Mar  7 14:10:54 2008
@@ -22,7 +22,8 @@
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.validation.validator.NumberValidator;
 
 /**
  * Another page of the stateless example.
@@ -31,6 +32,8 @@
  */
 public class StatelessPage extends WebPage
 {
+       private final Integer number = new Integer(10);
+
        /**
         * Constructor
         */
@@ -39,7 +42,8 @@
                setStatelessHint(true);
                add(new Label("message", new SessionModel()));
                add(new BookmarkablePageLink("indexLink", Index.class));
-               final TextField field = new TextField("textfield", new Model());
+               final TextField field = new TextField("textfield", new 
PropertyModel(this, "number"));
+               field.add(NumberValidator.maximum(20));
                field.setRequired(true);
 
                StatelessForm statelessForm = new StatelessForm("statelessform")
@@ -57,4 +61,5 @@
                add(statelessForm);
                add(new FeedbackPanel("feedback"));
        }
+
 }