JAL-1421 typed map / lists, explicit imports, method refactoring

[jalview.git] / src / jalview / gui / IdPanel.java

diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java
index bbffbab..eb5faa1 100755 (executable)
--- a/src/jalview/gui/IdPanel.java
+++ b/src/jalview/gui/IdPanel.java
@@ -321,24 +321,28 @@ public class IdPanel extends JPanel implements MouseListener,
       Sequence sq = (Sequence) av.getAlignment().getSequenceAt(seq);
       // build a new links menu based on the current links + any non-positional
       // features
-      Vector nlinks = new Vector(Preferences.sequenceURLLinks);
-      SequenceFeature sf[] = sq == null ? null : sq.getSequenceFeatures();
-      for (int sl = 0; sf != null && sl < sf.length; sl++)
+      Vector<String> nlinks = new Vector<String>(
+              Preferences.sequenceURLLinks);
+      SequenceFeature sfs[] = sq == null ? null : sq.getSequenceFeatures();
+      if (sfs != null)
       {
-        if (sf[sl].begin == sf[sl].end && sf[sl].begin == 0)
+        for (SequenceFeature sf : sfs)
         {
-          if (sf[sl].links != null && sf[sl].links.size() > 0)
+          if (sf.begin == sf.end && sf.begin == 0)
           {
-            for (int l = 0, lSize = sf[sl].links.size(); l < lSize; l++)
+            if (sf.links != null && sf.links.size() > 0)
             {
-              nlinks.addElement(sf[sl].links.elementAt(l));
+              for (int l = 0, lSize = sf.links.size(); l < lSize; l++)
+              {
+                nlinks.addElement(sf.links.elementAt(l));
+              }
             }
           }
         }
       }
 
-      jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(alignPanel, sq,
-              nlinks, new Vector(Preferences.getGroupURLLinks()));
+      PopupMenu pop = new PopupMenu(alignPanel, sq, nlinks,
+              Preferences.getGroupURLLinks());
       pop.show(this, e.getX(), e.getY());
 
       return;