You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by st...@apache.org on 2003/12/29 18:52:12 UTC

cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/transformation EffectWidgetReplacingPipe.java EffectPipe.java

stefano     2003/12/29 09:52:12

  Modified:    src/blocks/woody/java/org/apache/cocoon/woody/formmodel
                        ContainerDelegate.java ContainerDefinition.java
                        UnionDefinition.java RepeaterDefinition.java
                        Form.java ContainerWidget.java
                        AbstractContainerWidget.java
               src/blocks/woody/java/org/apache/cocoon/woody/transformation
                        EffectWidgetReplacingPipe.java EffectPipe.java
  Log:
  organizing imports
  
  Revision  Changes    Path
  1.2       +8 -4      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/ContainerDelegate.java
  
  Index: ContainerDelegate.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/ContainerDelegate.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerDelegate.java	29 Dec 2003 06:14:49 -0000	1.1
  +++ ContainerDelegate.java	29 Dec 2003 17:52:12 -0000	1.2
  @@ -50,13 +50,17 @@
   */
   package org.apache.cocoon.woody.formmodel;
   
  +import java.util.ArrayList;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.Locale;
  +import java.util.Map;
  +
   import org.apache.cocoon.woody.Constants;
   import org.apache.cocoon.woody.FormContext;
  -import org.apache.cocoon.xml.AttributesImpl;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
  -
  -import java.util.*;
   
   /**
    * Helper class for the implementation of widgets containing other widgets.
  
  
  
  1.2       +1 -13     cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/ContainerDefinition.java
  
  Index: ContainerDefinition.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/ContainerDefinition.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerDefinition.java	29 Dec 2003 06:14:49 -0000	1.1
  +++ ContainerDefinition.java	29 Dec 2003 17:52:12 -0000	1.2
  @@ -51,19 +51,7 @@
   package org.apache.cocoon.woody.formmodel;
   
   import java.util.Collection;
  -import java.util.Iterator;
   import java.util.List;
  -import java.util.Map;
  -
  -import org.apache.avalon.framework.service.ServiceException;
  -import org.apache.avalon.framework.service.ServiceManager;
  -import org.apache.cocoon.woody.datatype.Datatype;
  -import org.apache.cocoon.woody.datatype.SelectionList;
  -import org.apache.cocoon.woody.event.ValueChangedEvent;
  -import org.apache.cocoon.woody.event.ValueChangedListener;
  -import org.w3c.dom.Element;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.SAXException;
   
   /**
    * Interface to be implemented by WidgetDefinitions for Widgets which contain other widgets.
  
  
  
  1.2       +1 -4      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/UnionDefinition.java
  
  Index: UnionDefinition.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/UnionDefinition.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UnionDefinition.java	29 Dec 2003 06:14:49 -0000	1.1
  +++ UnionDefinition.java	29 Dec 2003 17:52:12 -0000	1.2
  @@ -51,9 +51,6 @@
   package org.apache.cocoon.woody.formmodel;
   
   
  -import java.util.Iterator;
  -
  -import org.apache.cocoon.woody.datatype.Datatype;
   /**
    * The {@link WidgetDefinition} corresponding to a {@link Union} widget.
    *
  
  
  
  1.5       +0 -2      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/RepeaterDefinition.java
  
  Index: RepeaterDefinition.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/RepeaterDefinition.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RepeaterDefinition.java	29 Dec 2003 06:14:49 -0000	1.4
  +++ RepeaterDefinition.java	29 Dec 2003 17:52:12 -0000	1.5
  @@ -50,8 +50,6 @@
   */
   package org.apache.cocoon.woody.formmodel;
   
  -import java.util.*;
  -
   /**
    * The {@link WidgetDefinition} part of a Repeater widget, see {@link Repeater} for more information.
    */
  
  
  
  1.13      +1 -5      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Form.java	29 Dec 2003 06:14:49 -0000	1.12
  +++ Form.java	29 Dec 2003 17:52:12 -0000	1.13
  @@ -50,12 +50,8 @@
   */
   package org.apache.cocoon.woody.formmodel;
   
  -import java.util.ArrayList;
  -import java.util.HashMap;
   import java.util.Iterator;
  -import java.util.List;
   import java.util.Locale;
  -import java.util.Map;
   import java.util.StringTokenizer;
   
   import org.apache.cocoon.woody.Constants;
  
  
  
  1.4       +1 -10     cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/ContainerWidget.java
  
  Index: ContainerWidget.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/ContainerWidget.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ContainerWidget.java	29 Dec 2003 06:14:49 -0000	1.3
  +++ ContainerWidget.java	29 Dec 2003 17:52:12 -0000	1.4
  @@ -50,15 +50,6 @@
   */
   package org.apache.cocoon.woody.formmodel;
   
  -import org.apache.cocoon.woody.FormContext;
  -import org.apache.cocoon.woody.datatype.Datatype;
  -import org.apache.cocoon.woody.datatype.SelectionList;
  -import org.apache.cocoon.woody.datatype.ValidationError;
  -import org.apache.cocoon.woody.event.WidgetEvent;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.SAXException;
  -
  -import java.util.Locale;
   
   /**
    * Interface to be implemented by Widgets which contain other widgets.
  
  
  
  1.2       +1 -4      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractContainerWidget.java
  
  Index: AbstractContainerWidget.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractContainerWidget.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractContainerWidget.java	29 Dec 2003 06:14:49 -0000	1.1
  +++ AbstractContainerWidget.java	29 Dec 2003 17:52:12 -0000	1.2
  @@ -53,9 +53,6 @@
   import java.util.Locale;
   
   import org.apache.cocoon.woody.Constants;
  -import org.apache.cocoon.woody.datatype.Datatype;
  -import org.apache.cocoon.woody.datatype.SelectionList;
  -import org.apache.cocoon.woody.datatype.ValidationError;
   import org.apache.cocoon.woody.FormContext;
   import org.apache.cocoon.xml.AttributesImpl;
   import org.xml.sax.ContentHandler;
  
  
  
  1.3       +1 -2      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/transformation/EffectWidgetReplacingPipe.java
  
  Index: EffectWidgetReplacingPipe.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/transformation/EffectWidgetReplacingPipe.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EffectWidgetReplacingPipe.java	29 Dec 2003 15:37:28 -0000	1.2
  +++ EffectWidgetReplacingPipe.java	29 Dec 2003 17:52:12 -0000	1.3
  @@ -62,7 +62,6 @@
   import org.apache.cocoon.woody.formmodel.Struct;
   import org.apache.cocoon.woody.formmodel.Union;
   import org.apache.cocoon.woody.formmodel.Widget;
  -import org.apache.cocoon.woody.transformation.EffectPipe.Handler;
   import org.apache.cocoon.xml.AbstractXMLPipe;
   import org.apache.cocoon.xml.SaxBuffer;
   import org.apache.commons.jxpath.JXPathException;
  
  
  
  1.2       +1 -8      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/transformation/EffectPipe.java
  
  Index: EffectPipe.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/transformation/EffectPipe.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EffectPipe.java	29 Dec 2003 06:14:49 -0000	1.1
  +++ EffectPipe.java	29 Dec 2003 17:52:12 -0000	1.2
  @@ -50,15 +50,8 @@
   */
   package org.apache.cocoon.woody.transformation;
   
  -import java.io.IOException;
  -import java.util.List;
   import java.util.LinkedList;
  -import java.util.Map;
   
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.transformation.Transformer;
   import org.apache.cocoon.woody.Constants;
   import org.apache.cocoon.xml.AbstractXMLPipe;
   import org.apache.cocoon.xml.SaxBuffer;