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

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

diff --git a/src/jalview/gui/RotatableCanvas.java b/src/jalview/gui/RotatableCanvas.java
index bd03629..b4af354 100755 (executable)
--- a/src/jalview/gui/RotatableCanvas.java
+++ b/src/jalview/gui/RotatableCanvas.java
@@ -294,9 +294,9 @@ public class RotatableCanvas extends JPanel implements MouseListener,
           g.setColor(sp.sequence.getColor());\r
 \r
 \r
-      if (av != null)\r
+      if (av.getSelectionGroup() != null)\r
       {\r
-        if (av.getSelection().contains(((SequencePoint)points.elementAt(i)).sequence))\r
+        if (av.getSelectionGroup().sequences.contains(((SequencePoint)points.elementAt(i)).sequence))\r
           g.setColor(Color.gray);\r
       }\r
       if (z < 0)\r
@@ -380,16 +380,20 @@ public class RotatableCanvas extends JPanel implements MouseListener,
 \r
     SequenceI found = findPoint(x,y);\r
 \r
-    if (found != null) {\r
-      if (av != null) {\r
-\r
-        if (av.getSelection().contains(found)) {\r
-          av.getSelection().removeElement(found);\r
-        } else {\r
-          av.getSelection().addElement(found);\r
-        }\r
+    if (found != null)\r
+    {\r
+      if (av.getSelectionGroup() != null)\r
+      {\r
+        av.getSelectionGroup().addOrRemove(found);\r
         PaintRefresher.Refresh(this);\r
       }\r
+      else\r
+      {\r
+          av.setSelectionGroup(new SequenceGroup());\r
+          av.getSelectionGroup().addOrRemove(found);\r
+          av.getSelectionGroup().setEndRes(av.alignment.getWidth());\r
+\r
+      }\r
     }\r
     repaint();\r
   }\r
@@ -455,9 +459,10 @@ public class RotatableCanvas extends JPanel implements MouseListener,
 \r
       if (tmp1 > x1 && tmp1 < x2 && tmp2 > y1 && tmp2 < y2) {\r
         if (av != null) {\r
-          if (!av.getSelection().contains(sp.sequence)) {\r
+          if (!av.getSelectionGroup().sequences.contains(sp.sequence))\r
+          {\r
             changedSel = true;\r
-            av.getSelection().addElement(sp.sequence);\r
+            av.getSelectionGroup().addSequence(sp.sequence);\r
           }\r
         }\r
       }\r