Close all added

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 953b55c..caa3f5e 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -551,6 +551,18 @@ public class Desktop extends jalview.jbgui.GDesktop
         }
     }
 
+    public void closeAll_actionPerformed(ActionEvent e)
+    {
+      JInternalFrame [] frames = desktop.getAllFrames();
+      for(int i=0; i<frames.length; i++)
+      {
+        try{
+        frames[i].setClosed(true);
+      }catch(java.beans.PropertyVetoException ex){}
+      }
+    }
+
+
     /**
      * DOCUMENT ME!
      *
@@ -723,7 +735,7 @@ public class Desktop extends jalview.jbgui.GDesktop
     {
       source.viewport.gatherViewsHere = true;
       source.viewport.explodedPosition = source.getBounds();
-      JInternalFrame[] frames = Desktop.desktop.getAllFrames();
+      JInternalFrame[] frames = desktop.getAllFrames();
       String viewId = source.viewport.sequenceSetID;
 
       for (int t = 0; t < frames.length; t++)

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index 3be34c3..bee88f9 100755 (executable)
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -52,6 +52,7 @@ public class GDesktop extends JFrame
   protected JMenuItem vamsasLoad = new JMenuItem();\r
   JMenuItem inputSequence = new JMenuItem();\r
   protected JMenuItem vamsasStop = new JMenuItem();\r
+  JMenuItem closeAll = new JMenuItem();\r
 \r
   /**\r
      * Creates a new GDesktop object.\r
@@ -197,6 +198,14 @@ public class GDesktop extends JFrame
         vamsasStop_actionPerformed(e);\r
       }\r
     });\r
+    closeAll.setText("Close All");\r
+    closeAll.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        closeAll_actionPerformed(e);\r
+      }\r
+    });\r
     desktopMenubar.add(FileMenu);\r
     desktopMenubar.add(toolsMenu);\r
     VamsasMenu.setVisible(false);\r
@@ -218,7 +227,8 @@ public class GDesktop extends JFrame
     inputMenu.add(inputLocalFileMenuItem);\r
     inputMenu.add(inputURLMenuItem);\r
     inputMenu.add(inputTextboxMenuItem);\r
-       //    inputMenu.add(vamsasLoad);\r
+    windowMenu.add(closeAll);\r
+    //    inputMenu.add(vamsasLoad);\r
   }\r
 \r
     /**\r
@@ -330,5 +340,10 @@ public class GDesktop extends JFrame
   public void vamsasStop_actionPerformed(ActionEvent e)\r
   {\r
 \r
-       }\r
+  }\r
+\r
+  public void closeAll_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
 }\r