JAL-1620 version bump and release notes

[jalview.git] / src / jalview / commands / TrimRegionCommand.java

diff --git a/src/jalview/commands/TrimRegionCommand.java b/src/jalview/commands/TrimRegionCommand.java
index a757d1a..f3ac9df 100644 (file)
--- a/src/jalview/commands/TrimRegionCommand.java
+++ b/src/jalview/commands/TrimRegionCommand.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
  * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
@@ -20,10 +20,13 @@
  */
 package jalview.commands;
 
-import java.util.*;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.util.ShiftList;
 
-import jalview.datamodel.*;
-import jalview.util.*;
+import java.util.List;
 
 public class TrimRegionCommand extends EditCommand
 {
@@ -39,7 +42,7 @@ public class TrimRegionCommand extends EditCommand
 
   SequenceGroup selectionGroup;
 
-  Vector deletedHiddenColumns;
+  List<int[]> deletedHiddenColumns;
 
   int columnsDeleted;
 
@@ -59,8 +62,7 @@ public class TrimRegionCommand extends EditCommand
 
       columnsDeleted = column;
 
-      edits = new Edit[]
-      { new Edit(CUT, seqs, 0, column, al) };
+      setEdit(new Edit(Action.CUT, seqs, 0, column, al));
     }
     else if (command.equalsIgnoreCase(TRIM_RIGHT))
     {
@@ -72,17 +74,16 @@ public class TrimRegionCommand extends EditCommand
 
       columnsDeleted = width - 1;
 
-      edits = new Edit[]
-      { new Edit(CUT, seqs, column + 1, width, al) };
+      setEdit(new Edit(Action.CUT, seqs, column + 1, width, al));
     }
 
     // We need to keep a record of the sequence start
     // in order to restore the state after a redo
-    int i, isize = edits[0].seqs.length;
+    int i, isize = getEdit(0).seqs.length;
     start = new int[isize];
     for (i = 0; i < isize; i++)
     {
-      start[i] = edits[0].seqs[i].getStart();
+      start[i] = getEdit(0).seqs[i].getStart();
     }
 
     performEdit(0, null);
@@ -160,7 +161,7 @@ public class TrimRegionCommand extends EditCommand
       int[] region;
       for (int i = 0; i < deletedHiddenColumns.size(); i++)
       {
-        region = (int[]) deletedHiddenColumns.elementAt(i);
+        region = deletedHiddenColumns.get(i);
         colSel.hideColumns(region[0], region[1]);
       }
     }