Author: jdonnerstag Date: Sat Apr 9 13:34:16 2011 New Revision: 1090589 URL: http://svn.apache.org/viewvc?rev=1090589&view=rev Log: fixed EnclosureContainer should honor relevantChild.determineVisibility Issue: WICKET-3586
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java?rev=1090589&r1=1090588&r2=1090589&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java (original) +++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java Sat Apr 9 13:34:16 2011 @@ -75,6 +75,6 @@ public class EnclosureContainer extends public boolean isVisible() { child.configure(); - return child.isVisible(); + return child.determineVisibility(); } } Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=1090589&r1=1090588&r2=1090589&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java (original) +++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java Sat Apr 9 13:34:16 2011 @@ -835,6 +835,8 @@ public class Form<T> extends WebMarkupCo /** * Calls onError on this {@link Form} and any enabled and visible nested form, if the respective * {@link Form} actually has errors. + * + * @param submitter */ private void callOnError(IFormSubmitter submitter) { @@ -966,8 +968,11 @@ public class Form<T> extends WebMarkupCo /** * Convenient and typesafe way to visit all the form components on a form. * + * @param <R> + * return object type * @param visitor * The visitor interface to call + * @return user provided in callback */ public final <R> R visitFormComponents(final IVisitor<? extends FormComponent<?>, R> visitor) { @@ -978,8 +983,11 @@ public class Form<T> extends WebMarkupCo * Convenient and typesafe way to visit all the form components on a form postorder (deepest * first) * + * @param <R> + * Return object type * @param visitor * The visitor interface to call + * @return whatever you provided */ public final <R> R visitFormComponentsPostOrder( final IVisitor<? extends FormComponent<?>, R> visitor) @@ -1184,6 +1192,9 @@ public class Form<T> extends WebMarkupCo return false; } + /** + * @return True if is multipart + */ public boolean isMultiPart() { if (multiPart != 0) Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java?rev=1090589&r1=1090588&r2=1090589&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java (original) +++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java Sat Apr 9 13:34:16 2011 @@ -25,7 +25,6 @@ import org.apache.wicket.model.IModel; * from the browser. So the model of the form or the formcomponents are updated with the submit * values. * - * * @author jcompagner * @param <T> * The type of the {@link Form}'s model object