selection removed, now SelectionGroup does same job as id select and residue select

[jalview.git] / src / jalview / gui / GroupEditor.java

diff --git a/src/jalview/gui/GroupEditor.java b/src/jalview/gui/GroupEditor.java
index 3ee186b..e3c49d6 100755 (executable)
--- a/src/jalview/gui/GroupEditor.java
+++ b/src/jalview/gui/GroupEditor.java
@@ -198,10 +198,10 @@ public class GroupEditor extends GGroupEditor
       return;\r
 \r
     SequenceGroup sg = (SequenceGroup)groups.elementAt(selectedGroupIndex);\r
-    Selection sel = av.getSelection();\r
-    for(int i=0; i<sel.size(); i++)\r
+\r
+    for(int i=0; i<av.getSelectionGroup().getSize(); i++)\r
     {\r
-      int index = unassignedVector.indexOf( sel.sequenceAt(i).getDisplayId() );\r
+      int index = unassignedVector.indexOf( av.getSelectionGroup().getSequenceAt(i).getDisplayId() );\r
       if(index!=-1)\r
       {\r
         sg.addSequence( (SequenceI) sequenceHash.get( unassignedVector.elementAt(index) ));\r
@@ -267,7 +267,7 @@ public class GroupEditor extends GGroupEditor
 \r
       unassignedVector.addElement(assignedVector.elementAt(indices[i]-i));\r
       SequenceI removeSequence = (SequenceI)sequenceHash.get( assignedVector.elementAt(indices[i]-i) );\r
-      av.getSelection().removeElement( removeSequence );\r
+      av.getSelectionGroup().deleteSequence( removeSequence );\r
       sg.deleteSequence( removeSequence );\r
       assignedVector.removeElementAt(indices[i]-i);\r
 \r
@@ -288,7 +288,7 @@ public class GroupEditor extends GGroupEditor
       String id = (String)enum.nextElement();\r
       unassignedVector.addElement( id );\r
       SequenceI removeSequence = (SequenceI)sequenceHash.get( id );\r
-      av.getSelection().removeElement( removeSequence );\r
+      av.getSelectionGroup().deleteSequence( removeSequence );\r
       sg.deleteSequence( removeSequence );\r
     }\r
 \r