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

[jalview.git] / src / jalview / viewmodel / AlignmentViewport.java

diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index 47227d5..01668a5 100644 (file)
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -25,6 +25,7 @@ import jalview.analysis.Conservation;
 import jalview.api.AlignCalcManagerI;
 import jalview.api.AlignViewportI;
 import jalview.api.AlignmentViewPanel;
+import jalview.api.ColorI;
 import jalview.api.FeaturesDisplayedI;
 import jalview.api.ViewStyleI;
 import jalview.commands.CommandI;
@@ -42,6 +43,7 @@ import jalview.datamodel.SequenceCollectionI;
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 import jalview.schemes.Blosum62ColourScheme;
+import jalview.schemes.Colour;
 import jalview.schemes.ColourSchemeI;
 import jalview.schemes.PIDColourScheme;
 import jalview.schemes.ResidueProperties;
@@ -57,7 +59,6 @@ import jalview.workers.ComplementConsensusThread;
 import jalview.workers.ConsensusThread;
 import jalview.workers.StrucConsensusThread;
 
-import java.awt.Color;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.BitSet;
@@ -1252,7 +1253,7 @@ public abstract class AlignmentViewport implements AlignViewportI,
 
   protected boolean showConsensus = true;
 
-  private Map<SequenceI, Color> sequenceColours = new HashMap<SequenceI, Color>();
+  private Map<SequenceI, ColorI> sequenceColours = new HashMap<SequenceI, ColorI>();
 
   protected SequenceAnnotationOrder sortAnnotationsBy = null;
 
@@ -2128,14 +2129,14 @@ public abstract class AlignmentViewport implements AlignViewportI,
   }
 
   @Override
-  public Color getSequenceColour(SequenceI seq)
+  public ColorI getSequenceColour(SequenceI seq)
   {
-    Color sqc = sequenceColours.get(seq);
-    return (sqc == null ? Color.white : sqc);
+    ColorI sqc = sequenceColours.get(seq);
+    return (sqc == null ? Colour.white : sqc);
   }
 
   @Override
-  public void setSequenceColour(SequenceI seq, Color col)
+  public void setSequenceColour(SequenceI seq, ColorI col)
   {
     if (col == null)
     {
@@ -2292,7 +2293,7 @@ public abstract class AlignmentViewport implements AlignViewportI,
    * @see jalview.api.ViewStyleI#getTextColour()
    */
   @Override
-  public Color getTextColour()
+  public ColorI getTextColour()
   {
     return viewStyle.getTextColour();
   }
@@ -2302,7 +2303,7 @@ public abstract class AlignmentViewport implements AlignViewportI,
    * @see jalview.api.ViewStyleI#getTextColour2()
    */
   @Override
-  public Color getTextColour2()
+  public ColorI getTextColour2()
   {
     return viewStyle.getTextColour2();
   }
@@ -2373,7 +2374,7 @@ public abstract class AlignmentViewport implements AlignViewportI,
    * @see jalview.api.ViewStyleI#setTextColour(java.awt.Color)
    */
   @Override
-  public void setTextColour(Color textColour)
+  public void setTextColour(ColorI textColour)
   {
     viewStyle.setTextColour(textColour);
   }
@@ -2393,7 +2394,7 @@ public abstract class AlignmentViewport implements AlignViewportI,
    * @see jalview.api.ViewStyleI#setTextColour2(java.awt.Color)
    */
   @Override
-  public void setTextColour2(Color textColour2)
+  public void setTextColour2(ColorI textColour2)
   {
     viewStyle.setTextColour2(textColour2);
   }