[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester Connection.java,1.4,1.5 DigesterPipelineUnmarshaller.java,1.6,1.7 Dynamic.java,1.4,1.5 Option.java,1.4,1.5 Pipeline.java,1.4,1.5 StageInst.java,1.4,1.5

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/modules/core/src/com/babeldoc/core/pipeline/xml/digester

Modified Files:
	Connection.java DigesterPipelineUnmarshaller.java Dynamic.java 
	Option.java Pipeline.java StageInst.java 
Log Message:
updated the commons-lang component.  going through all the TODOs and remediating the issues.

Index: Connection.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Connection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Connection.java	12 Aug 2003 23:44:44 -0000	1.4
--- Connection.java	16 Sep 2003 05:19:01 -0000	1.5
***************
*** 79,85 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param sink DOCUMENT ME!
     */
    public void setSink(String sink) {
--- 79,85 ----
  
    /**
!    * Set the sink stage
     *
!    * @param sink stage as a sink
     */
    public void setSink(String sink) {
***************
*** 88,94 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getSink() {
--- 88,92 ----
  
    /**
!    * @return get the sink stage
     */
    public String getSink() {
***************
*** 97,103 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param source DOCUMENT ME!
     */
    public void setSource(String source) {
--- 95,101 ----
  
    /**
!    * Set the source stage
     *
!    * @param source the source stage
     */
    public void setSource(String source) {
***************
*** 106,112 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getSource() {
--- 104,108 ----
  
    /**
!    * @return get the source stage
     */
    public String getSource() {

Index: DigesterPipelineUnmarshaller.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/DigesterPipelineUnmarshaller.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DigesterPipelineUnmarshaller.java	12 Aug 2003 23:44:44 -0000	1.6
--- DigesterPipelineUnmarshaller.java	16 Sep 2003 05:19:01 -0000	1.7
***************
*** 77,82 ****
  import java.io.InputStream;
  
- import java.util.ArrayList;
  import java.util.Iterator;
  
  
--- 77,82 ----
  import java.io.InputStream;
  
  import java.util.Iterator;
+ import java.util.Collection;
  
  
***************
*** 143,147 ****
    public com.babeldoc.core.pipeline.PipelineStageConnection[] getPipelineStageConnections() {
      try {
!       ArrayList connections = pipeline.getDynamic().getConnections();
        com.babeldoc.core.pipeline.PipelineStageConnection[] pstageConnections = new com.babeldoc.core.pipeline.PipelineStageConnection[connections.size()];
        int count = 0;
--- 143,147 ----
    public com.babeldoc.core.pipeline.PipelineStageConnection[] getPipelineStageConnections() {
      try {
!       Collection connections = pipeline.getDynamic().getConnections();
        com.babeldoc.core.pipeline.PipelineStageConnection[] pstageConnections = new com.babeldoc.core.pipeline.PipelineStageConnection[connections.size()];
        int count = 0;
***************
*** 173,177 ****
        config.setValue(pipeline.getDynamic().getEntryStage());
  
!       ArrayList stages = pipeline.getDynamic().getStageInsts();
  
        for (Iterator sIter = stages.iterator(); sIter.hasNext();) {
--- 173,177 ----
        config.setValue(pipeline.getDynamic().getEntryStage());
  
!       Collection stages = pipeline.getDynamic().getStageInsts();
  
        for (Iterator sIter = stages.iterator(); sIter.hasNext();) {
***************
*** 181,185 ****
          stageConfig.addChild(new ConfigData(STAGE_DESC,  stageInst.getDesc()));
  
!         ArrayList configs = stageInst.getOptions();
  
          for (Iterator i = configs.iterator(); i.hasNext();) {
--- 181,185 ----
          stageConfig.addChild(new ConfigData(STAGE_DESC,  stageInst.getDesc()));
  
!         Collection configs = stageInst.getOptions();
  
          for (Iterator i = configs.iterator(); i.hasNext();) {
***************
*** 220,224 ****
  
      if (option.getSubOptions().size() > 0) {
!       ArrayList suboptions = option.getSubOptions();
  
        for (Iterator i = suboptions.iterator(); i.hasNext();) {
--- 220,224 ----
  
      if (option.getSubOptions().size() > 0) {
!       Collection suboptions = option.getSubOptions();
  
        for (Iterator i = suboptions.iterator(); i.hasNext();) {

Index: Dynamic.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Dynamic.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Dynamic.java	12 Aug 2003 23:44:45 -0000	1.4
--- Dynamic.java	16 Sep 2003 05:19:01 -0000	1.5
***************
*** 67,70 ****
--- 67,71 ----
  
  import java.util.ArrayList;
+ import java.util.Collection;
  
  
***************
*** 78,107 ****
   */
  public class Dynamic {
!   private ArrayList connections = new ArrayList();
!   private ArrayList stageInsts = new ArrayList();
    private String entryStage;
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param connections DOCUMENT ME!
     */
!   public void setConnections(ArrayList connections) {
      this.connections = connections;
    }
  
    /**
-    * TODO: DOCUMENT ME!
-    *
     * @return DOCUMENT ME!
     */
!   public ArrayList getConnections() {
      return connections;
    }
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param entryStage DOCUMENT ME!
     */
    public void setEntryStage(String entryStage) {
--- 79,111 ----
   */
  public class Dynamic {
!   /** the collection of connections */
!   private Collection connections = new ArrayList();
! 
!   /** the stage insts collection */
!   private Collection stageInsts = new ArrayList();
! 
!   /** the entry stage */
    private String entryStage;
  
    /**
!    * Set the connections
     *
!    * @param connections
     */
!   public void setConnections(Collection connections) {
      this.connections = connections;
    }
  
    /**
     * @return DOCUMENT ME!
     */
!   public Collection getConnections() {
      return connections;
    }
  
    /**
!    * set the entry stage
     *
!    * @param entryStage
     */
    public void setEntryStage(String entryStage) {
***************
*** 110,116 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getEntryStage() {
--- 114,118 ----
  
    /**
!    * @return get the entry stage
     */
    public String getEntryStage() {
***************
*** 119,125 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param stageInsts DOCUMENT ME!
     */
    public void setStageInsts(ArrayList stageInsts) {
--- 121,127 ----
  
    /**
!    * set the stage insts
     *
!    * @param stageInsts
     */
    public void setStageInsts(ArrayList stageInsts) {
***************
*** 128,143 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
!   public ArrayList getStageInsts() {
      return stageInsts;
    }
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param connection DOCUMENT ME!
     */
    public void addConnection(Connection connection) {
--- 130,143 ----
  
    /**
!    * @return Get the stage insts
     */
!   public Collection getStageInsts() {
      return stageInsts;
    }
  
    /**
!    * Add a connection
     *
!    * @param connection
     */
    public void addConnection(Connection connection) {
***************
*** 146,152 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param stageInst DOCUMENT ME!
     */
    public void addStageInst(StageInst stageInst) {
--- 146,152 ----
  
    /**
!    * Add a stage instance
     *
!    * @param stageInst
     */
    public void addStageInst(StageInst stageInst) {

Index: Option.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Option.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Option.java	12 Aug 2003 23:44:45 -0000	1.4
--- Option.java	16 Sep 2003 05:19:01 -0000	1.5
***************
*** 67,70 ****
--- 67,71 ----
  
  import java.util.ArrayList;
+ import java.util.Collection;
  
  
***************
*** 78,89 ****
   */
  public class Option {
!   private ArrayList subOptions = new ArrayList();
    private String name;
    private String value;
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param name DOCUMENT ME!
     */
    public void setName(String name) {
--- 79,95 ----
   */
  public class Option {
!   /** the collection of suboptions */
!   private Collection subOptions = new ArrayList();
! 
!   /** the option name */
    private String name;
+ 
+   /** the value of the option */
    private String value;
  
    /**
!    * Set the name of the option
     *
!    * @param name
     */
    public void setName(String name) {
***************
*** 92,98 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getName() {
--- 98,102 ----
  
    /**
!    * @return get the name of the option
     */
    public String getName() {
***************
*** 101,125 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param subOptions DOCUMENT ME!
     */
!   public void setSubOptions(ArrayList subOptions) {
      this.subOptions = subOptions;
    }
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
!   public ArrayList getSubOptions() {
      return subOptions;
    }
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param value DOCUMENT ME!
     */
    public void setValue(String value) {
--- 105,127 ----
  
    /**
!    * Set the suboptions
     *
!    * @param subOptions
     */
!   public void setSubOptions(Collection subOptions) {
      this.subOptions = subOptions;
    }
  
    /**
!    * @return collection of sub options
     */
!   public Collection getSubOptions() {
      return subOptions;
    }
  
    /**
!    * Set the value of the option
     *
!    * @param value
     */
    public void setValue(String value) {
***************
*** 128,134 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getValue() {
--- 130,134 ----
  
    /**
!    * @return Get the value of the option
     */
    public String getValue() {
***************
*** 137,143 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param option DOCUMENT ME!
     */
    public void addSubOption(Option option) {
--- 137,143 ----
  
    /**
!    * Add an option as a suboption
     *
!    * @param option
     */
    public void addSubOption(Option option) {

Index: Pipeline.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Pipeline.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Pipeline.java	12 Aug 2003 23:44:45 -0000	1.4
--- Pipeline.java	16 Sep 2003 05:19:01 -0000	1.5
***************
*** 75,86 ****
   */
  public class Pipeline {
    private Dynamic dynamic;
    private String documentation;
    private String name;
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param documentation DOCUMENT ME!
     */
    public void setDocumentation(String documentation) {
--- 75,91 ----
   */
  public class Pipeline {
+   /** the dynamic portions of the pipeline */
    private Dynamic dynamic;
+ 
+   /** the documentation of the pipeline */
    private String documentation;
+ 
+   /** the name of the pipeline */
    private String name;
  
    /**
!    * Set the documentation on the pipeline
     *
!    * @param documentation
     */
    public void setDocumentation(String documentation) {
***************
*** 89,95 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getDocumentation() {
--- 94,98 ----
  
    /**
!    * @return get the documentation
     */
    public String getDocumentation() {
***************
*** 98,104 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param dynamic DOCUMENT ME!
     */
    public void setDynamic(Dynamic dynamic) {
--- 101,107 ----
  
    /**
!    * set the dynamic option
     *
!    * @param dynamic
     */
    public void setDynamic(Dynamic dynamic) {
***************
*** 107,113 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public Dynamic getDynamic() {
--- 110,114 ----
  
    /**
!    * @return get the dynamic option
     */
    public Dynamic getDynamic() {
***************
*** 116,122 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param name DOCUMENT ME!
     */
    public void setName(String name) {
--- 117,123 ----
  
    /**
!    * set the name
     *
!    * @param name
     */
    public void setName(String name) {
***************
*** 125,131 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getName() {
--- 126,130 ----
  
    /**
!    * @return get the pipeline name
     */
    public String getName() {
***************
*** 134,140 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param dynamic DOCUMENT ME!
     */
    public void addDynamic(Dynamic dynamic) {
--- 133,139 ----
  
    /**
!    * Add a dynamic portion
     *
!    * @param dynamic
     */
    public void addDynamic(Dynamic dynamic) {

Index: StageInst.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/StageInst.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StageInst.java	12 Aug 2003 23:44:45 -0000	1.4
--- StageInst.java	16 Sep 2003 05:19:01 -0000	1.5
***************
*** 67,70 ****
--- 67,71 ----
  
  import java.util.ArrayList;
+ import java.util.Collection;
  
  
***************
*** 78,88 ****
   */
  public class StageInst {
!   private ArrayList options = new ArrayList();
    private String desc;
    private String name;
    private String type;
  
    /**
!    * TODO: DOCUMENT ME!
     *
     * @param desc DOCUMENT ME!
--- 79,97 ----
   */
  public class StageInst {
! 
!   /** the collection of options */
!   private Collection options = new ArrayList();
! 
!   /** the stage description */
    private String desc;
+ 
+   /** the name of the stage */
    private String name;
+ 
+   /** the type of the stage */
    private String type;
  
    /**
!    * Set the description
     *
     * @param desc DOCUMENT ME!
***************
*** 93,99 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getDesc() {
--- 102,106 ----
  
    /**
!    * @return get the description
     */
    public String getDesc() {
***************
*** 102,108 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param name DOCUMENT ME!
     */
    public void setName(String name) {
--- 109,115 ----
  
    /**
!    * set the name of the stage instance
     *
!    * @param name
     */
    public void setName(String name) {
***************
*** 111,117 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getName() {
--- 118,122 ----
  
    /**
!    * @return get the pipeline stage name
     */
    public String getName() {
***************
*** 120,144 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param options DOCUMENT ME!
     */
!   public void setOptions(ArrayList options) {
      this.options = options;
    }
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
!   public ArrayList getOptions() {
      return options;
    }
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param type DOCUMENT ME!
     */
    public void setType(String type) {
--- 125,147 ----
  
    /**
!    * set the options
     *
!    * @param options collection of options
     */
!   public void setOptions(Collection options) {
      this.options = options;
    }
  
    /**
!    * @return Get the options collections
     */
!   public Collection getOptions() {
      return options;
    }
  
    /**
!    * Get the type
     *
!    * @param type
     */
    public void setType(String type) {
***************
*** 147,153 ****
  
    /**
!    * TODO: DOCUMENT ME!
!    *
!    * @return DOCUMENT ME!
     */
    public String getType() {
--- 150,154 ----
  
    /**
!    * @return get the type of the stage
     */
    public String getType() {
***************
*** 156,162 ****
  
    /**
!    * TODO: DOCUMENT ME!
     *
!    * @param option DOCUMENT ME!
     */
    public void addOption(Option option) {
--- 157,163 ----
  
    /**
!    * add the option
     *
!    * @param option
     */
    public void addOption(Option option) {