From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 12 Oct 2006 13:21:09 +0000 (+0000)
Subject: RepresentGroup count items
X-Git-Tag: Release_2_2~281
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c97c8a9e4fd58a4927e040e314c5be3c5356745e;p=jalview.git

RepresentGroup count items
---

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index c4ef0ba..dca9da4 100755
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -630,19 +630,18 @@ public class APopupMenu
     hseqs = new SequenceI[ representGroup ? gsize-1 : gsize ];
 
       int index = 0;
-      while(index < gsize)
+      for(int i=0; i<gsize; i++)
       {
-        if(representGroup && sg.getSequenceAt(index)!=seq)
+        if(representGroup && sg.getSequenceAt(i)!=seq)
         {
-          seq.addHiddenSequence(sg.getSequenceAt(index));
-          hseqs[index] = sg.getSequenceAt(index);
+          seq.addHiddenSequence(sg.getSequenceAt(i));
+          hseqs[index++] = sg.getSequenceAt(i);
         }
         else if(!representGroup)
         {
-          hseqs[index] = sg.getSequenceAt(index);
+          hseqs[index++] = sg.getSequenceAt(index);
+        }
         }
-        index ++;
-      }
 
       ap.av.hideSequence(hseqs);
 
diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 356e5d5..c2bf729 100755
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -1136,18 +1136,17 @@ public class PopupMenu extends JPopupMenu
       hseqs = new SequenceI[ representGroup ? gsize-1 : gsize ];
 
         int index = 0;
-        while(index < gsize)
+        for(int i=0; i<gsize; i++)
         {
-          if(representGroup && sg.getSequenceAt(index)!=sequence)
+          if(representGroup && sg.getSequenceAt(i)!=sequence)
           {
-            sequence.addHiddenSequence(sg.getSequenceAt(index));
-            hseqs[index] = sg.getSequenceAt(index);
+            sequence.addHiddenSequence(sg.getSequenceAt(i));
+            hseqs[index++] = sg.getSequenceAt(i);
           }
           else if(!representGroup)
           {
-            hseqs[index] = sg.getSequenceAt(index);
+            hseqs[index++] = sg.getSequenceAt(index);
           }
-          index ++;
         }
 
         ap.av.hideSequence(hseqs);