From 8b7b2e3d4893991f29ab603c20ae826f7e3c8ffb Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Thu, 2 Nov 2006 15:11:55 +0000 Subject: [PATCH] History is per viewport --- src/jalview/gui/AlignViewport.java | 6 +++++- src/jalview/gui/RedundancyPanel.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java index 7c3279e..0161517 100755 --- a/src/jalview/gui/AlignViewport.java +++ b/src/jalview/gui/AlignViewport.java @@ -109,6 +109,9 @@ public class AlignViewport boolean gatherViewsHere = false; + Stack historyList = new Stack(); + Stack redoList = new Stack(); + /** * Creates a new AlignViewport object. * @@ -231,6 +234,8 @@ public class AlignViewport globalColourScheme.setConsensus(hconsensus); } } + + wrapAlignment = jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false); } @@ -1534,7 +1539,6 @@ public class AlignViewport resetAllColourSchemes(); alignment.adjustSequenceAnnotations(); - } diff --git a/src/jalview/gui/RedundancyPanel.java b/src/jalview/gui/RedundancyPanel.java index 28532d0..ec896d5 100755 --- a/src/jalview/gui/RedundancyPanel.java +++ b/src/jalview/gui/RedundancyPanel.java @@ -290,9 +290,9 @@ public class RedundancyPanel extends GSliderPanel implements Runnable CommandI command = (CommandI) historyList.pop(); command.undoCommand(); - if (af.historyList.contains(command)) + if (ap.av.historyList.contains(command)) { - af.historyList.remove(command); + ap.av.historyList.remove(command); af.updateEditMenuBar(); } -- 1.7.10.2