Merge branch 'releases/Release_2_10_0_Branch'

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

diff --git a/src/jalview/commands/RemoveGapColCommand.java b/src/jalview/commands/RemoveGapColCommand.java
index 6172ce8..b02d1ef 100644 (file)
--- a/src/jalview/commands/RemoveGapColCommand.java
+++ b/src/jalview/commands/RemoveGapColCommand.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -39,7 +39,8 @@ package jalview.commands;
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-import jalview.datamodel.*;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.SequenceI;
 
 public class RemoveGapColCommand extends EditCommand
 {
@@ -55,7 +56,7 @@ public class RemoveGapColCommand extends EditCommand
     int startCol = -1, endCol = -1;
     columnsDeleted = 0;
 
-    edits = new Edit[0];
+    clearEdits();
 
     boolean delete = true;
     for (int i = start; i <= end; i++)
@@ -86,8 +87,8 @@ public class RemoveGapColCommand extends EditCommand
 
       if (!delete && startCol > -1)
       {
-        this.appendEdit(DELETE_GAP, seqs, startCol - columnsDeleted, endCol
-                - startCol, al, false, null);
+        this.appendEdit(Action.DELETE_GAP, seqs, startCol - columnsDeleted,
+                endCol - startCol, al, false, null);
 
         columnsDeleted += (endCol - startCol);
         startCol = -1;
@@ -100,8 +101,8 @@ public class RemoveGapColCommand extends EditCommand
       // This is for empty columns at the
       // end of the alignment
 
-      this.appendEdit(DELETE_GAP, seqs, startCol - columnsDeleted, end
-              - startCol + 1, al, false, null);
+      this.appendEdit(Action.DELETE_GAP, seqs, startCol - columnsDeleted,
+              end - startCol + 1, al, false, null);
 
       columnsDeleted += (end - startCol + 1);
     }