end must be greater than blockstart

[jalview.git] / src / jalview / datamodel / ColumnSelection.java

diff --git a/src/jalview/datamodel/ColumnSelection.java b/src/jalview/datamodel/ColumnSelection.java
index 73b7899..74f4cda 100644 (file)
--- a/src/jalview/datamodel/ColumnSelection.java
+++ b/src/jalview/datamodel/ColumnSelection.java
@@ -964,8 +964,13 @@ public class ColumnSelection
 \r
         if (end > blockStart)\r
         {\r
-          annels.addElement(els = new Annotation[end-blockStart]);\r
-          System.arraycopy(alignmentAnnotation.annotations, blockStart, els, 0, els.length);\r
+          annels.addElement(els = new Annotation[end-blockStart+1]);\r
+          if (end-blockStart+1<=alignmentAnnotation.annotations.length)\r
+          {\r
+            System.arraycopy(alignmentAnnotation.annotations, blockStart, els, 0, els.length);\r
+          } else {\r
+            System.arraycopy(alignmentAnnotation.annotations, blockStart, els, 0, (end-blockStart+1));\r
+          }\r
           w+=els.length;\r
         }\r
         if (w==0)\r
@@ -979,6 +984,33 @@ public class ColumnSelection
           System.arraycopy(chnk, 0, alignmentAnnotation.annotations, w, chnk.length);\r
           w+=chnk.length;\r
         }\r
+    } else {\r
+      alignmentAnnotation.restrict(start, end);\r
     }\r
   }\r
+\r
+  /**\r
+   * Invert the column selection from first to end-1.\r
+   * leaves hiddenColumns untouched (and unselected)\r
+   * @param first\r
+   * @param end\r
+   */\r
+  public void invertColumnSelection(int first, int width)\r
+  {\r
+    boolean hasHidden = hiddenColumns!=null && hiddenColumns.size()>0;\r
+    for(int i=first; i<width; i++)\r
+    {\r
+      if(contains(i))\r
+    {\r
+        removeElement(i);\r
+    }\r
+      else\r
+      {\r
+        if (!hasHidden || isVisible(i))\r
+        {\r
+          addElement(i);\r
+        }\r
+      }\r
+    }    \r
+  }\r
 }\r