JAL-1114 - refactor methods handling Vectors and Hashtables to Lists and Maps, and...

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

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 8f615aa..8bb40a1 100644 (file)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -1161,20 +1161,17 @@ public class AlignViewport extends AlignmentViewport implements SelectionSource,
 
   public void updateSequenceIdColours()
   {
-    Vector groups = alignment.getGroups();
     if (sequenceColours == null)
     {
       sequenceColours = new Hashtable();
     }
-    for (int ig = 0, igSize = groups.size(); ig < igSize; ig++)
+    for (SequenceGroup sg:alignment.getGroups())
     {
-      SequenceGroup sg = (SequenceGroup) groups.elementAt(ig);
       if (sg.idColour != null)
       {
-        Vector sqs = sg.getSequences(getHiddenRepSequences());
-        for (int s = 0, sSize = sqs.size(); s < sSize; s++)
+        for (SequenceI s:sg.getSequences(getHiddenRepSequences()))
         {
-          sequenceColours.put(sqs.elementAt(s), sg.idColour);
+          sequenceColours.put(s, sg.idColour);
         }
       }
     }