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

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

diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java
index 39d9c1d..37cf6b6 100644 (file)
--- a/src/jalview/gui/TextColourChooser.java
+++ b/src/jalview/gui/TextColourChooser.java
@@ -21,6 +21,7 @@
 package jalview.gui;
 
 import jalview.datamodel.SequenceGroup;
+import jalview.schemes.Colour;
 import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
@@ -141,14 +142,14 @@ public class TextColourChooser
     {
       if (sg == null)
       {
-        ap.av.setTextColour(new Color(original1));
-        ap.av.setTextColour2(new Color(original2));
+        ap.av.setTextColour(new Colour(original1));
+        ap.av.setTextColour2(new Colour(original2));
         ap.av.setThresholdTextColour(originalThreshold);
       }
       else
       {
-        sg.textColour = new Color(original1);
-        sg.textColour2 = new Color(original2);
+        sg.textColour = new Colour(original1);
+        sg.textColour2 = new Colour(original2);
         sg.thresholdTextColour = originalThreshold;
       }
     }
@@ -158,7 +159,7 @@ public class TextColourChooser
   {
     if (sg == null)
     {
-      ap.av.setTextColour(col);
+      ap.av.setTextColour(new Colour(col));
       if (ap.av.getColourAppliesToAllGroups())
       {
         setGroupTextColour();
@@ -166,7 +167,7 @@ public class TextColourChooser
     }
     else
     {
-      sg.textColour = col;
+      sg.textColour = new Colour(col);
     }
 
     ap.paintAlignment(true);
@@ -176,7 +177,7 @@ public class TextColourChooser
   {
     if (sg == null)
     {
-      ap.av.setTextColour2(col);
+      ap.av.setTextColour2(new Colour(col));
       if (ap.av.getColourAppliesToAllGroups())
       {
         setGroupTextColour();
@@ -184,7 +185,7 @@ public class TextColourChooser
     }
     else
     {
-      sg.textColour2 = col;
+      sg.textColour2 = new Colour(col);
     }
 
     ap.paintAlignment(true);