X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=aa86809d952b82212ccb010b93f68ef6c568c1af;hb=77e9dc41516acc93470931bcc5f344c67e819e70;hp=b7d060b46839e7ffa373675c3520a1f2c42ba062;hpb=3c7b844a711755d0a8520765ec8f21cd4c73375e;p=jalview.git diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index b7d060b..aa86809 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -58,6 +58,8 @@ public class GDesktop 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. @@ -74,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'); @@ -251,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); @@ -273,6 +291,8 @@ public class GDesktop VamsasMenu.add(vamsasSave); VamsasMenu.add(vamsasStop); toolsMenu.add(preferences); + toolsMenu.add(showMemusage); + toolsMenu.add(garbageCollect); inputMenu.add(inputLocalFileMenuItem); inputMenu.add(inputURLMenuItem); inputMenu.add(inputTextboxMenuItem); @@ -283,6 +303,18 @@ 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() { } @@ -420,7 +452,7 @@ public class GDesktop } - private void vamsasImport_actionPerformed(ActionEvent e) + public void vamsasImport_actionPerformed(ActionEvent e) { } }