svn commit: r497174 - in /incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket: ajax/form/AjaxFormSubmitBehavior.java request/target/component/listener/BehaviorRequestTarget.java

[ivaynberg]

Author: ivaynberg
Date: Wed Jan 17 13:17:18 2007
New Revision: 497174

URL: http://svn.apache.org/viewvc?view=rev&rev=497174
Log:
fixed bug where behavior callbacks did not call page.beforeCallComponent() and 
where ajaxformsubmitbehavior did not call onerror if errors were set inside 
onsubmit

Modified:
    
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/form/AjaxFormSubmitBehavior.java
    
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/component/listener/BehaviorRequestTarget.java

Modified: 
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/form/AjaxFormSubmitBehavior.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/form/AjaxFormSubmitBehavior.java?view=diff&rev=497174&r1=497173&r2=497174
==============================================================================
--- 
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/form/AjaxFormSubmitBehavior.java
 (original)
+++ 
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/form/AjaxFormSubmitBehavior.java
 Wed Jan 17 13:17:18 2007
@@ -129,7 +129,7 @@
                {
                        onSubmit(target);
                }
-               else
+               if (getForm().hasError())
                {
                        onError(target);
                }

Modified: 
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/component/listener/BehaviorRequestTarget.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/component/listener/BehaviorRequestTarget.java?view=diff&rev=497174&r1=497173&r2=497174
==============================================================================
--- 
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/component/listener/BehaviorRequestTarget.java
 (original)
+++ 
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/request/target/component/listener/BehaviorRequestTarget.java
 Wed Jan 17 13:17:18 2007
@@ -93,7 +93,16 @@
                                        + "; Component: " + 
component.toString());
                }
 
-               // Invoke the interface method
-               behaviorListener.onRequest();
+               component.getPage().beforeCallComponent(component, 
IBehaviorListener.INTERFACE);
+               try
+               {
+                       // Invoke the interface method
+                       behaviorListener.onRequest();
+               }
+               finally
+               {
+                       component.getPage().afterCallComponent(component, 
IBehaviorListener.INTERFACE);
+               }
+
        }
 }