X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FPlatform.java;h=6a5f13375c4133e95e5514f4548bbb4b10f501b3;hb=d5bc056b7dff2e83166c0a25df7d52082954297a;hp=49dc7ff1f082fddbb51a1dc28f6fc840e3eda21c;hpb=a703cb429a2f2b417b9850ce3a8fd6f271d182d3;p=jalview.git diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java index 49dc7ff..6a5f133 100644 --- a/src/jalview/util/Platform.java +++ b/src/jalview/util/Platform.java @@ -30,25 +30,49 @@ import java.awt.event.MouseEvent; */ public class Platform { - private static Boolean isAMac = null; + + private static Boolean isAMac = null, isWindows = null; private static Boolean isHeadless = null; /** * sorry folks - Macs really are different * + * BH: disabled for SwingJS -- will need to check key-press issues + * * @return true if we do things in a special way. */ public static boolean isAMac() { if (isAMac == null) { - isAMac = System.getProperty("os.name").indexOf("Mac") > -1; + isAMac = /** @j2sNative false && */ + System.getProperty("os.name").indexOf("Mac") > -1; } + return isAMac.booleanValue(); } + /** + * Check if we are on a Microsoft plaform... + * + * @return true if we have to cope with another platform variation + */ + public static boolean isWindows() + { + if (isWindows == null) + { + isWindows = /** @j2sNative false && */ + System.getProperty("os.name").indexOf("Win") > -1; + } + return isWindows.booleanValue(); + } + + /** + * + * @return true if we are running in non-interactive no UI mode + */ public static boolean isHeadless() { if (isHeadless == null) @@ -121,8 +145,8 @@ public class Platform { return false; } - return (Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() & e - .getModifiers()) != 0; + return (Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() + & e.getModifiers()) != 0; // could we use e.isMetaDown() here? } return e.isControlDown();