JAL-1803 JAL-2188 experimental:

[jalview.git] / src / jalview / gui / TreeCanvas.java

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index aa79451..f21c5e7 100755 (executable)
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -59,7 +59,6 @@ import java.util.Vector;
 import javax.swing.JColorChooser;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
 import javax.swing.ToolTipManager;
 
 /**
@@ -546,6 +545,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
   }
 
   // put printing in a thread to avoid painting problems
+  @Override
   public void run()
   {
     PrinterJob printJob = PrinterJob.getPrinterJob();
@@ -580,6 +580,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
    * @throws PrinterException
    *           DOCUMENT ME!
    */
+  @Override
   public int print(Graphics pg, PageFormat pf, int pi)
           throws PrinterException
   {
@@ -634,6 +635,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
    * @param g
    *          DOCUMENT ME!
    */
+  @Override
   public void paintComponent(Graphics g)
   {
     super.paintComponent(g);
@@ -677,6 +679,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
    * @param fontSize
    *          DOCUMENT ME!
    */
+  @Override
   public void setFont(Font font)
   {
     this.font = font;
@@ -749,6 +752,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void mouseReleased(MouseEvent e)
   {
   }
@@ -759,6 +763,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void mouseEntered(MouseEvent e)
   {
   }
@@ -769,6 +774,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void mouseExited(MouseEvent e)
   {
   }
@@ -779,11 +785,12 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void mouseClicked(MouseEvent evt)
   {
     if (highlightNode != null)
     {
-      if (SwingUtilities.isRightMouseButton(evt))
+      if (evt.isPopupTrigger())
       {
         Color col = JColorChooser.showDialog(this,
                 MessageManager.getString("label.select_subtree_colour"),
@@ -818,6 +825,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     }
   }
 
+  @Override
   public void mouseMoved(MouseEvent evt)
   {
     av.setCurrentTree(tree);
@@ -843,6 +851,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     }
   }
 
+  @Override
   public void mouseDragged(MouseEvent ect)
   {
   }
@@ -853,6 +862,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void mousePressed(MouseEvent e)
   {
     av.setCurrentTree(tree);