From: Egon W. <eg...@us...> - 2006-01-13 14:06:57
|
Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4276/src/org/openscience/cdk/database Modified Files: DBReader.java DBWriter.java Log Message: Renamed first interface to new naming scheme I<name>. Index: DBReader.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/database/DBReader.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- DBReader.java 22 Oct 2005 16:26:17 -0000 1.21 +++ DBReader.java 13 Jan 2006 14:06:42 -0000 1.22 @@ -79,11 +79,11 @@ if (object instanceof Molecule) { return (ChemObject)readMolecule(); } else { - throw new CDKException("ChemObject is not supported Molecule."); + throw new CDKException("IChemObject is not supported Molecule."); } } - private org.openscience.cdk.interfaces.ChemObject readMolecule() { + private org.openscience.cdk.interfaces.IChemObject readMolecule() { org.openscience.cdk.interfaces.Molecule mol = null; CMLReader cmlr; StringReader reader; Index: DBWriter.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/database/DBWriter.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- DBWriter.java 22 Oct 2005 16:26:17 -0000 1.17 +++ DBWriter.java 13 Jan 2006 14:06:42 -0000 1.18 @@ -34,7 +34,7 @@ import java.sql.PreparedStatement; import org.openscience.cdk.CDKConstants; -import org.openscience.cdk.interfaces.ChemObject; +import org.openscience.cdk.interfaces.IChemObject; import org.openscience.cdk.interfaces.Molecule; import org.openscience.cdk.interfaces.SetOfMolecules; import org.openscience.cdk.exception.CDKException; @@ -77,11 +77,11 @@ // FIXME: connection should be closed } - public ChemObject highestSupportedChemObject() { + public IChemObject highestSupportedChemObject() { return new org.openscience.cdk.SetOfMolecules(); }; - public void write(ChemObject object) throws CDKException { + public void write(IChemObject object) throws CDKException { if (object instanceof Molecule) { writeMolecule((Molecule)object); } else if (object instanceof SetOfMolecules) { |