cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel Field.java BooleanField.java Action.java

[br...@apache.org]

bruno       2004/04/28 06:11:10

  Modified:    src/blocks/forms/java/org/apache/cocoon/forms/formmodel
                        Field.java BooleanField.java Action.java
  Log:
  Implemented ActionListenerEnabled/ValueChangedListenerEnabled
  (allows uniform treatment in scriptablewidget)
  
  Revision  Changes    Path
  1.11      +3 -2      cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java
  
  Index: Field.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Field.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Field.java	27 Apr 2004 09:17:01 -0000	1.10
  +++ Field.java	28 Apr 2004 13:11:10 -0000	1.11
  @@ -43,7 +43,8 @@
    * @author <a href="http://www.apache.org/~sylvain/">Sylvain Wallez</a>
    * @version CVS $Id$
    */
  -public class Field extends AbstractWidget implements ValidationErrorAware, DataWidget, SelectableWidget {
  +public class Field extends AbstractWidget implements ValidationErrorAware, DataWidget, SelectableWidget,
  +        ValueChangedListenerEnabled {
       /** Overrides selection list defined in FieldDefinition, if any. */
       protected SelectionList selectionList;
       /** Additional listeners to those defined as part of the widget definition (if any). */
  
  
  
  1.8       +4 -7      cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java
  
  Index: BooleanField.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/BooleanField.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BooleanField.java	27 Apr 2004 09:17:01 -0000	1.7
  +++ BooleanField.java	28 Apr 2004 13:11:10 -0000	1.8
  @@ -19,10 +19,7 @@
   
   import org.apache.cocoon.forms.Constants;
   import org.apache.cocoon.forms.FormContext;
  -import org.apache.cocoon.forms.event.ValueChangedEvent;
  -import org.apache.cocoon.forms.event.WidgetEvent;
  -import org.apache.cocoon.forms.event.ValueChangedListener;
  -import org.apache.cocoon.forms.event.WidgetEventMulticaster;
  +import org.apache.cocoon.forms.event.*;
   import org.apache.cocoon.xml.XMLUtils;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
  @@ -40,7 +37,7 @@
    * 
    * @version $Id$
    */
  -public class BooleanField extends AbstractWidget {
  +public class BooleanField extends AbstractWidget implements ValueChangedListenerEnabled {
       // FIXME(SW) : should the initial value be false or null ? This would allow
       // event listeners to be triggered at bind time.
       private Boolean value = Boolean.FALSE;
  @@ -72,7 +69,7 @@
       /**
        * Always return <code>true</code> (an action has no validation)
        * 
  -     * @todo is there a use case for boolean fields having validators?
  +     * TODO is there a use case for boolean fields having validators?
        */
       public boolean validate(FormContext formContext) {
           // a boolean field is always valid
  
  
  
  1.8       +3 -6      cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Action.java
  
  Index: Action.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/Action.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Action.java	27 Apr 2004 09:17:01 -0000	1.7
  +++ Action.java	28 Apr 2004 13:11:10 -0000	1.8
  @@ -17,10 +17,7 @@
   
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.forms.FormContext;
  -import org.apache.cocoon.forms.event.ActionEvent;
  -import org.apache.cocoon.forms.event.WidgetEvent;
  -import org.apache.cocoon.forms.event.ActionListener;
  -import org.apache.cocoon.forms.event.WidgetEventMulticaster;
  +import org.apache.cocoon.forms.event.*;
   
   /**
    * An Action widget. An Action widget can cause an {@link ActionEvent} to be triggered
  @@ -33,7 +30,7 @@
    * 
    * @version $Id$
    */
  -public class Action extends AbstractWidget {
  +public class Action extends AbstractWidget implements ActionListenerEnabled {
       private final ActionDefinition definition;
       /** Additional listeners to those defined as part of the widget definition (if any). */
       private ActionListener listener;