[Cdk-commits] CVS: cdk/src/org/openscience/cdk/renderer Renderer2D.java,1.64,1.65 Renderer2DModel.java,1.26,1.27

[Stefan K. <sh...@us...>]

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

Modified Files:
	Renderer2D.java Renderer2DModel.java 
Log Message:
Changes logic for toolTipText to Renderer2D and uses getters/setters everywhere


Index: Renderer2D.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/renderer/Renderer2D.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Renderer2D.java	11 Dec 2003 16:18:06 -0000	1.64
+++ Renderer2D.java	12 Dec 2003 16:11:34 -0000	1.65
@@ -30,6 +30,7 @@
 
 import java.awt.*;
 import java.awt.geom.Rectangle2D;
+import java.awt.event.*;
 import javax.vecmath.*;
 import java.util.*;
 import org.openscience.cdk.ringsearch.*;
@@ -54,7 +55,7 @@
  * @created    2002-10-03
  * @keyword    viewer, 2D-viewer
  */
-public class Renderer2D   {
+public class Renderer2D implements MouseMotionListener   {
 
     private LoggingTool logger;
     boolean debug = false;
@@ -344,7 +345,7 @@
         if (drawSymbol) {
             paintAtomSymbol(atom, atomBackColor, graphics, alignment, container.getAtomNumber(atom) + 1);
         }
-        if (r2dm.showTooltip && atom == r2dm.getHighlightedAtom() && r2dm.getToolTipText(r2dm.getHighlightedAtom()) != null) {
+        if (r2dm.getShowTooltip() && atom == r2dm.getHighlightedAtom() && r2dm.getToolTipText(r2dm.getHighlightedAtom()) != null) {
           paintToolTip(atom, graphics);
         }
     }
@@ -1140,5 +1141,29 @@
       graphics.setColor(Color.BLACK);
       graphics.drawString(text, ((int) atom.getX2D()) + 2, ((int) atom.getY2D()) + atomSymbolH + 2);
     }
+  
+  
+    /**
+   *  The mouseMoved event (used for atom toolTipTexts).
+   *
+   * @param  e  The event.
+   */
+  public void mouseMoved(MouseEvent e) {
+    if (r2dm.getHighlightedAtom() != null) {
+      r2dm.setShowTooltip(true);
+    } else {
+      r2dm.setShowTooltip(false);
+    }
+    r2dm.setLastHighlightedAtom(r2dm.getHighlightedAtom());
+  }
+
+
+  /**
+   *  The mouseDragged event (not used currently).
+   *
+   * @param  e  The event.
+   */
+  public void mouseDragged(MouseEvent e) {
+  }
 }
 

Index: Renderer2DModel.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/renderer/Renderer2DModel.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Renderer2DModel.java	11 Dec 2003 16:18:07 -0000	1.26
+++ Renderer2DModel.java	12 Dec 2003 16:11:34 -0000	1.27
@@ -30,7 +30,6 @@
 import org.openscience.cdk.renderer.color.CDK2DAtomColors;
 import org.openscience.cdk.tools.LoggingTool;
 import java.awt.*;
-import java.awt.event.*;
 import java.awt.Polygon;
 import org.openscience.cdk.*;
 import org.openscience.cdk.event.*;
@@ -39,7 +38,7 @@
 /**
  * Model for Renderer2D that contains settings for drawing objects.
  */
-public class Renderer2DModel implements java.io.Serializable, Cloneable, MouseMotionListener
+public class Renderer2DModel implements java.io.Serializable, Cloneable
 {
     
     // private LoggingTool logger = new LoggingTool("org.openscience.cdk.render.Renderer2DModel");
@@ -115,9 +114,9 @@
 
     private Dimension backgroundDimension = new Dimension(500,1200);
     
-    public boolean showTooltip = false;
+    private boolean showTooltip = false;
     
-    public HashMap toolTipTextMap = new HashMap();
+    private HashMap toolTipTextMap = new HashMap();
     
     private Atom lastHighlightedAtom = null;
     
@@ -757,26 +756,23 @@
   }
   
   
-    /**
-   *  The mouseMoved event (used for atom toolTipTexts).
-   *
-   * @param  e  The event.
-   */
-  public void mouseMoved(MouseEvent e) {
-    if (highlightedAtom != null) {
-      showTooltip = true;
-    } else {
-      showTooltip = false;
-    }
-    lastHighlightedAtom = highlightedAtom;
+  public void setShowTooltip(boolean b){
+    showTooltip=b;
   }
-
-
-  /**
-   *  The mouseDragged event (not used currently).
-   *
-   * @param  e  The event.
-   */
-  public void mouseDragged(MouseEvent e) {
+  
+  
+  public void setLastHighlightedAtom(Atom a){
+    lastHighlightedAtom=a;
+  }
+  
+  
+  public boolean getShowTooltip(){
+    return(showTooltip);
   }
+  
+  
+  public void setToolTipTextMap(HashMap map){
+    toolTipTextMap=map;
+  }
+
 }