svn commit: r720009 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java

[ivaynberg]

Author: ivaynberg
Date: Sun Nov 23 09:14:18 2008
New Revision: 720009

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

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=720009&r1=720008&r2=720009&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java 
(original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java 
Sun Nov 23 09:14:18 2008
@@ -155,7 +155,7 @@
                                FormComponent<?> formComponent = 
(FormComponent<?>)component;
 
                                Form<?> form = formComponent.getForm();
-                               if (!form.isEnabledInHierarchy() || 
!form.isVisibleInHierarchy())
+                               if (!form.isVisibleInHierarchy() || 
!form.isEnabledInHierarchy())
                                {
                                        // do not validate formComponent or any 
of formComponent's children
                                        return 
Component.IVisitor.CONTINUE_TRAVERSAL_BUT_DONT_GO_DEEPER;
@@ -217,8 +217,8 @@
                                        {
                                                if (form.isEnabledInHierarchy())
                                                {
-                                                       if 
(component.isEnabledInHierarchy() &&
-                                                               
component.isVisibleInHierarchy())
+                                                       if 
(component.isVisibleInHierarchy() &&
+                                                               
component.isEnabledInHierarchy())
                                                        {
                                                                
((IFormModelUpdateListener)component).updateModel();
                                                        }