X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FRedundancyPanel.java;h=34f300973895a39f08cba364fca4dfa49ba55eaa;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=15478620b15ac6a51d07cb350bac5ef9b0003fd9;hpb=38ff6745cdbbebd2f0f6b5aedde3c815e664b7ad;p=jalview.git diff --git a/src/jalview/appletgui/RedundancyPanel.java b/src/jalview/appletgui/RedundancyPanel.java index 1547862..34f3009 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 2.9.0b2) + * Copyright (C) 2015 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 { @@ -196,8 +206,9 @@ public class RedundancyPanel extends SliderPanel implements Runnable, } } - EditCommand cut = new EditCommand(MessageManager.getString("action.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++) { @@ -213,7 +224,8 @@ 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()); } } @@ -223,11 +235,12 @@ 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.av.firePropertyChange("alignment", null, ap.av.getAlignment() + .getSequences()); } ap.paintAlignment(true);