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

[jalview.git] / src / jalview / schemes / RNAHelicesColourChooser.java

diff --git a/src/jalview/schemes/RNAHelicesColourChooser.java b/src/jalview/schemes/RNAHelicesColourChooser.java
index e58099d..39062e7 100644 (file)
--- a/src/jalview/schemes/RNAHelicesColourChooser.java
+++ b/src/jalview/schemes/RNAHelicesColourChooser.java
@@ -53,11 +53,8 @@ public class RNAHelicesColourChooser
     if (av.getAlignment().getGroups() != null)
     {
       oldgroupColours = new Hashtable();
-      Vector allGroups = ap.getAlignment().getGroups();
-      SequenceGroup sg;
-      for (int g = 0; g < allGroups.size(); g++)
+      for (SequenceGroup sg:ap.getAlignment().getGroups())
       {
-        sg = (SequenceGroup) allGroups.get(g);
         if (sg.cs != null)
         {
           oldgroupColours.put(sg, sg.cs);
@@ -109,12 +106,8 @@ public class RNAHelicesColourChooser
 
     if (av.getAlignment().getGroups() != null)
     {
-      Vector allGroups = ap.getAlignment().getGroups();
-      SequenceGroup sg;
-      for (int g = 0; g < allGroups.size(); g++)
+      for (SequenceGroup sg:ap.getAlignment().getGroups())
       {
-        sg = (SequenceGroup) allGroups.get(g);
-
         if (sg.cs == null)
         {
           continue;
@@ -133,11 +126,8 @@ public class RNAHelicesColourChooser
     av.setGlobalColourScheme(oldcs);
     if (av.getAlignment().getGroups() != null)
     {
-      Vector allGroups = ap.getAlignment().getGroups();
-      SequenceGroup sg;
-      for (int g = 0; g < allGroups.size(); g++)
+      for (SequenceGroup sg:ap.getAlignment().getGroups())
       {
-        sg = (SequenceGroup) allGroups.get(g);
         sg.cs = (ColourSchemeI) oldgroupColours.get(sg);
       }
     }