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 6b52480..6c0e528 100755 (executable)
--- a/src/jalview/datamodel/Sequence.java
+++ b/src/jalview/datamodel/Sequence.java
@@ -1612,7 +1612,7 @@ public class Sequence extends ASequence implements SequenceI
       _isNa = Comparison.isNucleotide(this);
     }
     return !_isNa;
-  };
+  }
 
   /*
    * (non-Javadoc)
@@ -1967,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, 
@@ -2026,7 +2017,6 @@ public class Sequence extends ASequence implements SequenceI
   @Override
   public void sequenceChanged()
   {
-    argb = null;
     changeCount++;
   }
 
@@ -2129,27 +2119,24 @@ public class Sequence extends ASequence implements SequenceI
     return 0;
   }
 
-  private int[] argb;
-
+  /**
+   * 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 int getColor(int i)
+  public List<SequenceFeature> findFeatures(int column, String type,
+          List<SequenceFeature> result)
   {
-    return argb == null ? 0 : argb[i];
+    return getFeatures().findFeatures(findPosition(column - 1), type,
+            result);
   }
 
   @Override
-  public int setColor(int i, int rgb)
+  public boolean hasFeatures(String type)
   {
-    if (argb == null)
-    {
-      argb = new int[this.sequence.length];
-    }
-    return (argb[i] = rgb);
+    return getFeatures().hasFeatures(type);
   }
 
-  @Override
-  public void resetColors()
-  {
-    argb = null;
-  }
 }