X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=aa4aa646f7b72d4a44171fffeb0255b0303c5820;hb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;hp=d7e452a962f5fd9ffa77c6fd08f2d9e0e8200507;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git

diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java
index d7e452a..aa4aa64 100755
--- a/src/jalview/gui/SliderPanel.java
+++ b/src/jalview/gui/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.1)
+ * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.gui;
 
@@ -26,6 +27,7 @@ import javax.swing.event.*;
 import jalview.datamodel.*;
 import jalview.jbgui.*;
 import jalview.schemes.*;
+import jalview.util.MessageManager;
 
 /**
  * DOCUMENT ME!
@@ -68,13 +70,13 @@ public class SliderPanel extends GSliderPanel
 
     if (forConservation)
     {
-      label.setText("Enter value to increase conservation visibility");
+      label.setText(MessageManager.getString("label.enter_value_increase_conservation_visibility"));
       slider.setMinimum(0);
       slider.setMaximum(100);
     }
     else
     {
-      label.setText("Enter % identity above which to colour residues");
+      label.setText(MessageManager.getString("label.enter_percentage_identity_above_which_colour_residues"));
       slider.setMinimum(0);
       slider.setMaximum(100);
     }
@@ -265,47 +267,34 @@ public class SliderPanel extends GSliderPanel
       return;
     }
 
-    ColourSchemeI toChange = null;
-    List<SequenceGroup> allGroups = null;
-    int groupIndex = 0;
+    ColourSchemeI toChange = cs;
+    Iterator<SequenceGroup> 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();