Author: kono
Date: 2012-05-10 17:04:31 -0700 (Thu, 10 May 2012)
New Revision: 29216

Modified:
   
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
   
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/CyAnnotator.java
Log:
fixes #568 Tooltip was override by parent component, so set tooltip text to 
parents, too.

Modified: 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
===================================================================
--- 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
    2012-05-10 23:56:17 UTC (rev 29215)
+++ 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
    2012-05-11 00:04:31 UTC (rev 29216)
@@ -29,6 +29,7 @@
 
 
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -47,7 +48,10 @@
 import java.awt.geom.Line2D;
 import java.awt.geom.Point2D;
 import java.awt.image.BufferedImage;
+import java.awt.image.ComponentSampleModel;
 
+import javax.swing.JComponent;
+
 import org.cytoscape.ding.EdgeView;
 import org.cytoscape.ding.GraphViewChangeListener;
 import org.cytoscape.ding.NodeView;
@@ -279,18 +283,22 @@
        }
        
        
+       @Override
        public void mouseDragged(MouseEvent e) {
                mouseDraggedDelegator.delegateMouseDragEvent(e);
        }
 
        @Override
        public void mouseMoved(MouseEvent e) {
-               
                if (addEdgeMode.addingEdge())
                        addEdgeMode.drawRubberBand(e);
                else {
                        final String tooltipText = getToolTipText(e.getPoint());
-                       setToolTipText(tooltipText);
+                       final Component[] components = 
this.getParent().getComponents();
+                       for(Component comp: components) {
+                               if(comp instanceof JComponent)
+                               ((JComponent) comp).setToolTipText(tooltipText);
+                       }
                }
        }
 

Modified: 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/CyAnnotator.java
===================================================================
--- 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/CyAnnotator.java
        2012-05-10 23:56:17 UTC (rev 29215)
+++ 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/CyAnnotator.java
        2012-05-11 00:04:31 UTC (rev 29216)
@@ -387,7 +387,7 @@
                return os.regionMatches(true, 0, MAC_OS_ID, 0, 
MAC_OS_ID.length());
        }
 
-       private class ForegroundMouseListener implements MouseListener{
+       private final class ForegroundMouseListener implements MouseListener {
 
                public void mousePressed(MouseEvent e) {
                        Component comp = getComponentAt(e.getX(), e.getY());

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.

Reply via email to