[Jmol-commits] CVS: Jmol/src/org/openscience/jmol AtomTypeList.java,1.3.2.6,1.3.2.7 DisplayControl.java,1.98.2.20,1.98.2.21

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

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol
In directory sc8-pr-cvs1:/tmp/cvs-serv11225/src/org/openscience/jmol

Modified Files:
      Tag: b6
	AtomTypeList.java DisplayControl.java 
Log Message:
Compiled and updated against/for current CDK

Index: AtomTypeList.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/AtomTypeList.java,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -u -r1.3.2.6 -r1.3.2.7
--- AtomTypeList.java	19 Aug 2003 09:01:16 -0000	1.3.2.6
+++ AtomTypeList.java	23 Oct 2003 17:57:26 -0000	1.3.2.7
@@ -271,7 +271,7 @@
             }
             // logger.debug("BaseAtomType: " + at.toString());
             atom.setMaxBondOrder(at.getMaxBondOrder());
-            atom.setMaxBondOrderSum(at.getMaxBondOrderSum());
+            atom.setBondOrderSum(at.getBondOrderSum());
             atom.setVanderwaalsRadius(at.getVanderwaalsRadius());
             atom.setCovalentRadius(at.getCovalentRadius());
             atom.setProperty("org.openscience.jmol.color", at.getColor());

Index: DisplayControl.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/Attic/DisplayControl.java,v
retrieving revision 1.98.2.20
retrieving revision 1.98.2.21
diff -u -r1.98.2.20 -r1.98.2.21
--- DisplayControl.java	24 Sep 2003 07:30:06 -0000	1.98.2.20
+++ DisplayControl.java	23 Oct 2003 17:57:26 -0000	1.98.2.21
@@ -795,7 +795,7 @@
     refresh();
   }
 
-  public ChemFile getChemFile() {
+  public ChemFile getJmolChemFile() {
     return modelManager.getChemFile();
   }
 
@@ -1608,4 +1608,11 @@
         ));
     }
 
+    public org.openscience.cdk.ChemModel getChemModel() {
+        return null;
+    }
+
+    public org.openscience.cdk.ChemFile getChemFile() {
+        return null;
+    }
 }