Merge branch 'develop' into features/JAL-2094_colourInterface

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

diff --git a/src/jalview/gui/FeatureColourChooser.java b/src/jalview/gui/FeatureColourChooser.java
index 5594e1a..4c4c69a 100644 (file)
--- a/src/jalview/gui/FeatureColourChooser.java
+++ b/src/jalview/gui/FeatureColourChooser.java
@@ -22,7 +22,9 @@ package jalview.gui;
 
 import jalview.api.FeatureColourI;
 import jalview.datamodel.GraphLine;
+import jalview.schemes.Colour;
 import jalview.schemes.FeatureColour;
+import jalview.util.ColorUtils;
 import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
@@ -151,17 +153,20 @@ public class FeatureColourChooser extends JalviewDialog
     else
     {
       // promote original color to a graduated color
-      Color bl = oldcs.getColour();
+      Color bl = ColorUtils.getColor(oldcs.getColour());
       if (bl == null)
       {
         bl = Color.BLACK;
       }
       // original colour becomes the maximum colour
-      cs = new FeatureColour(Color.white, bl, mm[0], mm[1]);
+      cs = new FeatureColour(new Colour(Color.white), new Colour(bl),
+              mm[0], mm[1]);
       cs.setColourByLabel(false);
     }
-    minColour.setBackground(oldminColour = cs.getMinColour());
-    maxColour.setBackground(oldmaxColour = cs.getMaxColour());
+    minColour.setBackground(oldminColour = ColorUtils.getColor(cs
+            .getMinColour()));
+    maxColour.setBackground(oldmaxColour = ColorUtils.getColor(cs
+            .getMaxColour()));
     adjusting = true;
 
     try
@@ -407,13 +412,14 @@ public class FeatureColourChooser extends JalviewDialog
     FeatureColourI acg;
     if (cs.isColourByLabel())
     {
-      acg = new FeatureColour(oldminColour, oldmaxColour, min, max);
+      acg = new FeatureColour(new Colour(oldminColour), new Colour(
+              oldmaxColour), min, max);
     }
     else
     {
-      acg = new FeatureColour(oldminColour = minColour.getBackground(),
-              oldmaxColour = maxColour.getBackground(), min, max);
-
+      acg = new FeatureColour(new Colour(
+              oldminColour = minColour.getBackground()), new Colour(
+              oldmaxColour = maxColour.getBackground()), min, max);
     }
 
     if (!hasThreshold)