*/
public class Platform
{
+ private static Boolean isAMac = null;
+
+ private static Boolean isHeadless = null;
+
/**
* sorry folks - Macs really are different
*
*/
public static boolean isAMac()
{
- return java.lang.System.getProperty("os.name").indexOf("Mac") > -1;
+ if (isAMac == null)
+ {
+ isAMac = System.getProperty("os.name").indexOf("Mac") > -1;
+ }
+ return isAMac.booleanValue();
}
public static boolean isHeadless()
{
- String hdls = java.lang.System.getProperty("java.awt.headless");
-
- return hdls != null && hdls.equals("true");
+ if (isHeadless == null)
+ {
+ isHeadless = "true".equals(System.getProperty("java.awt.headless"));
+ }
+ return isHeadless;
}
/**
}
/**
- * Answers true if the mouse event has Meta-down (on Mac) or Ctrl-down (on
- * other o/s)
+ * Answers true if the mouse event has Meta-down (Command key on Mac) or
+ * Ctrl-down (on other o/s). Note this answers _false_ if the Ctrl key is
+ * pressed instead of the Meta/Cmd key on Mac. To test for Ctrl-click on Mac,
+ * you can use e.isPopupTrigger().
*
* @param e
* @return
*/
public static boolean isControlDown(MouseEvent e)
{
- if (isAMac())
+ boolean aMac = isAMac();
+ return isControlDown(e, aMac);
+ }
+
+ /**
+ * Overloaded version of method (to allow unit testing)
+ *
+ * @param e
+ * @param aMac
+ * @return
+ */
+ protected static boolean isControlDown(MouseEvent e, boolean aMac)
+ {
+ if (aMac)
{
+ /*
+ * answer false for right mouse button
+ */
+ if (e.isPopupTrigger())
+ {
+ return false;
+ }
return (Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() & e
.getModifiers()) != 0;
// could we use e.isMetaDown() here?