[Cdk-commits] SF.net SVN: cdk: [7235] trunk/cdk/src/org/openscience/cdk/renderer/ AbstractRenderer2D.java

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

Revision: 7235
          http://svn.sourceforge.net/cdk/?rev=7235&view=rev
Author:   egonw
Date:     2006-11-05 03:28:29 -0800 (Sun, 05 Nov 2006)

Log Message:
-----------
Reverted FragmentAtom patch; Forgot to upload this one, sorry for that.

Modified Paths:
--------------
    trunk/cdk/src/org/openscience/cdk/renderer/AbstractRenderer2D.java

Modified: trunk/cdk/src/org/openscience/cdk/renderer/AbstractRenderer2D.java
===================================================================
--- trunk/cdk/src/org/openscience/cdk/renderer/AbstractRenderer2D.java	2006-11-03 15:30:28 UTC (rev 7234)
+++ trunk/cdk/src/org/openscience/cdk/renderer/AbstractRenderer2D.java	2006-11-05 11:28:29 UTC (rev 7235)
@@ -25,7 +25,7 @@
 package org.openscience.cdk.renderer;
 
 import org.openscience.cdk.CDKConstants;
-import org.openscience.cdk.FragmentAtom;
+//import org.openscience.cdk.FragmentAtom;
 import org.openscience.cdk.config.AtomTypeFactory;
 import org.openscience.cdk.config.IsotopeFactory;
 import org.openscience.cdk.geometry.GeometryTools;
@@ -243,13 +243,13 @@
 		if (atom instanceof IPseudoAtom)
 		{
 			drawSymbol = false;
-			if (atom instanceof FragmentAtom) {
-				paintFragmentAtom((FragmentAtom)atom, atomBackColor, graphics,
-						alignment, isRadical);
-			} else {
+//			if (atom instanceof FragmentAtom) {
+//				paintFragmentAtom((FragmentAtom)atom, atomBackColor, graphics,
+//						alignment, isRadical);
+//			} else {
 				paintPseudoAtomLabel((IPseudoAtom) atom, atomBackColor, graphics,
 					alignment, isRadical);
-			}
+//			}
 			return;
 		} else if (!atom.getSymbol().equals("C"))
 		{
@@ -819,20 +819,20 @@
 		graphics.setColor(r2dm.getForeColor());
 	}
 
-	public void paintFragmentAtom(FragmentAtom atom, Color backColor,
-			Graphics2D graphics, int alignment, boolean isRadical) {
-		if (r2dm.getRenderingCoordinate(atom) == null)
-		{
-			logger.warn("Cannot draw atom without 2D coordinate");
-			return;
-		}
-		
-		if (atom.isExpanded()) {
-			paintMolecule(atom.getFragment(), graphics);
-		} else {
-			paintPseudoAtomLabel(atom, backColor, graphics, alignment, isRadical);
-		}
-	}
+//	public void paintFragmentAtom(FragmentAtom atom, Color backColor,
+//			Graphics2D graphics, int alignment, boolean isRadical) {
+//		if (r2dm.getRenderingCoordinate(atom) == null)
+//		{
+//			logger.warn("Cannot draw atom without 2D coordinate");
+//			return;
+//		}
+//		
+//		if (atom.isExpanded()) {
+//			paintMolecule(atom.getFragment(), graphics);
+//		} else {
+//			paintPseudoAtomLabel(atom, backColor, graphics, alignment, isRadical);
+//		}
+//	}
 
 	public abstract void paintMolecule(IAtomContainer fragment, Graphics2D graphics);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.