JAL-3383 removing colour caching (to a separate branch)

[jalview.git] / src / jalview / datamodel / Sequence.java

diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java
index 4c46522..6c0e528 100755 (executable)
--- a/src/jalview/datamodel/Sequence.java
+++ b/src/jalview/datamodel/Sequence.java
@@ -28,7 +28,6 @@ import jalview.util.DBRefUtils;
 import jalview.util.MapList;
 import jalview.util.StringUtils;
 
-import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.BitSet;
@@ -1613,7 +1612,7 @@ public class Sequence extends ASequence implements SequenceI
       _isNa = Comparison.isNucleotide(this);
     }
     return !_isNa;
-  };
+  }
 
   /*
    * (non-Javadoc)
@@ -1968,15 +1967,6 @@ public class Sequence extends ASequence implements SequenceI
 
     List<SequenceFeature> result = getFeatures().findFeatures(startPos,
             endPos, types);
-    if (datasetSequence != null)
-    {
-      result = datasetSequence.getFeatures().findFeatures(startPos, endPos,
-              types);
-    }
-    else
-    {
-      result = sequenceFeatureStore.findFeatures(startPos, endPos, types);
-    }
 
     /*
      * if end column is gapped, endPos may be to the right, 
@@ -2129,20 +2119,24 @@ public class Sequence extends ASequence implements SequenceI
     return 0;
   }
 
+  /**
+   * Answers a (possibly empty) list of features of the specified type that
+   * overlap the specified column position. If parameter {@code result} is not
+   * null, features are appended to it and the (possibly extended) list is
+   * returned.
+   */
   @Override
-  public Color getColor(int i)
+  public List<SequenceFeature> findFeatures(int column, String type,
+          List<SequenceFeature> result)
   {
-    return null;
+    return getFeatures().findFeatures(findPosition(column - 1), type,
+            result);
   }
 
   @Override
-  public Color setColor(int i, Color c)
+  public boolean hasFeatures(String type)
   {
-    return c;
+    return getFeatures().hasFeatures(type);
   }
 
-  @Override
-  public void resetColors()
-  {
-  }
 }