bruno 2003/10/31 04:26:06
Modified: src/blocks/woody/java/org/apache/cocoon/woody/formmodel
Form.java
Log:
Send all WidgetEvents also to the FormHandler, if any.
Revision Changes Path
1.10 +4 -7
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Form.java
Index: Form.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/Form.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Form.java 25 Sep 2003 17:37:30 -0000 1.9
+++ Form.java 31 Oct 2003 12:26:06 -0000 1.10
@@ -60,7 +60,7 @@
import org.apache.cocoon.woody.Constants;
import org.apache.cocoon.woody.FormContext;
-import org.apache.cocoon.woody.FormHandler;
+import org.apache.cocoon.woody.event.FormHandler;
import org.apache.cocoon.woody.event.ProcessingPhase;
import org.apache.cocoon.woody.event.ProcessingPhaseEvent;
import org.apache.cocoon.woody.event.ProcessingPhaseListener;
@@ -131,6 +131,8 @@
while(cursor.hasNext()) {
WidgetEvent event = (WidgetEvent)cursor.next();
event.getSourceWidget().broadcastEvent(event);
+ if (formHandler != null)
+ formHandler.handleEvent(event);
}
cursor.close();
@@ -255,11 +257,6 @@
doReadFromRequest(formContext);
fireWidgetEvents();
-
- // Notify the form handler, if any
- if (formContext.getActionEvent() != null && formHandler != null) {
- formHandler.handleActionEvent(formContext,
formContext.getActionEvent());
- }
// Notify the end of the current phase
if (this.listener != null) {
