[Cdk-commits] CVS: cdk/src/org/openscience/cdk/applications FileConvertor.java,1.18,1.19

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/applications
In directory sc8-pr-cvs1:/tmp/cvs-serv9053/applications

Modified Files:
	FileConvertor.java 
Log Message:
Merged Reader and WriterListener because the implementation is identical

Index: FileConvertor.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/FileConvertor.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- FileConvertor.java	20 Jun 2003 11:05:37 -0000	1.18
+++ FileConvertor.java	20 Jun 2003 18:33:59 -0000	1.19
@@ -26,6 +26,7 @@
 import org.openscience.cdk.*;
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.io.program.*;
+import org.openscience.cdk.io.listener.*;
 import org.openscience.cdk.exception.*;
 import org.openscience.cdk.tools.LoggingTool;
 import java.io.*;
@@ -52,8 +53,7 @@
     private String ofilename;
     private ChemObjectWriter cow;
     
-    private WriterListener writerListener;
-    private ReaderListener readerListener;
+    private TextGUIListener settingListener;
 
     private int level;
     
@@ -76,8 +76,7 @@
         this.oformat = oformat;
         this.level = level;
         
-        readerListener = new TextReaderListener(level);
-        writerListener = new TextWriterListener(level);
+        settingListener = new TextGUIListener(level);
         
         logger.debug("Input format: " + iformat);
         logger.debug("Output format: " + oformat);
@@ -218,7 +217,7 @@
             reader = new XYZReader(fileReader);
         }
         if (reader != null) {
-            reader.addReaderListener(readerListener);
+            reader.addReaderListener(settingListener);
         }
         return reader;
     }
@@ -245,7 +244,7 @@
             writer = new GaussianInputWriter(fw);
         }
         if (writer != null) {
-            writer.addWriterListener(writerListener);
+            writer.addWriterListener(settingListener);
         }
         return writer;
     }