If alignment is closed, then undo performed in visible window
authoramwaterhouse <Andrew Waterhouse>
Thu, 23 Nov 2006 15:32:42 +0000 (15:32 +0000)
committeramwaterhouse <Andrew Waterhouse>
Thu, 23 Nov 2006 15:32:42 +0000 (15:32 +0000)
src/jalview/appletgui/AlignFrame.java
src/jalview/gui/AlignFrame.java

index ced0622..df5b1a6 100755 (executable)
@@ -842,11 +842,12 @@ public void itemStateChanged(ItemEvent evt)
           }\r
         }\r
       }\r
-      if (originalSource == null && al!=null)\r
+      if (originalSource == null)\r
       {\r
         //The original view is closed, we must validate\r
         //the current view against the closed view first\r
-        PaintRefresher.validateSequences(al, viewport.alignment);\r
+        if (al != null)\r
+          PaintRefresher.validateSequences(al, viewport.alignment);\r
         originalSource = viewport;\r
       }\r
 \r
index cc9ad28..11570ed 100755 (executable)
@@ -1016,7 +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)
@@ -1028,11 +1028,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
           }
         }
       }
-      if (originalSource == null && al!=null)
+      if (originalSource == null)
       {
         //The original view is closed, we must validate
         //the current view against the closed view first
-        PaintRefresher.validateSequences(al, viewport.alignment);
+        if (al != null)
+          PaintRefresher.validateSequences(al, viewport.alignment);
+
         originalSource = viewport;
       }