From 237972562c84b83dbd287071cdd839d97aaf7d4b Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Thu, 23 Nov 2006 15:29:54 +0000 Subject: [PATCH] If alignment is closed, then undo performed in visible window --- src/jalview/appletgui/AlignFrame.java | 10 ++++------ src/jalview/gui/AlignFrame.java | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index 3a1ab05..ced0622 100755 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -842,7 +842,7 @@ public void itemStateChanged(ItemEvent evt) } } } - if (originalSource == null) + if (originalSource == null && al!=null) { //The original view is closed, we must validate //the current view against the closed view first @@ -1372,13 +1372,11 @@ public void itemStateChanged(ItemEvent evt) viewSize++; } - StringBuffer title = new StringBuffer(this.getTitle()); + String title = new String(this.getTitle()); if (title.indexOf("(View") > -1) - title.setLength(title.indexOf("(View")); + title = title.substring(0, title.indexOf("(View")); - title.append("(View "); - title.append(viewSize); - title.append(")"); + title+= "(View "+viewSize+")"; newaf.setTitle(title.toString()); diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 4afaf92..cc9ad28 100755 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -1016,6 +1016,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener AlignmentI al = editCommand.getAlignment(); Vector comps = (Vector) PaintRefresher.components .get(viewport.getSequenceSetId()); + System.out.println(comps.size()); for (int i = 0; i < comps.size(); i++) { if (comps.elementAt(i) instanceof AlignmentPanel) @@ -1027,7 +1028,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener } } } - if (originalSource == null) + if (originalSource == null && al!=null) { //The original view is closed, we must validate //the current view against the closed view first -- 1.7.10.2