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

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

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/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:
javadoc and formatting here.

Index: Dynamic.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Dynamic.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Dynamic.java	16 Sep 2003 05:19:01 -0000	1.5
--- Dynamic.java	30 Jul 2004 01:33:04 -0000	1.6
***************
*** 79,95 ****
   */
  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) {
--- 79,95 ----
   */
  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 conenections to set
     */
    public void setConnections(Collection connections) {
***************
*** 98,102 ****
  
    /**
!    * @return DOCUMENT ME!
     */
    public Collection getConnections() {
--- 98,102 ----
  
    /**
!    * @return get the connections.
     */
    public Collection getConnections() {
***************
*** 105,111 ****
  
    /**
!    * set the entry stage
     *
!    * @param entryStage
     */
    public void setEntryStage(String entryStage) {
--- 105,111 ----
  
    /**
!    * set the entry stage.
     *
!    * @param entryStage the new entry stage.
     */
    public void setEntryStage(String entryStage) {
***************
*** 121,127 ****
  
    /**
!    * set the stage insts
     *
!    * @param stageInsts
     */
    public void setStageInsts(ArrayList stageInsts) {
--- 121,127 ----
  
    /**
!    * set the stage insts.
     *
!    * @param stageInsts stage insts
     */
    public void setStageInsts(ArrayList stageInsts) {
***************
*** 130,134 ****
  
    /**
!    * @return Get the stage insts
     */
    public Collection getStageInsts() {
--- 130,134 ----
  
    /**
!    * @return Get the stage insts.
     */
    public Collection getStageInsts() {
***************
*** 137,143 ****
  
    /**
!    * Add a connection
     *
!    * @param connection
     */
    public void addConnection(Connection connection) {
--- 137,143 ----
  
    /**
!    * Add a connection.
     *
!    * @param connection connection to add.
     */
    public void addConnection(Connection connection) {
***************
*** 146,152 ****
  
    /**
!    * Add a stage instance
     *
!    * @param stageInst
     */
    public void addStageInst(StageInst stageInst) {
--- 146,152 ----
  
    /**
!    * Add a stage instance.
     *
!    * @param stageInst isntnce to add.
     */
    public void addStageInst(StageInst stageInst) {

Index: DigesterPipelineUnmarshaller.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/DigesterPipelineUnmarshaller.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DigesterPipelineUnmarshaller.java	16 Sep 2003 05:19:01 -0000	1.7
--- DigesterPipelineUnmarshaller.java	30 Jul 2004 01:33:04 -0000	1.8
***************
*** 67,70 ****
--- 67,71 ----
  
  import com.babeldoc.core.pipeline.xml.IUnmarshaller;
+ import com.babeldoc.core.pipeline.PipelineStageConnection;
  import com.babeldoc.core.option.IConfigData;
  import com.babeldoc.core.option.ConfigData;
***************
*** 92,102 ****
      implements IUnmarshaller {
  
!   /** pipeline value object */
    private Pipeline pipeline;
  
!   /** key for stageType */
    public static final String STAGE_TYPE = "stageType";
  
!   /** get for description */
    public static final String STAGE_DESC = "stageDesc";
  
--- 93,103 ----
      implements IUnmarshaller {
  
!   /** pipeline value object. */
    private Pipeline pipeline;
  
!   /** key for stageType. */
    public static final String STAGE_TYPE = "stageType";
  
!   /** get for description. */
    public static final String STAGE_DESC = "stageDesc";
  
***************
*** 106,110 ****
     * Construct the unmarshaller from the source...
     *
!    * @param input
     */
    public DigesterPipelineUnmarshaller(InputStream input) {
--- 107,111 ----
     * Construct the unmarshaller from the source...
     *
!    * @param input input stream
     */
    public DigesterPipelineUnmarshaller(InputStream input) {
***************
*** 127,133 ****
     * Construct the unmarshaller from the source...
     *
!    * @param filename
!    *
!    * @throws IOException DOCUMENT ME!
     */
    public DigesterPipelineUnmarshaller(String filename)
--- 128,133 ----
     * Construct the unmarshaller from the source...
     *
!    * @param filename the pipeline definition file
!    * @throws IOException
     */
    public DigesterPipelineUnmarshaller(String filename)
***************
*** 137,153 ****
  
    /**
!    * Get the pipeline stage connections from the
     *
!    * @return
     */
!   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;
  
        for (Iterator i = connections.iterator(); i.hasNext();) {
          Connection connection = (Connection) i.next();
!         pstageConnections[count++] = new com.babeldoc.core.pipeline.PipelineStageConnection(connection.getSource(),
              connection.getSink());
        }
--- 137,153 ----
  
    /**
!    * Get the pipeline stage connections from the configuration
     *
!    * @return array of pipeline stage connections.
     */
!   public PipelineStageConnection[] getPipelineStageConnections() {
      try {
        Collection connections = pipeline.getDynamic().getConnections();
!       PipelineStageConnection[] pstageConnections = new PipelineStageConnection[connections.size()];
        int count = 0;
  
        for (Iterator i = connections.iterator(); i.hasNext();) {
          Connection connection = (Connection) i.next();
!         pstageConnections[count++] = new PipelineStageConnection(connection.getSource(),
              connection.getSink());
        }
***************
*** 166,170 ****
     * pipeline stage config.
     *
!    * @return
     */
    public IConfigData getRootConfig() {
--- 166,170 ----
     * pipeline stage config.
     *
!    * @return configuarion data
     */
    public IConfigData getRootConfig() {
***************
*** 199,207 ****
  
    /**
!    * Test me!
!    *
!    * @param args
     *
!    * @throws IOException DOCUMENT ME!
     */
    public static void main(String[] args) throws IOException {
--- 199,206 ----
  
    /**
!    * Test.
     *
!    * @param args commandline arguments.
!    * @throws IOException
     */
    public static void main(String[] args) throws IOException {
***************
*** 234,238 ****
     * setup the digester.
     *
!    * @param digester
     */
    private void configureDigester(Digester digester) {
--- 233,237 ----
     * setup the digester.
     *
!    * @param digester digester to configure
     */
    private void configureDigester(Digester digester) {

Index: StageInst.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/StageInst.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StageInst.java	16 Sep 2003 05:19:01 -0000	1.5
--- StageInst.java	30 Jul 2004 01:33:04 -0000	1.6
***************
*** 80,99 ****
  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!
     */
    public void setDesc(String desc) {
--- 80,99 ----
  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 set the description of the stage instance.
     */
    public void setDesc(String desc) {
***************
*** 109,115 ****
  
    /**
!    * set the name of the stage instance
     *
!    * @param name
     */
    public void setName(String name) {
--- 109,115 ----
  
    /**
!    * set the name of the stage instance.
     *
!    * @param name new name of the stage instance
     */
    public void setName(String name) {
***************
*** 141,147 ****
  
    /**
!    * Get the type
     *
!    * @param type
     */
    public void setType(String type) {
--- 141,147 ----
  
    /**
!    * set the type.
     *
!    * @param type new type.
     */
    public void setType(String type) {
***************
*** 157,163 ****
  
    /**
!    * add the option
     *
!    * @param option
     */
    public void addOption(Option option) {
--- 157,163 ----
  
    /**
!    * add the option.
     *
!    * @param option add option
     */
    public void addOption(Option option) {

Index: Connection.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Connection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Connection.java	16 Sep 2003 05:19:01 -0000	1.5
--- Connection.java	30 Jul 2004 01:33:04 -0000	1.6
***************
*** 79,83 ****
  
    /**
!    * Set the sink stage
     *
     * @param sink stage as a sink
--- 79,83 ----
  
    /**
!    * Set the sink stage.
     *
     * @param sink stage as a sink
***************
*** 95,99 ****
  
    /**
!    * Set the source stage
     *
     * @param source the source stage
--- 95,99 ----
  
    /**
!    * Set the source stage.
     *
     * @param source the source stage

Index: Option.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/xml/digester/Option.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Option.java	16 Sep 2003 05:19:01 -0000	1.5
--- Option.java	30 Jul 2004 01:33:04 -0000	1.6
***************
*** 79,93 ****
   */
  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
--- 79,93 ----
   */
  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
***************
*** 105,111 ****
  
    /**
!    * Set the suboptions
     *
!    * @param subOptions
     */
    public void setSubOptions(Collection subOptions) {
--- 105,111 ----
  
    /**
!    * Set the suboptions.
     *
!    * @param subOptions suboptions
     */
    public void setSubOptions(Collection subOptions) {
***************
*** 121,127 ****
  
    /**
!    * Set the value of the option
     *
!    * @param value
     */
    public void setValue(String value) {
--- 121,127 ----
  
    /**
!    * Set the value of the option.
     *
!    * @param value  value
     */
    public void setValue(String value) {
***************
*** 137,143 ****
  
    /**
!    * Add an option as a suboption
     *
!    * @param option
     */
    public void addSubOption(Option option) {
--- 137,143 ----
  
    /**
!    * Add an option as a suboption.
     *
!    * @param option suboption
     */
    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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Pipeline.java	16 Sep 2003 05:19:01 -0000	1.5
--- Pipeline.java	30 Jul 2004 01:33:04 -0000	1.6
***************
*** 85,89 ****
  
    /**
!    * Set the documentation on the pipeline
     *
     * @param documentation
--- 85,89 ----
  
    /**
!    * Set the documentation on the pipeline.
     *
     * @param documentation
***************
*** 101,107 ****
  
    /**
!    * set the dynamic option
     *
!    * @param dynamic
     */
    public void setDynamic(Dynamic dynamic) {
--- 101,107 ----
  
    /**
!    * set the dynamic option.
     *
!    * @param dynamic dynamic
     */
    public void setDynamic(Dynamic dynamic) {
***************
*** 117,123 ****
  
    /**
!    * set the name
     *
!    * @param name
     */
    public void setName(String name) {
--- 117,123 ----
  
    /**
!    * set the name.
     *
!    * @param name name
     */
    public void setName(String name) {
***************
*** 133,139 ****
  
    /**
!    * Add a dynamic portion
     *
!    * @param dynamic
     */
    public void addDynamic(Dynamic dynamic) {
--- 133,139 ----
  
    /**
!    * Add a dynamic portion.
     *
!    * @param dynamic dynamic
     */
    public void addDynamic(Dynamic dynamic) {