sylvain 2003/10/08 02:13:05 Modified: src/blocks/woody/java/org/apache/cocoon/woody/event/impl JavaScriptWidgetListenerBuilder.java src/blocks/woody/java/org/apache/cocoon/woody/formmodel ActionDefinitionBuilder.java BooleanFieldDefinitionBuilder.java FieldDefinitionBuilder.java MultiValueFieldDefinitionBuilder.java RepeaterActionDefinitionBuilder.java Log: Fix code typed too quickly :-/ Revision Changes Path 1.3 +2 -2 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/impl/JavaScriptWidgetListenerBuilder.java Index: JavaScriptWidgetListenerBuilder.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/impl/JavaScriptWidgetListenerBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JavaScriptWidgetListenerBuilder.java 3 Oct 2003 13:40:41 -0000 1.2 +++ JavaScriptWidgetListenerBuilder.java 8 Oct 2003 09:13:05 -0000 1.3 @@ -51,7 +51,7 @@ package org.apache.cocoon.woody.event.impl; import org.apache.cocoon.woody.event.ActionListener; -import org.apache.cocoon.woody.event.ValueChangedEvent; +import org.apache.cocoon.woody.event.ValueChangedListener; import org.apache.cocoon.woody.event.WidgetListener; import org.apache.cocoon.woody.event.WidgetListenerBuilder; import org.apache.cocoon.woody.util.JavaScriptHelper; @@ -81,7 +81,7 @@ if (listenerClass == ActionListener.class) { return new JavaScriptWidgetListener.JSActionListener(script); - } else if (listenerClass == ValueChangedEvent.class) { + } else if (listenerClass == ValueChangedListener.class) { return new JavaScriptWidgetListener.JSValueChangedListener(script); } else { throw new Exception("Unkonwn event class: " + listenerClass); 1.3 +2 -3 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/ActionDefinitionBuilder.java Index: ActionDefinitionBuilder.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/ActionDefinitionBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ActionDefinitionBuilder.java 24 Sep 2003 20:47:06 -0000 1.2 +++ ActionDefinitionBuilder.java 8 Oct 2003 09:13:05 -0000 1.3 @@ -52,10 +52,9 @@ import java.util.Iterator; -import org.w3c.dom.Element; -import org.apache.cocoon.woody.event.ActionEvent; import org.apache.cocoon.woody.event.ActionListener; import org.apache.cocoon.woody.util.DomHelper; +import org.w3c.dom.Element; /** * Builds {@link ActionDefinition}s. @@ -69,7 +68,7 @@ String actionCommand = DomHelper.getAttribute(widgetElement, "action-command"); actionDefinition.setActionCommand(actionCommand); - Iterator iter = buildEventListeners(widgetElement, "on-action", ActionEvent.class).iterator(); + Iterator iter = buildEventListeners(widgetElement, "on-action", ActionListener.class).iterator(); while (iter.hasNext()) { actionDefinition.addActionListener((ActionListener)iter.next()); } 1.3 +1 -2 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/BooleanFieldDefinitionBuilder.java Index: BooleanFieldDefinitionBuilder.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/BooleanFieldDefinitionBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BooleanFieldDefinitionBuilder.java 24 Sep 2003 20:47:06 -0000 1.2 +++ BooleanFieldDefinitionBuilder.java 8 Oct 2003 09:13:05 -0000 1.3 @@ -52,7 +52,6 @@ import java.util.Iterator; -import org.apache.cocoon.woody.event.ValueChangedEvent; import org.apache.cocoon.woody.event.ValueChangedListener; import org.w3c.dom.Element; @@ -65,7 +64,7 @@ setId(widgetElement, definition); setLabel(widgetElement, definition); - Iterator iter = buildEventListeners(widgetElement, "on-value-changed", ValueChangedEvent.class).iterator(); + Iterator iter = buildEventListeners(widgetElement, "on-value-changed", ValueChangedListener.class).iterator(); while (iter.hasNext()) { definition.addValueChangedListener((ValueChangedListener)iter.next()); } 1.4 +1 -2 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/FieldDefinitionBuilder.java Index: FieldDefinitionBuilder.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/FieldDefinitionBuilder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- FieldDefinitionBuilder.java 24 Sep 2003 20:47:06 -0000 1.3 +++ FieldDefinitionBuilder.java 8 Oct 2003 09:13:05 -0000 1.4 @@ -54,7 +54,6 @@ import org.apache.cocoon.woody.Constants; import org.apache.cocoon.woody.datatype.Datatype; -import org.apache.cocoon.woody.event.ValueChangedEvent; import org.apache.cocoon.woody.event.ValueChangedListener; import org.apache.cocoon.woody.util.DomHelper; import org.w3c.dom.Element; @@ -77,7 +76,7 @@ buildSelectionList(widgetElement, fieldDefinition); - Iterator iter = buildEventListeners(widgetElement, "on-value-changed", ValueChangedEvent.class).iterator(); + Iterator iter = buildEventListeners(widgetElement, "on-value-changed", ValueChangedListener.class).iterator(); while (iter.hasNext()) { fieldDefinition.addValueChangedListener((ValueChangedListener)iter.next()); } 1.4 +1 -2 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/MultiValueFieldDefinitionBuilder.java Index: MultiValueFieldDefinitionBuilder.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/MultiValueFieldDefinitionBuilder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- MultiValueFieldDefinitionBuilder.java 24 Sep 2003 20:47:06 -0000 1.3 +++ MultiValueFieldDefinitionBuilder.java 8 Oct 2003 09:13:05 -0000 1.4 @@ -56,7 +56,6 @@ import org.apache.cocoon.woody.util.DomHelper; import org.apache.cocoon.woody.Constants; import org.apache.cocoon.woody.datatype.Datatype; -import org.apache.cocoon.woody.event.ValueChangedEvent; import org.apache.cocoon.woody.event.ValueChangedListener; /** @@ -83,7 +82,7 @@ boolean required = DomHelper.getAttributeAsBoolean(widgetElement, "required", false); definition.setRequired(required); - Iterator iter = buildEventListeners(widgetElement, "on-value-changed", ValueChangedEvent.class).iterator(); + Iterator iter = buildEventListeners(widgetElement, "on-value-changed", ValueChangedListener.class).iterator(); while (iter.hasNext()) { definition.addValueChangedListener((ValueChangedListener)iter.next()); } 1.2 +2 -3 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/RepeaterActionDefinitionBuilder.java Index: RepeaterActionDefinitionBuilder.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/RepeaterActionDefinitionBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RepeaterActionDefinitionBuilder.java 24 Sep 2003 20:47:06 -0000 1.1 +++ RepeaterActionDefinitionBuilder.java 8 Oct 2003 09:13:05 -0000 1.2 @@ -52,7 +52,6 @@ import java.util.Iterator; -import org.apache.cocoon.woody.event.ActionEvent; import org.apache.cocoon.woody.event.ActionListener; import org.apache.cocoon.woody.util.DomHelper; import org.w3c.dom.Element; @@ -84,7 +83,7 @@ definition.setActionCommand(actionCommand); - Iterator iter = buildEventListeners(widgetElement, "on-activate", ActionEvent.class).iterator(); + Iterator iter = buildEventListeners(widgetElement, "on-activate", ActionListener.class).iterator(); while (iter.hasNext()) { definition.addActionListener((ActionListener)iter.next()); }