From: <eg...@us...> - 2006-05-25 13:46:51
|
Revision: 6314 Author: egonw Date: 2006-05-25 06:46:35 -0700 (Thu, 25 May 2006) ViewCVS: http://svn.sourceforge.net/cdk/?rev=6314&view=rev Log Message: ----------- Updated for IChemFormat.getSupportedDataFeatures() addition. Modified Paths: -------------- trunk/cdk/src/org/openscience/cdk/database/DBReader.java trunk/cdk/src/org/openscience/cdk/database/DBWriter.java trunk/cdk/src/org/openscience/cdk/database/XindiceReader.java trunk/cdk/src/org/openscience/cdk/internet/DADMLReader.java trunk/cdk/src/org/openscience/cdk/internet/WWMMatrixReader.java Modified: trunk/cdk/src/org/openscience/cdk/database/DBReader.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/database/DBReader.java 2006-05-25 13:41:38 UTC (rev 6313) +++ trunk/cdk/src/org/openscience/cdk/database/DBReader.java 2006-05-25 13:46:35 UTC (rev 6314) @@ -42,6 +42,7 @@ import org.openscience.cdk.exception.CDKException; import org.openscience.cdk.io.CMLReader; import org.openscience.cdk.io.formats.IChemFormat; +import org.openscience.cdk.tools.DataFeatures; /** * Reader that can read from a relational database that can be @@ -71,7 +72,8 @@ public String[] getNameExtensions() { return new String[0]; }; public String getReaderClassName() { return null; }; public String getWriterClassName() { return null; } - public boolean isXMLBased() { return false; }; + public boolean isXMLBased() { return false; } + public int getSupportedDataFeatures() { return DataFeatures.NONE; }; }; } Modified: trunk/cdk/src/org/openscience/cdk/database/DBWriter.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/database/DBWriter.java 2006-05-25 13:41:38 UTC (rev 6313) +++ trunk/cdk/src/org/openscience/cdk/database/DBWriter.java 2006-05-25 13:46:35 UTC (rev 6314) @@ -41,6 +41,7 @@ import org.openscience.cdk.exception.UnsupportedChemObjectException; import org.openscience.cdk.io.CMLWriter; import org.openscience.cdk.io.formats.IChemFormat; +import org.openscience.cdk.tools.DataFeatures; /** * Writer that is used to store molecules in JDBC databases. @@ -71,6 +72,7 @@ public String[] getNameExtensions() { return new String[0]; } public String getMIMEType() { return null; } public boolean isXMLBased() { return false; } + public int getSupportedDataFeatures() { return DataFeatures.NONE; }; }; } Modified: trunk/cdk/src/org/openscience/cdk/database/XindiceReader.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/database/XindiceReader.java 2006-05-25 13:41:38 UTC (rev 6313) +++ trunk/cdk/src/org/openscience/cdk/database/XindiceReader.java 2006-05-25 13:46:35 UTC (rev 6314) @@ -42,6 +42,7 @@ import org.openscience.cdk.interfaces.ISetOfMolecules; import org.openscience.cdk.io.CMLReader; import org.openscience.cdk.io.formats.IChemFormat; +import org.openscience.cdk.tools.DataFeatures; import org.openscience.cdk.tools.LoggingTool; import org.xmldb.api.DatabaseManager; import org.xmldb.api.base.Collection; @@ -90,6 +91,7 @@ public String getReaderClassName() { return null; }; public String getWriterClassName() { return null; } public boolean isXMLBased() { return true; }; + public int getSupportedDataFeatures() { return DataFeatures.NONE; }; }; } Modified: trunk/cdk/src/org/openscience/cdk/internet/DADMLReader.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/internet/DADMLReader.java 2006-05-25 13:41:38 UTC (rev 6313) +++ trunk/cdk/src/org/openscience/cdk/internet/DADMLReader.java 2006-05-25 13:46:35 UTC (rev 6314) @@ -49,6 +49,7 @@ import org.openscience.cdk.io.IChemObjectReader; import org.openscience.cdk.io.ReaderFactory; import org.openscience.cdk.io.formats.IChemFormat; +import org.openscience.cdk.tools.DataFeatures; import org.openscience.cdk.tools.LoggingTool; import org.openscience.dadml.DATABASE; import org.openscience.dadml.DBDEF; @@ -103,6 +104,7 @@ public String getReaderClassName() { return null; }; public String getWriterClassName() { return null; } public boolean isXMLBased() { return true; }; + public int getSupportedDataFeatures() { return DataFeatures.NONE; }; }; } Modified: trunk/cdk/src/org/openscience/cdk/internet/WWMMatrixReader.java =================================================================== --- trunk/cdk/src/org/openscience/cdk/internet/WWMMatrixReader.java 2006-05-25 13:41:38 UTC (rev 6313) +++ trunk/cdk/src/org/openscience/cdk/internet/WWMMatrixReader.java 2006-05-25 13:46:35 UTC (rev 6314) @@ -51,6 +51,7 @@ import org.openscience.cdk.io.CMLReader; import org.openscience.cdk.io.formats.IChemFormat; import org.openscience.cdk.layout.StructureDiagramGenerator; +import org.openscience.cdk.tools.DataFeatures; /** * Reader for the World Wide Molecular Matrix, a project that can be found at @@ -99,6 +100,7 @@ public String getReaderClassName() { return null; }; public String getWriterClassName() { return null; } public boolean isXMLBased() { return false; }; + public int getSupportedDataFeatures() { return DataFeatures.NONE; }; }; } public void setReader(Reader input) throws CDKException { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |