X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=aa86809d952b82212ccb010b93f68ef6c568c1af;hb=30bc1314d4206cafea412dcd9decdea7e318481f;hp=59e4457460de27a2b8131887eead2df5a3ed6c38;hpb=88bc025708f1b7881bababb92d14351760e0f9da;p=jalview.git

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index 59e4457..aa86809 100755
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -20,6 +20,7 @@ package jalview.jbgui;
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 
 /**
@@ -36,6 +37,7 @@ public class GDesktop
   JMenu FileMenu = new JMenu();
   JMenu HelpMenu = new JMenu();
   protected JMenu VamsasMenu = new JMenu();
+  protected JMenu VamsasStMenu = new JMenu();
   JMenuItem inputLocalFileMenuItem = new JMenuItem();
   JMenuItem inputURLMenuItem = new JMenuItem();
   JMenuItem inputTextboxMenuItem = new JMenuItem();
@@ -48,12 +50,16 @@ public class GDesktop
   JMenuItem saveState = new JMenuItem();
   JMenuItem loadState = new JMenuItem();
   JMenu inputMenu = new JMenu();
-  protected JMenuItem vamsasLoad = new JMenuItem();
+  protected JMenuItem vamsasStart = new JMenuItem();
+  protected JMenuItem vamsasImport = new JMenuItem();
+  protected JMenuItem vamsasSave = new JMenuItem();
   JMenuItem inputSequence = new JMenuItem();
   protected JMenuItem vamsasStop = new JMenuItem();
   JMenuItem closeAll = new JMenuItem();
   JMenuItem raiseRelated = new JMenuItem();
   JMenuItem minimizeAssociated = new JMenuItem();
+  protected JCheckBoxMenuItem showMemusage = new JCheckBoxMenuItem();
+  JMenuItem garbageCollect = new JMenuItem();
 
   /**
    * Creates a new GDesktop object.
@@ -70,7 +76,7 @@ public class GDesktop
       e.printStackTrace();
     }
 
-    if (!System.getProperty("os.name").startsWith("Mac"))
+    if (!new jalview.util.Platform().isAMac())
     {
       FileMenu.setMnemonic('F');
       inputLocalFileMenuItem.setMnemonic('L');
@@ -96,6 +102,8 @@ public class GDesktop
     HelpMenu.setText("Help");
     VamsasMenu.setText("Vamsas");
     VamsasMenu.setToolTipText("Share data with other vamsas applications.");
+    VamsasStMenu.setText("Connect to");
+    VamsasStMenu.setToolTipText("Join an existing vamsas session");
     inputLocalFileMenuItem.setText("from File");
     inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
         java.awt.event.KeyEvent.VK_O,
@@ -177,13 +185,31 @@ public class GDesktop
       }
     });
     inputMenu.setText("Input Alignment");
-    vamsasLoad.setText("Start Vamsas Session...");
-    vamsasLoad.setVisible(false);
-    vamsasLoad.addActionListener(new ActionListener()
+    vamsasStart.setText("New Vamsas Session...");
+    vamsasStart.setVisible(false);
+    vamsasStart.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        vamsasStart_actionPerformed(e);
+      }
+    });
+    vamsasImport.setText("Load Vamsas Session...");
+    vamsasImport.setVisible(false);
+    vamsasImport.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        vamsasImport_actionPerformed(e);
+      }
+    });
+    vamsasSave.setText("Save Vamsas Session...");
+    vamsasSave.setVisible(false);
+    vamsasSave.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
       {
-        vamsasLoad_actionPerformed(e);
+        vamsasSave_actionPerformed(e);
       }
     });
     inputSequence.setText("Fetch Sequence(s)...");
@@ -227,6 +253,22 @@ public class GDesktop
         minimizeAssociated_actionPerformed(e);
       }
     });
+    garbageCollect.setText("Collect Garbage");
+    garbageCollect.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        garbageCollect_actionPerformed(e);
+      }
+    });
+    showMemusage.setText("Show Memory Usage");
+    showMemusage.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        showMemusage_actionPerformed(e);
+      }
+    });
     desktopMenubar.add(FileMenu);
     desktopMenubar.add(toolsMenu);
     VamsasMenu.setVisible(false);
@@ -242,9 +284,15 @@ public class GDesktop
     FileMenu.add(quit);
     HelpMenu.add(aboutMenuItem);
     HelpMenu.add(documentationMenuItem);
-    VamsasMenu.add(vamsasLoad);
+    VamsasMenu.add(VamsasStMenu);
+    VamsasStMenu.setVisible(false);
+    VamsasMenu.add(vamsasStart);
+    VamsasMenu.add(vamsasImport);
+    VamsasMenu.add(vamsasSave);
     VamsasMenu.add(vamsasStop);
     toolsMenu.add(preferences);
+    toolsMenu.add(showMemusage);
+    toolsMenu.add(garbageCollect);
     inputMenu.add(inputLocalFileMenuItem);
     inputMenu.add(inputURLMenuItem);
     inputMenu.add(inputTextboxMenuItem);
@@ -255,6 +303,26 @@ public class GDesktop
     //    inputMenu.add(vamsasLoad);
   }
 
+  protected void showMemusage_actionPerformed(ActionEvent e)
+  {
+    // TODO Auto-generated method stub
+    
+  }
+
+  protected void garbageCollect_actionPerformed(ActionEvent e)
+  {
+    // TODO Auto-generated method stub
+    
+  }
+
+  protected void vamsasStMenu_actionPerformed()
+  {
+  }
+
+  public void vamsasSave_actionPerformed(ActionEvent e)
+  {
+  }
+
   /**
    * DOCUMENT ME!
    *
@@ -354,7 +422,7 @@ public class GDesktop
   {
   }
 
-  public void vamsasLoad_actionPerformed(ActionEvent e)
+  public void vamsasStart_actionPerformed(ActionEvent e)
   {
 
   }
@@ -383,4 +451,8 @@ public class GDesktop
   {
 
   }
+
+  public void vamsasImport_actionPerformed(ActionEvent e)
+  {
+  }
 }