If alignment is closed, then undo performed in visible window

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index c1d1087..cc9ad28 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -974,10 +974,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     command.undoCommand();
 
     AlignViewport originalSource = getOriginatingSource(command);
-
-    originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
     updateEditMenuBar();
-    originalSource.firePropertyChange("alignment", null,viewport.getAlignment().getSequences());
+
+    if(originalSource!=null)
+    {
+      originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
+      originalSource.firePropertyChange("alignment", null,null);
+    }
   }
 
   /**
@@ -992,15 +995,18 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     command.doCommand();
 
     AlignViewport originalSource = getOriginatingSource(command);
-    originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns()!=null;
-
     updateEditMenuBar();
-    originalSource.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
+
+    if(originalSource!=null)
+    {
+      originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
+      originalSource.firePropertyChange("alignment", null,null);
+    }
   }
 
   AlignViewport getOriginatingSource(CommandI command)
   {
-    AlignViewport originalSource = viewport;
+    AlignViewport originalSource = null;
     //For sequence removal and addition, we need to fire
    //the property change event FROM the viewport where the
    //original alignment was altered
@@ -1010,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)
@@ -1021,7 +1028,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
           }
         }
       }
+      if (originalSource == null && al!=null)
+      {
+        //The original view is closed, we must validate
+        //the current view against the closed view first
+        PaintRefresher.validateSequences(al, viewport.alignment);
+        originalSource = viewport;
+      }
+
     }
+
+
     return originalSource;
   }
 
@@ -2515,7 +2532,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       return;
     }
 
-     new PCAPanel(viewport);
+     new PCAPanel(alignPanel);
   }