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

[jalview.git] / src / jalview / renderer / seqfeatures / FeatureRenderer.java

diff --git a/src/jalview/renderer/seqfeatures/FeatureRenderer.java b/src/jalview/renderer/seqfeatures/FeatureRenderer.java
index b007365..e5f0b57 100644 (file)
--- a/src/jalview/renderer/seqfeatures/FeatureRenderer.java
+++ b/src/jalview/renderer/seqfeatures/FeatureRenderer.java
@@ -21,8 +21,10 @@
 package jalview.renderer.seqfeatures;
 
 import jalview.api.AlignViewportI;
+import jalview.api.ColorI;
 import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
+import jalview.schemes.Colour;
 import jalview.viewmodel.seqfeatures.FeatureRendererModel;
 
 import java.awt.AlphaComposite;
@@ -182,9 +184,14 @@ public class FeatureRenderer extends FeatureRendererModel
   BufferedImage offscreenImage;
 
   @Override
-  public Color findFeatureColour(Color initialCol, SequenceI seq, int res)
+  public ColorI findFeatureColour(ColorI initialCol, SequenceI seq, int res)
   {
-    return new Color(findFeatureColour(initialCol.getRGB(), seq, res));
+    return new Colour(findFeatureColour(initialCol.getRGB(), seq, res));
+  }
+
+  public ColorI findFeatureColour(Color initialCol, SequenceI seq, int res)
+  {
+    return findFeatureColour(new Colour(initialCol), seq, res);
   }
 
   /**