X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fcommands%2FRemoveGapsCommand.java;h=c81f04f58d39733e8cd486d9c8f90260b9037ce9;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=ef39ef04b51dd3de8c91fce669de19c21b8cdb1f;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git diff --git a/src/jalview/commands/RemoveGapsCommand.java b/src/jalview/commands/RemoveGapsCommand.java index ef39ef0..c81f04f 100644 --- a/src/jalview/commands/RemoveGapsCommand.java +++ b/src/jalview/commands/RemoveGapsCommand.java @@ -1,19 +1,22 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * * 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. - * + * 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 Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.commands; @@ -36,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 RemoveGapsCommand extends EditCommand { @@ -71,7 +75,7 @@ public class RemoveGapsCommand extends EditCommand int j, jSize; - edits = new Edit[0]; + clearEdits(); boolean delete = true; char[] sequence; @@ -105,9 +109,9 @@ public class RemoveGapsCommand extends EditCommand if (!delete && startCol > -1) { - this.appendEdit(DELETE_GAP, new SequenceI[] - { seqs[s] }, start + startCol - deletedCols, endCol - startCol, - al, false, null); + this.appendEdit(Action.DELETE_GAP, new SequenceI[] { seqs[s] }, + start + startCol - deletedCols, endCol - startCol, al, + false, null); deletedCols += (endCol - startCol); startCol = -1; @@ -116,8 +120,8 @@ public class RemoveGapsCommand extends EditCommand } if (delete && startCol > -1) { - this.appendEdit(DELETE_GAP, new SequenceI[] - { seqs[s] }, start + startCol - deletedCols, jSize - startCol, al, + this.appendEdit(Action.DELETE_GAP, new SequenceI[] { seqs[s] }, + start + startCol - deletedCols, jSize - startCol, al, false, null); }