X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSliderPanel.java;h=2046df60cf8b2f8c88ae2142ec1448b0e73a8eea;hb=37fd8c26efada7832b61e5af5c0d56baa69608c3;hp=0e4a379fa8a50a6e083ceb01ab254b432523df03;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git

diff --git a/src/jalview/appletgui/SliderPanel.java b/src/jalview/appletgui/SliderPanel.java
index 0e4a379..2046df6 100755
--- a/src/jalview/appletgui/SliderPanel.java
+++ b/src/jalview/appletgui/SliderPanel.java
@@ -1,24 +1,24 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * 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/>.
  */
 package jalview.appletgui;
 
 import java.util.*;
+import java.util.List;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -58,7 +58,7 @@ public class SliderPanel extends Panel implements ActionListener,
 
     conservationSlider.setTitle("Conservation Colour Increment  (" + source
             + ")");
-    if (ap.av.alignment.getGroups() != null)
+    if (ap.av.getAlignment().getGroups() != null)
     {
       sp.setAllGroupsCheckEnabled(true);
     }
@@ -113,7 +113,7 @@ public class SliderPanel extends Panel implements ActionListener,
     }
     PIDSlider.setTitle("Percentage Identity Threshold (" + source + ")");
 
-    if (ap.av.alignment.getGroups() != null)
+    if (ap.av.getAlignment().getGroups() != null)
     {
       pid.setAllGroupsCheckEnabled(true);
     }
@@ -196,24 +196,22 @@ public class SliderPanel extends Panel implements ActionListener,
     }
 
     ColourSchemeI toChange = null;
-    Vector allGroups = null;
-    int groupIndex = 0;
+    Iterator<SequenceGroup> allGroups = null;
 
     if (allGroupsCheck.getState())
     {
-      allGroups = ap.av.alignment.getGroups();
-      groupIndex = allGroups.size() - 1;
+      allGroups = ap.av.getAlignment().getGroups().listIterator();
     }
     else
     {
       toChange = cs;
     }
 
-    while (groupIndex > -1)
+    do 
     {
       if (allGroups != null)
       {
-        toChange = ((SequenceGroup) allGroups.elementAt(groupIndex)).cs;
+        toChange = allGroups.next().cs;
       }
 
       if (forConservation)
@@ -225,8 +223,7 @@ public class SliderPanel extends Panel implements ActionListener,
         toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus());
       }
 
-      groupIndex--;
-    }
+    } while (allGroups!=null && allGroups.hasNext());
 
     ap.seqPanel.seqCanvas.repaint();