csvtosql-cvs

[consonni d. <dav...@us...>]

Update of /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/configuration
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3125/src/net/sf/csv2sql/configuration

Modified Files:
	Configurator.java ManualConfigurator.java XmlConfigurator.java 
Log Message:
no message

Index: ManualConfigurator.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/configuration/ManualConfigurator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ManualConfigurator.java	25 Apr 2005 10:52:57 -0000	1.1
--- ManualConfigurator.java	25 Apr 2005 21:30:37 -0000	1.2
***************
*** 18,26 ****
  package net.sf.csv2sql.configuration;
  
  import net.sf.csv2sql.configuration.sections.TableStructure;
- import net.sf.csv2sql.configuration.sections.WriterList;
  import net.sf.csv2sql.grammars.AbstractGrammarFactory;
  import net.sf.csv2sql.renders.AbstractRender;
  import net.sf.csv2sql.storage.Storage;
  
  /**
--- 18,27 ----
  package net.sf.csv2sql.configuration;
  
+ import java.util.List;
  import net.sf.csv2sql.configuration.sections.TableStructure;
  import net.sf.csv2sql.grammars.AbstractGrammarFactory;
  import net.sf.csv2sql.renders.AbstractRender;
  import net.sf.csv2sql.storage.Storage;
+ import net.sf.csv2sql.writers.AbstractWriter;
  
  /**
***************
*** 34,38 ****
      AbstractRender render;
      TableStructure tableStructure;
!     WriterList writerList;
      Storage storage;
      
--- 35,39 ----
      AbstractRender render;
      TableStructure tableStructure;
!     List<AbstractWriter> writerList;
      Storage storage;
      
***************
*** 102,106 ****
      }
      
!     public void setWriters(WriterList writerList)
      throws IllegalArgumentException {
          if (writerList==null) {
--- 103,107 ----
      }
      
!     public void setWriters(List<AbstractWriter> writerList)
      throws IllegalArgumentException {
          if (writerList==null) {
***************
*** 109,113 ****
          this.writerList = writerList;                        
      }    
!     public WriterList getWriters()
      throws ConfiguratorException {
          if (writerList==null) {
--- 110,114 ----
          this.writerList = writerList;                        
      }    
!     public List<AbstractWriter> getWriters()
      throws ConfiguratorException {
          if (writerList==null) {

Index: XmlConfigurator.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/configuration/XmlConfigurator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlConfigurator.java	25 Apr 2005 10:52:57 -0000	1.1
--- XmlConfigurator.java	25 Apr 2005 21:30:37 -0000	1.2
***************
*** 19,22 ****
--- 19,24 ----
  
  import java.io.File;
+ import java.util.ArrayList;
+ import java.util.List;
  import java.util.Properties;
  import javax.xml.parsers.DocumentBuilder;
***************
*** 26,30 ****
  import org.w3c.dom.NodeList;
  import net.sf.csv2sql.configuration.sections.TableStructure;
- import net.sf.csv2sql.configuration.sections.WriterList;
  import net.sf.csv2sql.grammars.AbstractGrammarFactory;
  import net.sf.csv2sql.renders.AbstractRender;
--- 28,31 ----
***************
*** 40,44 ****
      private Document document;
      
!     private WriterList writers;
      private AbstractRender renderer;
      private AbstractGrammarFactory abstractGrammarFactory;
--- 41,45 ----
      private Document document;
      
!     private List<AbstractWriter> writers;
      private AbstractRender renderer;
      private AbstractGrammarFactory abstractGrammarFactory;
***************
*** 185,194 ****
      }
      
!     public WriterList getWriters()
      throws ConfiguratorException {
          try {
              if (writers!=null) {return writers;}
              
!             writers = new WriterList();
              NodeList writerAppenders = document.getElementsByTagName("writerAppender");
              
--- 186,195 ----
      }
      
!     public List<AbstractWriter> getWriters()
      throws ConfiguratorException {
          try {
              if (writers!=null) {return writers;}
              
!             writers = new ArrayList<AbstractWriter>();
              NodeList writerAppenders = document.getElementsByTagName("writerAppender");
              
***************
*** 217,221 ****
                          
                          //finally add it
!                         writers.addWriter(writer);
                      }
                      
--- 218,222 ----
                          
                          //finally add it
!                         writers.add(writer);
                      }
                      

Index: Configurator.java
===================================================================
RCS file: /cvsroot/csvtosql/csvtosql_jdk50/src/net/sf/csv2sql/configuration/Configurator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Configurator.java	25 Apr 2005 10:52:57 -0000	1.1
--- Configurator.java	25 Apr 2005 21:30:37 -0000	1.2
***************
*** 18,26 ****
  package net.sf.csv2sql.configuration;
  
  import net.sf.csv2sql.configuration.sections.TableStructure;
- import net.sf.csv2sql.configuration.sections.WriterList;
  import net.sf.csv2sql.grammars.AbstractGrammarFactory;
  import net.sf.csv2sql.renders.AbstractRender;
  import net.sf.csv2sql.storage.Storage;
  
  /**
--- 18,27 ----
  package net.sf.csv2sql.configuration;
  
+ import java.util.List;
  import net.sf.csv2sql.configuration.sections.TableStructure;
  import net.sf.csv2sql.grammars.AbstractGrammarFactory;
  import net.sf.csv2sql.renders.AbstractRender;
  import net.sf.csv2sql.storage.Storage;
+ import net.sf.csv2sql.writers.AbstractWriter;
  
  /**
***************
*** 39,43 ****
      throws ConfiguratorException;
      
!     public WriterList getWriters()
      throws ConfiguratorException;
      
--- 40,44 ----
      throws ConfiguratorException;
      
!     public List<AbstractWriter> getWriters()
      throws ConfiguratorException;