X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=f53204ea8be209baab6835690ff82696c0b881f2;hb=63a18b71aa3ed6503b6fbb8ec3543b5d66ed3f70;hp=3eff177853ff40512e05a9b56a8bc420c45f1c0c;hpb=cb5d856b1304448cae13a333cbd9017f81520d90;p=jalview.git diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java index 3eff177..f53204e 100755 --- a/src/jalview/gui/SliderPanel.java +++ b/src/jalview/gui/SliderPanel.java @@ -267,47 +267,34 @@ public class SliderPanel extends GSliderPanel return; } - ColourSchemeI toChange = null; - List allGroups = null; - int groupIndex = 0; + ColourSchemeI toChange = cs; + Iterator allGroups = null; if (allGroupsCheck.isSelected()) { - allGroups = ap.av.getAlignment().getGroups(); - groupIndex = allGroups.size() - 1; - } - else - { - toChange = cs; + allGroups = ap.av.getAlignment().getGroups().listIterator(); } - while (groupIndex > -1) + while (toChange != null) { - if (allGroups != null) - { - toChange = ((SequenceGroup) allGroups.get(groupIndex)).cs; - - if (toChange == null) - { - groupIndex--; - - continue; - } - } - if (forConservation) { - if (toChange.conservationApplied()) - { - toChange.setConservationInc(i); - } + toChange.setConservationInc(i); } else { toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus()); } - - groupIndex--; + if (allGroups != null && allGroups.hasNext()) + { + while ((toChange = allGroups.next().cs) == null + && allGroups.hasNext()) + ; + } + else + { + toChange = null; + } } ap.seqPanel.seqCanvas.repaint();