RepresentGroup count items
authoramwaterhouse <Andrew Waterhouse>
Thu, 12 Oct 2006 13:21:09 +0000 (13:21 +0000)
committeramwaterhouse <Andrew Waterhouse>
Thu, 12 Oct 2006 13:21:09 +0000 (13:21 +0000)
src/jalview/appletgui/APopupMenu.java
src/jalview/gui/PopupMenu.java

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