[Jmol-commits] CVS: Jmol/src/org/openscience/jmol AtomTypeList.java,1.3.2.5,1.3.2.6

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

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

Modified Files:
      Tag: b6
	AtomTypeList.java 
Log Message:
Fixed to work with CDK from CVS

Index: AtomTypeList.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/AtomTypeList.java,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- AtomTypeList.java	16 May 2003 14:49:02 -0000	1.3.2.5
+++ AtomTypeList.java	19 Aug 2003 09:01:16 -0000	1.3.2.6
@@ -114,7 +114,7 @@
             int numCols = 7;
             
             String[] names = {"Atom Type", "Base Atom Type", "Atomic Number", "Atomic Mass",
-            "Van derWaals Radius", "Covalent Radius", "Color"};            
+            "Van derWaals Radius", "Covalent Radius", "Color"};
             String headline = "#" + names[0];
             for (int j = 1; j < numCols - 1; j++) {
                 headline += "\t";
@@ -162,7 +162,7 @@
 
     private void ReadAtypes(String configFile) throws Exception {
         // System.out.println("Reading config file... " + configFile);
-        AtomTypeFactory atf = new AtomTypeFactory(configFile);
+        AtomTypeFactory atf = AtomTypeFactory.getInstance(configFile);
         
         org.openscience.cdk.AtomType[] types = atf.getAllAtomTypes();
         // System.out.println("Read atom types: " + types.length);