X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRotatableCanvas.java;h=b4af354b239dafe28f1b5a60f75e17df481a8374;hb=0306c5b7a2aa4cc232ad0590a8ef285022eabd51;hp=bd036292bf787af6ca3f76a4c6649211f9939802;hpb=6f1e63559f37744a94e011c1f527644b44eec312;p=jalview.git

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