X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FShortcutKeyMaskExWrapper.java;h=4c33cf8a0afc9763ba59a360d98203ad91897634;hb=772f645f8a2cb3c5d25eab36d875f2e09ceca48f;hp=7292c80f5c86dbc33cf4a03348eecbd98bdda2f5;hpb=a4da7f0f52e97ebb3fb0c42d6ab3a71762c4b899;p=jalview.git

diff --git a/src/jalview/util/ShortcutKeyMaskExWrapper.java b/src/jalview/util/ShortcutKeyMaskExWrapper.java
index 7292c80..4c33cf8 100644
--- a/src/jalview/util/ShortcutKeyMaskExWrapper.java
+++ b/src/jalview/util/ShortcutKeyMaskExWrapper.java
@@ -1,57 +1,60 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.util;
 
-import java.awt.Toolkit;
-import java.awt.event.KeyEvent;
-
 public class ShortcutKeyMaskExWrapper
 {
-
-  private static boolean init = false;
-
-  private static final Float specversion = Float
-          .parseFloat(System.getProperty("java.specification.version"));
-
-  private static final float modern = 11;
-
-  public static int SHIFT_DOWN_MASK = KeyEvent.SHIFT_DOWN_MASK;
-
-  public static int ALT_DOWN_MASK = KeyEvent.ALT_DOWN_MASK;
-
-  public ShortcutKeyMaskExWrapper()
-  {
-  }
-
-  private static void init()
-  {
-    if (init)
-    {
-      return;
-    }
-    if (specversion < modern)
-    {
-      SHIFT_DOWN_MASK = KeyEvent.SHIFT_MASK;
-      ALT_DOWN_MASK = KeyEvent.ALT_MASK;
-    }
-    else
-    {
-      SHIFT_DOWN_MASK = KeyEvent.SHIFT_DOWN_MASK;
-      ALT_DOWN_MASK = KeyEvent.ALT_DOWN_MASK;
-    }
-
-    init = true;
-  }
-
-  public static int getMenuShortcutKeyMaskEx()
-  {
-    init();
-    if (specversion < modern)
-    {
-      return Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
-    }
-    else
-    {
-      return Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx();
-    }
-  }
+//
+//  public static int SHIFT_DOWN_MASK = KeyEvent.SHIFT_DOWN_MASK;
+//
+//  public static int ALT_DOWN_MASK = KeyEvent.ALT_DOWN_MASK;
+//
+//  public static int SHORTCUT_KEY_MASK = (Platform.isMac() ? KeyEvent.META_DOWN_MASK : KeyEvent.CTRL_DOWN_MASK);
+// 
+//  static
+//  {
+//    if (!GraphicsEnvironment.isHeadless())
+//    {
+//      try
+//      {
+//
+//        Class<? extends Toolkit> tk = Toolkit.getDefaultToolkit().getClass();
+//        Method method = tk.getMethod("getMenuShortcutKeyMaskEx");
+//        if (method == null)
+//          method = tk.getMethod("getMenuShortcutKeyMask");
+//        SHORTCUT_KEY_MASK = ((int) method.invoke(tk, new Object[0]));
+//        if (SHORTCUT_KEY_MASK <= 0xF)
+//        {
+//          // shift this into the extended region (was Java 8)
+//          SHORTCUT_KEY_MASK = SHORTCUT_KEY_MASK << 6;
+//        }
+//      } catch (Exception e)
+//      {
+//      }
+//    }
+//  }
+//
+//  public static int getMenuShortcutKeyMaskEx()
+//  {
+//    return SHORTCUT_KEY_MASK;
+//  }
 
 }