JAL-2490 findFeaturesAtRes with performant feature lookup

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

diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java
index e1c8566..c0549f2 100755 (executable)
--- a/src/jalview/datamodel/Sequence.java
+++ b/src/jalview/datamodel/Sequence.java
@@ -23,6 +23,7 @@ package jalview.datamodel;
 import jalview.analysis.AlignSeq;
 import jalview.api.DBRefEntryI;
 import jalview.datamodel.features.SequenceFeatures;
+import jalview.datamodel.features.SequenceFeaturesI;
 import jalview.util.Comparison;
 import jalview.util.DBRefUtils;
 import jalview.util.MapList;
@@ -426,6 +427,13 @@ public class Sequence extends ASequence implements SequenceI
   }
 
   @Override
+  public SequenceFeaturesI getFeatures()
+  {
+    return datasetSequence != null ? datasetSequence.getFeatures()
+            : sequenceFeatureStore;
+  }
+
+  @Override
   public boolean addPDBId(PDBEntry entry)
   {
     if (pdbIds == null)
@@ -1489,13 +1497,17 @@ public class Sequence extends ASequence implements SequenceI
     }
   }
 
+  /**
+   * {@inheritDoc}
+   */
   @Override
-  public List<SequenceFeature> findFeatures(String type, int from, int to)
+  public List<SequenceFeature> findFeatures(int from, int to,
+          String... types)
   {
     if (datasetSequence != null)
     {
-      return datasetSequence.findFeatures(type, from, to);
+      return datasetSequence.findFeatures(from, to, types);
     }
-    return sequenceFeatureStore.findFeatures(from, to, type);
+    return sequenceFeatureStore.findFeatures(from, to, types);
   }
 }