X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationColourChooser.java;h=64b1d19916f248855d43abfff7ba9015fdf4a9af;hb=e015538903c8cabb2b90dd030e3e0c419a730db9;hp=7fb868fcd829f6b42efb0fc081b6f1fcc01d339d;hpb=d053a3c980cf4318b9a19a255f9fc870e74de989;p=jalview.git diff --git a/src/jalview/gui/AnnotationColourChooser.java b/src/jalview/gui/AnnotationColourChooser.java index 7fb868f..64b1d19 100755 --- a/src/jalview/gui/AnnotationColourChooser.java +++ b/src/jalview/gui/AnnotationColourChooser.java @@ -54,11 +54,8 @@ public class AnnotationColourChooser extends JPanel if (av.getAlignment().getGroups() != null) { oldgroupColours = new Hashtable(); - Vector allGroups = ap.av.getAlignment().getGroups(); - SequenceGroup sg; - for (int g = 0; g < allGroups.size(); g++) + for (SequenceGroup sg:ap.av.getAlignment().getGroups()) { - sg = (SequenceGroup) allGroups.get(g); if (sg.cs != null) { oldgroupColours.put(sg, sg.cs); @@ -452,12 +449,9 @@ public class AnnotationColourChooser extends JPanel if (av.getAlignment().getGroups() != null) { - Vector allGroups = ap.av.getAlignment().getGroups(); - SequenceGroup sg; - for (int g = 0; g < allGroups.size(); g++) + + for (SequenceGroup sg:ap.av.getAlignment().getGroups()) { - sg = (SequenceGroup) allGroups.get(g); - if (sg.cs == null) { continue; @@ -510,11 +504,9 @@ public class AnnotationColourChooser extends JPanel av.setGlobalColourScheme(oldcs); if (av.getAlignment().getGroups() != null) { - Vector allGroups = ap.av.getAlignment().getGroups(); - SequenceGroup sg; - for (int g = 0; g < allGroups.size(); g++) + + for (SequenceGroup sg:ap.av.getAlignment().getGroups()) { - sg = (SequenceGroup) allGroups.get(g); sg.cs = (ColourSchemeI) oldgroupColours.get(sg); } }