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

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

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index c09093b..abd5093 100755 (executable)
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -73,7 +73,7 @@ public class PopupMenu extends JPopupMenu
     catch(Exception e)\r
     {    e.printStackTrace();    }\r
 \r
-    SequenceGroup sg = ap.av.getRubberbandGroup();\r
+    SequenceGroup sg = ap.av.getSelectionGroup();\r
     if(sg!=null)\r
     {\r
       groupName.setText(sg.getName());\r
@@ -324,10 +324,6 @@ public class PopupMenu extends JPopupMenu
     if( superG !=null)\r
       superG.setSuperGroupProperties( sg );\r
 \r
-\r
-    //once group is defined, remove selection rubberband\r
-    ap.av.setRubberbandGroup(null);\r
-\r
     ap.seqPanel.seqCanvas.paintFlag=true;\r
     ap.seqPanel.repaint();\r
   }\r
@@ -490,7 +486,7 @@ public class PopupMenu extends JPopupMenu
 \r
   SequenceGroup getGroup()\r
   {\r
-    SequenceGroup sg = ap.av.getRubberbandGroup();\r
+    SequenceGroup sg = ap.av.getSelectionGroup();\r
 \r
     // this method won't add a new group if it already exists\r
     ap.av.alignment.addGroup(sg);\r
@@ -520,9 +516,9 @@ public class PopupMenu extends JPopupMenu
 \r
   void unGroupMenuItem_actionPerformed(ActionEvent e)\r
   {\r
-     SequenceGroup sg = ap.av.getRubberbandGroup();\r
+     SequenceGroup sg = ap.av.getSelectionGroup();\r
      ap.av.alignment.deleteGroup(sg);\r
-     ap.av.setRubberbandGroup(null);\r
+     ap.av.setSelectionGroup(null);\r
      ap.RefreshPanels();\r
   }\r
 \r