[Cdk-commits] CVS: cdk-plugins/dirbrowser/src/org/openscience/cdkplugin/dirbrowser DirBrowserPlugin.java,1.13,1.14

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

Update of /cvsroot/cdk/cdk-plugins/dirbrowser/src/org/openscience/cdkplugin/dirbrowser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8198/src/org/openscience/cdkplugin/dirbrowser

Modified Files:
	DirBrowserPlugin.java 
Log Message:
Uses rewritten CDK IO detection mechanism from CVS 20041026 and Removed chemFormula, because the IO readers are no longer in the jar

Index: DirBrowserPlugin.java
===================================================================
RCS file: /cvsroot/cdk/cdk-plugins/dirbrowser/src/org/openscience/cdkplugin/dirbrowser/DirBrowserPlugin.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DirBrowserPlugin.java	26 Jun 2004 18:09:54 -0000	1.13
+++ DirBrowserPlugin.java	26 Oct 2004 10:50:42 -0000	1.14
@@ -33,6 +33,7 @@
 import org.openscience.cdk.exception.CDKException;
 import org.openscience.cdk.io.ReaderFactory;
 import org.openscience.cdk.io.ChemObjectReader;
+import org.openscience.cdk.io.formats.ChemFormat;
 import org.openscience.cdk.tools.LoggingTool;
 import java.util.Properties;
 import java.io.File;
@@ -102,7 +103,7 @@
     }
     
     public void start() {
-        readerFactory = new ReaderFactory(5000);
+        readerFactory = new ReaderFactory();
         parseDirectoryIntoTable();
         resetFileGuessing = true;
         if (fileGuessingThread == null) {
@@ -214,7 +215,7 @@
         private Vector models;
         
         final String[] columnNames = {
-            "filename", "date", "format", "chemFormula"
+            "filename", "date", "format"
         };
     
         public ContentModel() {
@@ -380,6 +381,7 @@
                 }
                 ChemFile file = null;
                 try {
+                    logger.debug("Passing FileReader for: ", fileObject);
                     Reader reader = new FileReader(fileObject);
                     editBus.showChemFile(reader);
                 } catch (Exception exception) {
@@ -441,20 +443,20 @@
                 logger.warn("Thread: Cannot open file if source is not stored");
                 return;
             }
-            String format = "";
+            String formatString = "";
             try {
-                ChemObjectReader reader = readerFactory.createReader(
+                ChemFormat format = readerFactory.guessFormat(
                     new FileInputStream(fileObject)
                 );
-                if (reader != null) {
-                    format = reader.getFormatName();
+                if (format != null) {
+                    formatString = format.getFormatName();
                 }
             } catch (FileNotFoundException exception) {
                 // cannot occur
             } catch (IOException exception) {
-                format = "IOException";
+                formatString = "IOException";
             }
-            model.setProperty("org.openscience.cdk.io.FileFormat", format);
+            model.setProperty("org.openscience.cdk.io.FileFormat", formatString);
             currentModel++;
             channelContent.fireTableDataChanged();
         }