X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fcommands%2FRemoveGapsCommand.java;h=e080fec6f645a66b5444bd7c5943ff8afc7d20b9;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=7d5f39e6f898a95d5c28215bcaffc3f14179e199;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/commands/RemoveGapsCommand.java b/src/jalview/commands/RemoveGapsCommand.java index 7d5f39e..e080fec 100644 --- a/src/jalview/commands/RemoveGapsCommand.java +++ b/src/jalview/commands/RemoveGapsCommand.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.9.0b2) + * Copyright (C) 2015 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 RemoveGapsCommand extends EditCommand { @@ -72,7 +75,7 @@ public class RemoveGapsCommand extends EditCommand int j, jSize; - edits = new Edit[0]; + clearEdits(); boolean delete = true; char[] sequence; @@ -106,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; @@ -117,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); }