X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fcommands%2FTrimRegionCommand.java;h=cb60f4e29a73b5a2d6dc3dbdfae4022b7115dc49;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=4110bd1fcd5ecb1c1c5fe82ceb52cdad531679ec;hpb=fa93bb578999b13c0364a712ae368ca8841012a1;p=jalview.git diff --git a/src/jalview/commands/TrimRegionCommand.java b/src/jalview/commands/TrimRegionCommand.java index 4110bd1..cb60f4e 100644 --- a/src/jalview/commands/TrimRegionCommand.java +++ b/src/jalview/commands/TrimRegionCommand.java @@ -1,20 +1,20 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle - * - * 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 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. - * - * 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 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Copyright (C) 2014 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. + * + * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.commands; @@ -23,10 +23,10 @@ import java.util.*; import jalview.datamodel.*; import jalview.util.*; -public class TrimRegionCommand - extends EditCommand +public class TrimRegionCommand extends EditCommand { public static String TRIM_LEFT = "TrimLeft"; + public static String TRIM_RIGHT = "TrimRight"; public ColumnSelection colSel = null; @@ -41,13 +41,9 @@ public class TrimRegionCommand int columnsDeleted; - public TrimRegionCommand(String description, - String command, - SequenceI[] seqs, - int column, - AlignmentI al, - ColumnSelection colSel, - SequenceGroup selectedRegion) + public TrimRegionCommand(String description, String command, + SequenceI[] seqs, int column, AlignmentI al, + ColumnSelection colSel, SequenceGroup selectedRegion) { this.description = description; this.selectionGroup = selectedRegion; @@ -62,8 +58,7 @@ public class TrimRegionCommand columnsDeleted = column; edits = new Edit[] - { - new Edit(CUT, seqs, 0, column, al)}; + { new Edit(CUT, seqs, 0, column, al) }; } else if (command.equalsIgnoreCase(TRIM_RIGHT)) { @@ -76,12 +71,11 @@ public class TrimRegionCommand columnsDeleted = width - 1; edits = new Edit[] - { - new Edit(CUT, seqs, column + 1, width, al)}; + { new Edit(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 + // 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; start = new int[isize]; for (i = 0; i < isize; i++) @@ -89,7 +83,7 @@ public class TrimRegionCommand start[i] = edits[0].seqs[i].getStart(); } - performEdit(0,null); + performEdit(0, null); } void cut(Edit command) @@ -99,13 +93,13 @@ public class TrimRegionCommand { if (command.position == 0) { - //This is a TRIM_LEFT command + // This is a TRIM_LEFT command column = command.seqs[j].findPosition(command.number); command.seqs[j].setStart(column); } else { - //This is a TRIM_RIGHT command + // This is a TRIM_RIGHT command column = command.seqs[j].findPosition(command.position) - 1; command.seqs[j].setEnd(column); } @@ -124,7 +118,7 @@ public class TrimRegionCommand else { deletedHiddenColumns = colSel.compensateForEdit(command.position, - command.number); + command.number); if (selectionGroup != null) { selectionGroup.adjustForRemoveRight(command.position); @@ -144,8 +138,8 @@ public class TrimRegionCommand } else { - column = command.seqs[j] - .findPosition(command.number + command.position) - 1; + column = command.seqs[j].findPosition(command.number + + command.position) - 1; command.seqs[j].setEnd(column); } } @@ -155,7 +149,7 @@ public class TrimRegionCommand colSel.compensateForEdit(0, -command.number); if (selectionGroup != null) { - selectionGroup.adjustForRemoveLeft( -command.number); + selectionGroup.adjustForRemoveLeft(-command.number); } }