svn commit: r559198 - /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java

[ivaynberg]

Author: ivaynberg
Date: Tue Jul 24 13:39:50 2007
New Revision: 559198

URL: http://svn.apache.org/viewvc?view=rev&rev=559198
Log:
added additional required check into formcomponent - if convertedinput==null 
and isrequried==true

Modified:
    
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?view=diff&rev=559198&r1=559197&r2=559198
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
 Tue Jul 24 13:39:50 2007
@@ -1024,6 +1024,11 @@
                {
                        convertInput();
 
+                       if (isRequired() && getConvertedInput() == null)
+                       {
+                               reportRequiredError();
+                       }
+
                        if (isValid())
                        {
                                validateValidators();
@@ -1371,8 +1376,16 @@
        {
                if (!checkRequired())
                {
-                       error((IValidationError)new 
ValidationError().addMessageKey("Required"));
+                       reportRequiredError();
                }
+       }
+
+       /**
+        * Reports required error against this component
+        */
+       private void reportRequiredError()
+       {
+               error((IValidationError)new 
ValidationError().addMessageKey("Required"));
        }
 
        /**