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

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

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index 426ea32..3c4d733 100644 (file)
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -24,8 +24,10 @@ import jalview.api.FeatureColourI;
 import jalview.datamodel.SearchResults;
 import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
+import jalview.schemes.Colour;
 import jalview.schemes.FeatureColour;
 import jalview.schemes.UserColourScheme;
+import jalview.util.ColorUtils;
 import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
@@ -131,11 +133,11 @@ public class FeatureRenderer extends
         {
           Color col = JColorChooser.showDialog(Desktop.desktop,
                   MessageManager.getString("label.select_feature_colour"),
-                  fcol.getColour());
+                  ColorUtils.getColor(fcol.getColour()));
           if (col != null)
           {
-            fcol = new FeatureColour(col);
-            updateColourButton(bigPanel, colour, new FeatureColour(col));
+            fcol = new FeatureColour(new Colour(col));
+            updateColourButton(bigPanel, colour, fcol);
           }
         }
         else
@@ -210,8 +212,8 @@ public class FeatureRenderer extends
           FeatureColourI col = getFeatureStyle(name.getText());
           if (col == null)
           {
-            col = new FeatureColour(UserColourScheme
-                    .createColourFromName(name.getText()));
+            col = new FeatureColour(new Colour(UserColourScheme
+                    .createColourFromName(name.getText())));
           }
           oldcol = fcol = col;
           updateColourButton(bigPanel, colour, col);
@@ -422,8 +424,12 @@ public class FeatureRenderer extends
    * update the amend feature button dependent on the given style
    * 
    * @param bigPanel
+   * @param colour
    * @param col
+<<<<<<< HEAD
+=======
    * @param col
+>>>>>>> refs/heads/develop
    */
   protected void updateColourButton(JPanel bigPanel, JLabel colour,
           FeatureColourI col)
@@ -435,7 +441,7 @@ public class FeatureRenderer extends
 
     if (col.isSimpleColour())
     {
-      colour.setBackground(col.getColour());
+      colour.setBackground(ColorUtils.getColor(col.getColour()));
     }
     else
     {