X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FRedundancyPanel.java;h=6182532502a81606969b0ca232408b4446e5aecc;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=a889b89259db2e819d1c62c69be28ae002e4e0d6;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git diff --git a/src/jalview/appletgui/RedundancyPanel.java b/src/jalview/appletgui/RedundancyPanel.java index a889b89..6182532 100644 --- a/src/jalview/appletgui/RedundancyPanel.java +++ b/src/jalview/appletgui/RedundancyPanel.java @@ -1,33 +1,45 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) * 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. + * 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.appletgui; -import java.util.*; -import java.util.List; -import java.awt.*; -import java.awt.event.*; - import jalview.analysis.AlignSeq; -import jalview.commands.*; -import jalview.datamodel.*; +import jalview.commands.CommandI; +import jalview.commands.EditCommand; +import jalview.commands.EditCommand.Action; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.SequenceGroup; +import jalview.datamodel.SequenceI; import jalview.util.MessageManager; +import java.awt.Frame; +import java.awt.event.ActionEvent; +import java.awt.event.AdjustmentEvent; +import java.awt.event.AdjustmentListener; +import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; +import java.util.ArrayList; +import java.util.List; +import java.util.Stack; +import java.util.Vector; + public class RedundancyPanel extends SliderPanel implements Runnable, WindowListener { @@ -51,7 +63,8 @@ public class RedundancyPanel extends SliderPanel implements Runnable, applyButton.setVisible(true); allGroupsCheck.setVisible(false); - label.setText(MessageManager.getString("label.enter_redundancy_threshold")); + label.setText(MessageManager + .getString("label.enter_redundancy_threshold")); valueField.setText("100"); slider.setVisibleAmount(1); @@ -70,8 +83,8 @@ public class RedundancyPanel extends SliderPanel implements Runnable, frame = new Frame(); frame.add(this); - jalview.bin.JalviewLite.addFrame(frame, - MessageManager.getString("label.redundancy_threshold_selection"), 400, 100); + jalview.bin.JalviewLite.addFrame(frame, MessageManager + .getString("label.redundancy_threshold_selection"), 400, 100); frame.addWindowListener(this); @@ -125,7 +138,8 @@ public class RedundancyPanel extends SliderPanel implements Runnable, redundancy = AlignSeq.computeRedundancyMatrix(originalSequences, omitHidden, start, end, false); - label.setText(MessageManager.getString("label.enter_redundancy_threshold")); + label.setText(MessageManager + .getString("label.enter_redundancy_threshold")); slider.setVisible(true); applyButton.setEnabled(true); valueField.setVisible(true); @@ -192,8 +206,8 @@ public class RedundancyPanel extends SliderPanel implements Runnable, } } - EditCommand cut = new EditCommand("Remove Redundancy", - EditCommand.CUT, deleted, 0, width, ap.av.getAlignment()); + EditCommand cut = new EditCommand(MessageManager.getString("action.remove_redundancy"), + Action.CUT, deleted, 0, width, ap.av.getAlignment()); AlignmentI alignment = ap.av.getAlignment(); for (int i = 0; i < del.size(); i++) { @@ -209,8 +223,7 @@ public class RedundancyPanel extends SliderPanel implements Runnable, ap.alignFrame.addHistoryItem(cut); PaintRefresher.Refresh(this, ap.av.getSequenceSetId(), true, true); - // ap.av.firePropertyChange("alignment", null, ap.av.getAlignment() - // .getSequences()); + ap.av.firePropertyChange("alignment", null, ap.av.getAlignment().getSequences()); } } @@ -224,6 +237,7 @@ public class RedundancyPanel extends SliderPanel implements Runnable, { ap.av.historyList.removeElement(command); ap.alignFrame.updateEditMenuBar(); + ap.av.firePropertyChange("alignment", null, ap.av.getAlignment().getSequences()); } ap.paintAlignment(true);