getAllFeaturesAtRes replace by findFeaturesAtRes

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 0b9af01..a5ffb80 100755 (executable)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -213,36 +213,11 @@ public class SeqPanel
     }\r
 \r
     features = new SequenceFeature[tmp.size()];\r
-    for (int i = 0; i < tmp.size(); i++)\r
-    {\r
-      features[i] = (SequenceFeature) tmp.elementAt(i);\r
-    }\r
+    tmp.copyInto(features);\r
 \r
     return features;\r
   }\r
 \r
-  Vector getAllFeaturesAtRes(SequenceI seq, int res)\r
-  {\r
-    Vector allFeatures = new Vector();\r
-    int index = 0;\r
-    if (seq.getSequenceFeatures() != null && av.featuresDisplayed != null)\r
-    {\r
-      while (index < seq.getSequenceFeatures().length)\r
-      {\r
-        SequenceFeature sf = seq.getSequenceFeatures()[index];\r
-        if (sf.getBegin() <= res &&\r
-            sf.getEnd() >= res)\r
-        {\r
-          if (av.featuresDisplayed.containsKey(sf.getType()))\r
-          {\r
-            allFeatures.addElement(sf);\r
-          }\r
-        }\r
-        index++;\r
-      }\r
-    }\r
-    return allFeatures;\r
-  }\r
 \r
   void endEditing()\r
   {\r
@@ -1486,17 +1461,16 @@ public class SeqPanel
 \r
     if (javax.swing.SwingUtilities.isRightMouseButton(evt))\r
     {\r
-      Vector allFeatures = getAllFeaturesAtRes(sequence.getDatasetSequence(),\r
+      SequenceFeature [] allFeatures = findFeaturesAtRes(sequence.getDatasetSequence(),\r
                                                sequence.findPosition(res));\r
       Vector links = new Vector();\r
-      for (int i = 0; i < allFeatures.size(); i++)\r
+      for (int i = 0; i < allFeatures.length; i++)\r
       {\r
-        SequenceFeature sf = (SequenceFeature) allFeatures.elementAt(i);\r
-        if (sf.links != null)\r
+        if (allFeatures[i].links != null)\r
         {\r
-          for (int j = 0; j < sf.links.size(); j++)\r
+          for (int j = 0; j < allFeatures[i].links.size(); j++)\r
           {\r
-            links.addElement(sf.links.elementAt(j));\r
+            links.addElement(allFeatures[i].links.elementAt(j));\r
           }\r
         }\r
       }\r