X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FPlatform.java;h=2c7460956736d88743d5e23409de5072f933ffa2;hb=8669979d57e2019889afaefafe65b945ae7c172d;hp=49dc7ff1f082fddbb51a1dc28f6fc840e3eda21c;hpb=a703cb429a2f2b417b9850ce3a8fd6f271d182d3;p=jalview.git diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java index 49dc7ff..2c74609 100644 --- a/src/jalview/util/Platform.java +++ b/src/jalview/util/Platform.java @@ -30,7 +30,7 @@ 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; @@ -45,10 +45,29 @@ public class Platform { isAMac = 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 = 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 +140,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();