merge

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 6d55aca..0e1811d 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -265,10 +265,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       delegate.openFrame(f);
     }
 
+    @Override
     public void resizeFrame(JComponent f, int newX, int newY, int newWidth,
             int newHeight)
     {
-      Rectangle b = desktop.getBounds();
       if (newY < 0)
       {
         newY = 0;
@@ -1133,7 +1133,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
   public void inputTextboxMenuItem_actionPerformed(AlignViewport viewport)
   {
     CutAndPasteTransfer cap = new CutAndPasteTransfer();
-    cap.setForInput(viewport.getAlignPanel());
+//    cap.setForInput(viewport.getAlignPanel());
+    cap.setForInput(null);
     Desktop.addInternalFrame(cap,
             MessageManager.getString("label.cut_paste_alignmen_file"),
             true, 600, 500);
@@ -1300,7 +1301,17 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     if (v_client != null)
     {
       // TODO clear binding to vamsas document objects on close_all
+    }
 
+    /*
+     * reset state of singleton objects as appropriate (clear down session state
+     * when all windows are closed)
+     */
+    StructureSelectionManager ssm = StructureSelectionManager
+            .getStructureSelectionManager(this);
+    if (ssm != null)
+    {
+      ssm.resetAll();
     }
   }
 
@@ -2286,6 +2297,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       }
     }
 
+    @Override
     public void paintComponent(Graphics g)
     {
       if (showMemoryUsage && g != null && df != null)