From: Egon W. <eg...@us...> - 2004-10-25 18:10:33
|
Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21021/src/org/openscience/cdk/database Modified Files: DBReader.java DBWriter.java XindiceReader.java Log Message: Reworked IO: split format matching from reading Index: DBReader.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/database/DBReader.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- DBReader.java 15 Feb 2004 21:17:39 -0000 1.10 +++ DBReader.java 25 Oct 2004 18:09:54 -0000 1.11 @@ -45,6 +45,7 @@ import org.openscience.cdk.exception.CDKException; import org.openscience.cdk.io.CMLReader; import org.openscience.cdk.io.DefaultChemObjectReader; +import org.openscience.cdk.io.formats.ChemFormat; /** * Reader that can read from a relational database that can be @@ -62,8 +63,14 @@ this.con = con; } - public String getFormatName() { - return "JDBC database"; + public ChemFormat getFormat() { + return new ChemFormat() { + public String getFormatName() { + return "JDBC database"; + } + public String getReaderClassName() { return null; }; + public String getWriterClassName() { return null; }; + }; } public void setReader(Reader input) throws CDKException { Index: DBWriter.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/database/DBWriter.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- DBWriter.java 12 Feb 2004 09:26:13 -0000 1.9 +++ DBWriter.java 25 Oct 2004 18:09:54 -0000 1.10 @@ -42,6 +42,7 @@ import org.openscience.cdk.exception.UnsupportedChemObjectException; import org.openscience.cdk.io.CMLWriter; import org.openscience.cdk.io.DefaultChemObjectWriter; +import org.openscience.cdk.io.formats.ChemFormat; /** * Writer that is used to store molecules in JDBC databases. @@ -59,8 +60,14 @@ this.con = con; } - public String getFormatName() { - return "JDBC database"; + public ChemFormat getFormat() { + return new ChemFormat() { + public String getFormatName() { + return "JDBC database"; + } + public String getReaderClassName() { return null; }; + public String getWriterClassName() { return null; }; + }; } /** Index: XindiceReader.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/database/XindiceReader.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- XindiceReader.java 15 Feb 2004 21:17:39 -0000 1.15 +++ XindiceReader.java 25 Oct 2004 18:09:54 -0000 1.16 @@ -41,6 +41,7 @@ import org.openscience.cdk.exception.CDKException; import org.openscience.cdk.io.CMLReader; import org.openscience.cdk.io.DefaultChemObjectReader; +import org.openscience.cdk.io.formats.ChemFormat; import org.xmldb.api.DatabaseManager; import org.xmldb.api.base.Collection; import org.xmldb.api.base.Database; @@ -76,8 +77,14 @@ this.collection = collection; } - public String getFormatName() { - return "Xindice database"; + public ChemFormat getFormat() { + return new ChemFormat() { + public String getFormatName() { + return "Xindice database"; + } + public String getReaderClassName() { return null; }; + public String getWriterClassName() { return null; }; + }; } public void setReader(Reader input) throws CDKException { |