[Cdk-commits] CVS: cdk/src/org/openscience/cdk/io CMLReader.java,1.3,1.4 CMLWriter.java,1.6,1.7 MDLReader.java,1.6,1.7 MDLWriter.java,1.6,1.7 PDBReader.java,1.2,1.3 SMILESWriter.java,1.3,1.4 ZMatrixReader.java,1.4,1.5

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

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/io
In directory usw-pr-cvs1:/tmp/cvs-serv26696/src/org/openscience/cdk/io

Modified Files:
	CMLReader.java CMLWriter.java MDLReader.java MDLWriter.java 
	PDBReader.java SMILESWriter.java ZMatrixReader.java 
Log Message:
Converted CDKConstants from interface into class.


Index: CMLReader.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/io/CMLReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** CMLReader.java	23 Aug 2002 08:59:50 -0000	1.3
--- CMLReader.java	28 Aug 2002 12:28:33 -0000	1.4
***************
*** 51,55 ****
   * @keyword file format, CML
   */
! public class CMLReader implements CDKConstants, ChemObjectReader {
  
      private XMLReader parser;
--- 51,55 ----
   * @keyword file format, CML
   */
! public class CMLReader implements ChemObjectReader {
  
      private XMLReader parser;

Index: CMLWriter.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/io/CMLWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** CMLWriter.java	27 Aug 2002 14:01:22 -0000	1.6
--- CMLWriter.java	28 Aug 2002 12:28:33 -0000	1.7
***************
*** 69,73 ****
   * @keyword file format, CML
   */
! public class CMLWriter implements ChemObjectWriter, CDKConstants {
  
      private Writer output;
--- 69,73 ----
   * @keyword file format, CML
   */
! public class CMLWriter implements ChemObjectWriter {
  
      private Writer output;
***************
*** 193,201 ****
  		      + bond.getOrder() +
  		      "</float>\n");
! 		if (bond.getStereo() != STEREO_BOND_UNDEFINED) {
  		    write("<string builtin=\"stereo\" convention=\"MDLMol\">");
! 		    if (bond.getStereo() == STEREO_BOND_UP) {
  			write("W");
! 		    } else if (bond.getStereo() == STEREO_BOND_DOWN) {
  			write("H");
  		    }
--- 193,201 ----
  		      + bond.getOrder() +
  		      "</float>\n");
! 		if (bond.getStereo() != CDKConstants.STEREO_BOND_UNDEFINED) {
  		    write("<string builtin=\"stereo\" convention=\"MDLMol\">");
! 		    if (bond.getStereo() == CDKConstants.STEREO_BOND_UP) {
  			write("W");
! 		    } else if (bond.getStereo() == CDKConstants.STEREO_BOND_DOWN) {
  			write("H");
  		    }

Index: MDLReader.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/io/MDLReader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** MDLReader.java	24 Aug 2002 19:03:45 -0000	1.6
--- MDLReader.java	28 Aug 2002 12:28:33 -0000	1.7
***************
*** 48,52 ****
   * @keyword file format, MDL molfile
   */
! public class MDLReader implements CDKConstants, ChemObjectReader {
  
  	boolean debug = false;
--- 48,52 ----
   * @keyword file format, MDL molfile
   */
! public class MDLReader implements ChemObjectReader {
  
  	boolean debug = false;
***************
*** 209,218 ****
  	            {
  	                // MDL up bond
! 	                stereo = STEREO_BOND_UP;
  	            }
  	            else if (stereo == 6)
  	            {
  	                // MDL down bond
! 					stereo = STEREO_BOND_DOWN;
  	            }
  				molecule.addBond(atom1 - 1, atom2 - 1, order, stereo);
--- 209,218 ----
  	            {
  	                // MDL up bond
! 	                stereo = CDKConstants.STEREO_BOND_UP;
  	            }
  	            else if (stereo == 6)
  	            {
  	                // MDL down bond
! 					stereo = CDKConstants.STEREO_BOND_DOWN;
  	            }
  				molecule.addBond(atom1 - 1, atom2 - 1, order, stereo);

Index: MDLWriter.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/io/MDLWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** MDLWriter.java	23 Aug 2002 08:59:50 -0000	1.6
--- MDLWriter.java	28 Aug 2002 12:28:33 -0000	1.7
***************
*** 54,58 ****
   * @keyword file format, MDL molfile
   */
! public class MDLWriter implements CDKConstants, ChemObjectWriter {
  	static BufferedWriter writer;
  
--- 54,58 ----
   * @keyword file format, MDL molfile
   */
! public class MDLWriter implements ChemObjectWriter {
  	static BufferedWriter writer;
  

Index: PDBReader.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/io/PDBReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** PDBReader.java	4 Aug 2002 12:25:47 -0000	1.2
--- PDBReader.java	28 Aug 2002 12:28:33 -0000	1.3
***************
*** 46,50 ****
   * @keyword file format, PDB
   */
! public class PDBReader implements CDKConstants, ChemObjectReader {
  
  	private BufferedReader _oInput; // The internal used BufferedReader
--- 46,50 ----
   * @keyword file format, PDB
   */
! public class PDBReader implements ChemObjectReader {
  
  	private BufferedReader _oInput; // The internal used BufferedReader

Index: SMILESWriter.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/io/SMILESWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SMILESWriter.java	16 Aug 2002 20:15:38 -0000	1.3
--- SMILESWriter.java	28 Aug 2002 12:28:33 -0000	1.4
***************
*** 45,49 ****
   * @keyword file format
   */
! public class SMILESWriter implements CDKConstants, ChemObjectWriter {
  
      private org.openscience.cdk.tools.LoggingTool logger;
--- 45,49 ----
   * @keyword file format
   */
! public class SMILESWriter implements ChemObjectWriter {
  
      private org.openscience.cdk.tools.LoggingTool logger;

Index: ZMatrixReader.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/io/ZMatrixReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ZMatrixReader.java	20 Aug 2002 12:16:40 -0000	1.4
--- ZMatrixReader.java	28 Aug 2002 12:28:33 -0000	1.5
***************
*** 42,47 ****
   * @keyword file format, Z-matrix
   */
! public class ZMatrixReader implements ChemObjectReader 
! {
    private BufferedReader input;
    
--- 42,47 ----
   * @keyword file format, Z-matrix
   */
! public class ZMatrixReader implements ChemObjectReader {
! 
    private BufferedReader input;