X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FRedundancyPanel.java;h=c4a6989e071dd18aaf4e2b9e94f7fdab7d955db8;hb=7ec8c23d92c88099a6378cc60e896e4c90ada5e7;hp=216f45d5841c9cbbe8fdeb3db0e52b8f42b64058;hpb=aced09c4feeaf3406269442c14e54abeeb4cad81;p=jalview.git diff --git a/src/jalview/appletgui/RedundancyPanel.java b/src/jalview/appletgui/RedundancyPanel.java index 216f45d..c4a6989 100644 --- a/src/jalview/appletgui/RedundancyPanel.java +++ b/src/jalview/appletgui/RedundancyPanel.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,16 +20,26 @@ */ 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 { @@ -197,7 +207,7 @@ public class RedundancyPanel extends SliderPanel implements Runnable, } EditCommand cut = new EditCommand(MessageManager.getString("action.remove_redundancy"), - EditCommand.CUT, deleted, 0, width, ap.av.getAlignment()); + Action.CUT, deleted, 0, width, ap.av.getAlignment()); AlignmentI alignment = ap.av.getAlignment(); for (int i = 0; i < del.size(); i++) { @@ -213,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,10 +233,11 @@ public class RedundancyPanel extends SliderPanel implements Runnable, CommandI command = (CommandI) historyList.pop(); command.undoCommand(null); - if (ap.av.historyList.contains(command)) + if (ap.av.getHistoryList().contains(command)) { - ap.av.historyList.removeElement(command); + ap.av.getHistoryList().remove(command); ap.alignFrame.updateEditMenuBar(); + ap.av.firePropertyChange("alignment", null, ap.av.getAlignment().getSequences()); } ap.paintAlignment(true);