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

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

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

Modified Files:
	Renderer2D.java 
Log Message:
Fixed problem with previous patch

Index: Renderer2D.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/renderer/Renderer2D.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Renderer2D.java	14 Nov 2003 09:58:39 -0000	1.60
+++ Renderer2D.java	21 Nov 2003 14:22:45 -0000	1.61
@@ -405,13 +405,13 @@
         
         // calculate SYMBOL width, height
         String atomSymbol = atom.getSymbol();
-        if(atomSymbol.equals("C"))
-          atomSymbol="";
-        if (r2dm.drawNumbers() && atomNumber != 0 && !atomSymbol.equals("")) {
-            atomSymbol += "-" + atomNumber;
+        if (r2dm.drawNumbers()) {
+            if (atomSymbol.equals("C")) {
+                atomSymbol = "" + atomNumber;
+            } else if (atomNumber != 0 && !atomSymbol.equals("")) {
+                atomSymbol += "-" + atomNumber;
+            }
         }
-        if(r2dm.drawNumbers() && atomSymbol.equals(""))
-          atomSymbol += atomNumber;
         graphics.setFont(normalFont);
         FontMetrics fm = graphics.getFontMetrics();
         int atomSymbolW = (new Integer(fm.stringWidth(atomSymbol))).intValue();