git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Release_2_8_1_Branch' into JAL-1372_referenceseq
[jalview.git]
/
src
/
jalview
/
gui
/
SliderPanel.java
diff --git
a/src/jalview/gui/SliderPanel.java
b/src/jalview/gui/SliderPanel.java
index
3eff177
..
f53204e
100755
(executable)
--- a/
src/jalview/gui/SliderPanel.java
+++ b/
src/jalview/gui/SliderPanel.java
@@
-267,47
+267,34
@@
public class SliderPanel extends GSliderPanel
return;
}
return;
}
- ColourSchemeI toChange = null;
- List<SequenceGroup> allGroups = null;
- int groupIndex = 0;
+ ColourSchemeI toChange = cs;
+ Iterator<SequenceGroup> allGroups = null;
if (allGroupsCheck.isSelected())
{
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 (forConservation)
{
- if (toChange.conservationApplied())
- {
- toChange.setConservationInc(i);
- }
+ toChange.setConservationInc(i);
}
else
{
toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus());
}
}
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();
}
ap.seqPanel.seqCanvas.repaint();