[Cdk-commits] CVS: cdk/src/org/openscience/cdk/renderer Renderer2D.java,1.51,1.52

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

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/renderer
In directory sc8-pr-cvs1:/tmp/cvs-serv3537/src/org/openscience/cdk/renderer

Modified Files:
	Renderer2D.java 
Log Message:
Fixed for new Isotope/Element API

Index: Renderer2D.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/renderer/Renderer2D.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Renderer2D.java	17 Sep 2003 10:10:15 -0000	1.51
+++ Renderer2D.java	18 Sep 2003 16:47:45 -0000	1.52
@@ -326,10 +326,10 @@
         } else if (atom.getProperty(ProblemMarker.ERROR_MARKER) != null) {
             // ... unless carbon is unbonded
             drawSymbol = true;
-        } else if (atom.getAtomicMass() != 0) {
+        } else if (atom.getMassNumber() != 0) {
             try {
-                if (atom.getAtomicMass() != IsotopeFactory.getInstance().
-                       getMajorIsotope(atom.getSymbol()).getAtomicMass()) {
+                if (atom.getMassNumber() != IsotopeFactory.getInstance().
+                       getMajorIsotope(atom.getSymbol()).getMassNumber()) {
                     drawSymbol = true;
                 }
             } catch (Exception exception) {
@@ -448,13 +448,13 @@
 
         // calculate ISOTOPE width, height
         // font is still subscript, that's fine
-        int atomicMassNumber = atom.getAtomicMass();
+        int atomicMassNumber = atom.getMassNumber();
         int isotopeW = 0; // unless next condition, this is the default
         int isotopeH = 0;
         String isotopeString = "";
         if (atomicMassNumber != 0 && isotopeFactory != null) {
             Isotope majorIsotope = isotopeFactory.getMajorIsotope(atom.getSymbol());
-            if (majorIsotope != null && atomicMassNumber != majorIsotope.getAtomicMass()) {
+            if (majorIsotope != null && atomicMassNumber != majorIsotope.getMassNumber()) {
                 graphics.setFont(subscriptFont);
                 fm = graphics.getFontMetrics();
                 isotopeString = new Integer(atomicMassNumber).toString();