X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fcommands%2FRemoveGapColCommand.java;h=28d419ea796b561a5449238ece1463f0477822d7;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=b9b2648ebacf440d1139fbff4afb6d788c6084c8;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/commands/RemoveGapColCommand.java b/src/jalview/commands/RemoveGapColCommand.java index b9b2648..28d419e 100644 --- a/src/jalview/commands/RemoveGapColCommand.java +++ b/src/jalview/commands/RemoveGapColCommand.java @@ -1,20 +1,22 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) + * Copyright (C) 2014 The Jalview Authors * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.commands; @@ -37,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 { @@ -53,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++) @@ -84,7 +87,8 @@ public class RemoveGapColCommand extends EditCommand if (!delete && startCol > -1) { - this.appendEdit(DELETE_GAP, seqs, startCol - columnsDeleted, endCol + this.appendEdit(Action.DELETE_GAP, seqs, startCol - columnsDeleted, + endCol - startCol, al, false, null); columnsDeleted += (endCol - startCol); @@ -98,7 +102,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 + this.appendEdit(Action.DELETE_GAP, seqs, startCol - columnsDeleted, + end - startCol + 1, al, false, null); columnsDeleted += (end - startCol + 1);