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

[jalview.git] / src / jalview / ext / ensembl / EnsemblGene.java

diff --git a/src/jalview/ext/ensembl/EnsemblGene.java b/src/jalview/ext/ensembl/EnsemblGene.java
index 0c20e12..6f3c062 100644 (file)
--- a/src/jalview/ext/ensembl/EnsemblGene.java
+++ b/src/jalview/ext/ensembl/EnsemblGene.java
@@ -1,5 +1,6 @@
 package jalview.ext.ensembl;
 
+import jalview.api.ColorI;
 import jalview.api.FeatureColourI;
 import jalview.api.FeatureSettingsModelI;
 import jalview.datamodel.AlignmentI;
@@ -8,11 +9,11 @@ import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
 import jalview.io.gff.SequenceOntologyFactory;
 import jalview.io.gff.SequenceOntologyI;
-import jalview.schemes.FeatureColour;
+import jalview.schemes.Colour;
+import jalview.schemes.FeatureColourAdapter;
 import jalview.schemes.FeatureSettingsAdapter;
 import jalview.util.MapList;
 
-import java.awt.Color;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
@@ -541,7 +542,7 @@ public class EnsemblGene extends EnsemblSeqProxy
       {
         if (so.isA(type, SequenceOntologyI.EXON))
         {
-          return new FeatureColour()
+          return new FeatureColourAdapter()
           {
             @Override
             public boolean isColourByLabel()
@@ -552,13 +553,13 @@ public class EnsemblGene extends EnsemblSeqProxy
         }
         if (so.isA(type, SequenceOntologyI.SEQUENCE_VARIANT))
         {
-          return new FeatureColour()
+          return new FeatureColourAdapter()
           {
 
             @Override
-            public Color getColour()
+            public ColorI getColour()
             {
-              return Color.RED;
+              return Colour.red;
             }
           };
         }