X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSliderPanel.java;h=1bd5fd871da16653e7b36a9c53fe3f8b10d9236a;hb=854fa199e6dd89266237dc803ddc88bf7ba5bdcc;hp=886c1943a72c1dca7222d2b048973b640e384685;hpb=87ea83af3e209a8c3a4b19f9530a9c05b4541148;p=jalview.git
diff --git a/src/jalview/appletgui/SliderPanel.java b/src/jalview/appletgui/SliderPanel.java
index 886c194..1bd5fd8 100644
--- a/src/jalview/appletgui/SliderPanel.java
+++ b/src/jalview/appletgui/SliderPanel.java
@@ -1,6 +1,6 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
@@ -14,6 +14,7 @@
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
@@ -195,25 +196,16 @@ public class SliderPanel extends Panel implements ActionListener,
return;
}
- ColourSchemeI toChange = null;
+ ColourSchemeI toChange = cs;
Iterator allGroups = null;
if (allGroupsCheck.getState())
{
allGroups = ap.av.getAlignment().getGroups().listIterator();
}
- else
- {
- toChange = cs;
- }
- do
+ while (toChange != null)
{
- if (allGroups != null)
- {
- toChange = allGroups.next().cs;
- }
-
if (forConservation)
{
toChange.setConservationInc(i);
@@ -222,8 +214,17 @@ public class SliderPanel extends Panel implements ActionListener,
{
toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus());
}
-
- } while (allGroups != null && allGroups.hasNext());
+ if (allGroups != null && allGroups.hasNext())
+ {
+ while ((toChange = allGroups.next().cs) == null
+ && allGroups.hasNext())
+ ;
+ }
+ else
+ {
+ toChange = null;
+ }
+ }
ap.seqPanel.seqCanvas.repaint();
@@ -314,8 +315,9 @@ public class SliderPanel extends Panel implements ActionListener,
slider.setFont(new java.awt.Font("Verdana", 0, 11));
slider.setOrientation(0);
valueField.setFont(new java.awt.Font("Verdana", 0, 11));
- valueField.setText(" ");
- valueField.addActionListener(this);
+ valueField.setText(" ");
+ valueField.addActionListener(this);
+ valueField.setColumns(3);
label.setFont(new java.awt.Font("Verdana", 0, 11));
label.setText(MessageManager.getString("label.set_this_label_text"));
jPanel1.setLayout(borderLayout1);