JAL-2094 first pass with jalview.api.ColorI interface

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

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index 90c74be..149a587 100755 (executable)
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -27,11 +27,13 @@ import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 import jalview.datamodel.SequenceNode;
+import jalview.schemes.Colour;
 import jalview.schemes.ColourSchemeI;
 import jalview.schemes.ColourSchemeProperty;
 import jalview.schemes.ResidueProperties;
 import jalview.schemes.UserColourScheme;
 import jalview.structure.SelectionSource;
+import jalview.util.ColorUtils;
 import jalview.util.Format;
 import jalview.util.MappingUtils;
 import jalview.util.MessageManager;
@@ -59,7 +61,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;
 
 /**
@@ -246,7 +247,8 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
         }
         else
         {
-          g.setColor(av.getSequenceColour(seq).darker());
+          g.setColor(ColorUtils.getColor(av.getSequenceColour(seq))
+                  .darker());
         }
       }
       else
@@ -523,7 +525,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
           for (int a = 0; a < aps.length; a++)
           {
             final SequenceI seq = (SequenceI) node.element();
-            aps[a].av.setSequenceColour(seq, c);
+            aps[a].av.setSequenceColour(seq, new Colour(c));
           }
         }
       }
@@ -791,7 +793,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
   {
     if (highlightNode != null)
     {
-      if (SwingUtilities.isRightMouseButton(evt))
+      if (evt.isPopupTrigger())
       {
         Color col = JColorChooser.showDialog(this,
                 MessageManager.getString("label.select_subtree_colour"),
@@ -1003,7 +1005,8 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
               codingComplement.getAlignment().addGroup(mappedGroup);
               for (SequenceI seq : mappedGroup.getSequences())
               {
-                codingComplement.setSequenceColour(seq, col.brighter());
+                codingComplement.setSequenceColour(seq,
+                        new Colour(col.brighter()));
               }
             }
           }