Merge remote-tracking branch 'origin/merge/Jalview-JS/develop_feature/JAL-3690_callba...

[jalview.git] / src / jalview / util / ShortcutKeyMaskExWrapper.java

diff --git a/src/jalview/util/ShortcutKeyMaskExWrapper.java b/src/jalview/util/ShortcutKeyMaskExWrapper.java
index 83330b9..4c33cf8 100644 (file)
--- a/src/jalview/util/ShortcutKeyMaskExWrapper.java
+++ b/src/jalview/util/ShortcutKeyMaskExWrapper.java
@@ -20,50 +20,41 @@
  */
 package jalview.util;
 
-import java.awt.event.MouseEvent;
-
 public class ShortcutKeyMaskExWrapper
 {
-
-  private static final Float specversion;
-
-  private static final float modern;
-
-  public static final int SHIFT_DOWN_MASK;
-
-  public static final int ALT_DOWN_MASK;
-
-  private static final ShortcutKeyMaskExWrapperI wrapper;
-
-  static
-  {
-    specversion = Platform.isJS() ? Float.valueOf(8)
-            : Float.parseFloat(
-                    System.getProperty("java.specification.version"));
-    modern = 11;
-
-    if (specversion >= modern)
-    {
-      wrapper = new jalview.util.ShortcutKeyMaskExWrapper11();
-      SHIFT_DOWN_MASK = jalview.util.ShortcutKeyMaskExWrapper11.SHIFT_DOWN_MASK;
-      ALT_DOWN_MASK = jalview.util.ShortcutKeyMaskExWrapper11.ALT_DOWN_MASK;
-    }
-    else
-    {
-      wrapper = new jalview.util.ShortcutKeyMaskExWrapper8();
-      SHIFT_DOWN_MASK = jalview.util.ShortcutKeyMaskExWrapper8.SHIFT_DOWN_MASK;
-      ALT_DOWN_MASK = jalview.util.ShortcutKeyMaskExWrapper8.ALT_DOWN_MASK;
-    }
-  }
-
-  public static int getMenuShortcutKeyMaskEx()
-  {
-    return wrapper.getMenuShortcutKeyMaskEx();
-  }
-
-  public static int getModifiersEx(MouseEvent e)
-  {
-    return wrapper.getModifiersEx(e);
-  }
+//
+//  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;
+//  }
 
 }