From: Egon W. <eg...@us...> - 2003-08-14 18:51:35
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/app In directory sc8-pr-cvs1:/tmp/cvs-serv14150/src/org/openscience/jmol/app Modified Files: Jmol.java Log Message: Required changes to deal with new CDK jar Index: Jmol.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/Jmol.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Jmol.java 8 Aug 2003 00:50:08 -0000 1.15 +++ Jmol.java 14 Aug 2003 18:26:42 -0000 1.16 @@ -25,7 +25,8 @@ package org.openscience.jmol.app; import org.openscience.jmol.*; -import org.openscience.jmol.io.ReaderFactory; +import org.openscience.cdk.io.ChemObjectReader; +import org.openscience.cdk.io.ReaderFactory; import org.openscience.jmol.io.ChemFileReader; import org.openscience.jmol.io.CMLSaver; import org.openscience.jmol.io.PdbSaver; @@ -522,9 +523,10 @@ frame.setCursor(new Cursor(Cursor.WAIT_CURSOR)); try { - ChemFileReader reader = null; + ChemObjectReader reader = null; try { - reader = ReaderFactory.createReader(control, input); + ReaderFactory factory = new ReaderFactory(); + reader = factory.createReader(input); } catch (IOException ex) { throw new JmolException("readMolecule", "Error determining input format: " + ex); @@ -532,7 +534,8 @@ if (reader == null) { throw new JmolException("readMolecule", "Unknown input format"); } - ChemFile newChemFile = reader.read(); + ChemFile newChemFile = null; + // ChemFile chemFile = reader.read(new ChemFile()); -> CDK ChemFile if (newChemFile != null) { if (newChemFile.getNumberOfFrames() > 0) { @@ -545,7 +548,7 @@ throw new JmolException("readMolecule", "unknown error reading input"); } - } catch (IOException ex) { + } catch (Exception ex) { throw new JmolException("readMolecule", "Error reading input: " + ex); } finally { frame.setCursor(new Cursor(Cursor.DEFAULT_CURSOR)); |