Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / src / jalview / jbgui / GDesktop.java

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index ca95222..2a86d69 100755 (executable)
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -20,6 +20,7 @@
  */
 package jalview.jbgui;
 
+
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -35,7 +36,6 @@ import jalview.bin.Cache;
 import jalview.io.FileFormatException;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
-
 /**
  * DOCUMENT ME!
  * 
@@ -46,7 +46,7 @@ import jalview.util.Platform;
 public class GDesktop extends JFrame
 {
 
-  protected static JMenu windowMenu = new JMenu();
+  protected JMenu windowMenu = new JMenu();
 
   JMenuBar desktopMenubar = new JMenuBar();
 
@@ -117,10 +117,10 @@ public class GDesktop extends JFrame
       e.printStackTrace();
     }
 
-    if (Platform.allowMnemonics())
+    if (Platform.allowMnemonics()) 
     {
-      // BH was !Platform.isAMacAndNotJS()) i.e. "JS or not Mac"
-      // but here we want just not a Mac, period, right?
+       //BH was !Platform.isAMacAndNotJS()) i.e. "JS or not Mac"
+       // but here we want just not a Mac, period, right?
       FileMenu.setMnemonic('F');
       inputLocalFileMenuItem.setMnemonic('L');
       inputURLMenuItem.setMnemonic('U');
@@ -148,6 +148,7 @@ public class GDesktop extends JFrame
      */
     try
     {
+      // TODO: if (!Platform.isJS()
       apqHandlersSet = APQHandlers.setAPQHandlers(this);
     } catch (Exception e)
     {
@@ -160,18 +161,15 @@ public class GDesktop extends JFrame
       jalview.bin.Console.trace(Cache.getStackTraceString(t));
     }
 
-    setName("jalview-desktop");
+    setName(Platform.getAppID("desktop"));
     FileMenu.setText(MessageManager.getString("action.file"));
     HelpMenu.setText(MessageManager.getString("action.help"));
     inputLocalFileMenuItem
             .setText(MessageManager.getString("label.load_tree_from_file"));
-    inputLocalFileMenuItem
-            .setAccelerator(
-                    javax.swing.KeyStroke
-                            .getKeyStroke(java.awt.event.KeyEvent.VK_O,
-                                    jalview.util.ShortcutKeyMaskExWrapper
-                                            .getMenuShortcutKeyMaskEx(),
-                                    false));
+    inputLocalFileMenuItem.setAccelerator(
+            javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O,
+                    Platform.SHORTCUT_KEY_MASK,
+                    false));
     inputLocalFileMenuItem
             .addActionListener(new java.awt.event.ActionListener()
             {
@@ -390,6 +388,10 @@ public class GDesktop extends JFrame
       }
     });
 
+    Float specversion = Platform.isJS() ? Float.valueOf(8)
+            : Float.parseFloat(
+                    System.getProperty("java.specification.version"));
+    
     desktopMenubar.add(FileMenu);
     desktopMenubar.add(toolsMenu);
     desktopMenubar.add(HelpMenu);
@@ -397,7 +399,7 @@ public class GDesktop extends JFrame
     FileMenu.add(inputMenu);
     FileMenu.add(inputSequence);
     FileMenu.addSeparator();
-    // FileMenu.add(saveState);
+    //FileMenu.add(saveState);
     FileMenu.add(saveAsState);
     FileMenu.add(loadState);
     FileMenu.addSeparator();
@@ -519,7 +521,7 @@ public class GDesktop extends JFrame
    */
   protected void quit()
   {
-    // System.out.println("********** GDesktop.quit()");
+    //System.out.println("********** GDesktop.quit()");
   }
 
   /**