X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FPlatform.java;h=bb3f7fa61082fa1fe1b1ef6c940c12cdfe13a327;hb=f5d6c0018555b2c453c2c0354c84cd5d2d81e3b9;hp=2c7460956736d88743d5e23409de5072f933ffa2;hpb=725f1f4a7e1448349bf7dd5f8efb1370de5b9a3e;p=jalview.git

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index 2c74609..bb3f7fa 100644
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -21,8 +21,11 @@
 package jalview.util;
 
 import java.awt.Toolkit;
+import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 
+import javax.swing.SwingUtilities;
+
 /**
  * System platform information used by Applet and Application
  * 
@@ -30,23 +33,27 @@ import java.awt.event.MouseEvent;
  */
 public class Platform
 {
-  private static Boolean isAMac = null, isWindows = null;
+
+  private static Boolean isNoJSMac = null, isNoJSWindows = 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()
+  public static boolean isAMacAndNotJS()
   {
-    if (isAMac == null)
+    if (isNoJSMac == null)
     {
-      isAMac = System.getProperty("os.name").indexOf("Mac") > -1;
+      isNoJSMac = /** @j2sNative false && */
+              System.getProperty("os.name").indexOf("Mac") > -1;
     }
 
-    return isAMac.booleanValue();
+    return isNoJSMac.booleanValue();
 
   }
 
@@ -55,15 +62,47 @@ public class Platform
    * 
    * @return true if we have to cope with another platform variation
    */
-  public static boolean isWindows()
+  public static boolean isWindowsAndNotJS()
   {
-    if (isWindows == null)
+    if (isNoJSWindows == null)
     {
-      isWindows = System.getProperty("os.name").indexOf("Win") > -1;
+      isNoJSWindows = /** @j2sNative false && */
+              System.getProperty("os.name").indexOf("Win") > -1;
     }
-    return isWindows.booleanValue();
+    return isNoJSWindows.booleanValue();
   }
 
+// BH - preferred:
+//
+//  /**
+//   * @return true if this is a Mac
+//   */
+//  private static boolean isAMac()
+//  {
+//    if (isAMac == null)
+//    {
+//    	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
+//   */
+//  private 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
@@ -110,7 +149,7 @@ public class Platform
   /**
    * 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,
+   * pressed instead of the Meta/Cmd key on Mac. To test for Ctrl-pressed on Mac,
    * you can use e.isPopupTrigger().
    * 
    * @param e
@@ -118,7 +157,7 @@ public class Platform
    */
   public static boolean isControlDown(MouseEvent e)
   {
-    boolean aMac = isAMac();
+    boolean aMac = isAMacAndNotJS();
     return isControlDown(e, aMac);
   }
 
@@ -146,4 +185,14 @@ public class Platform
     }
     return e.isControlDown();
   }
+
+  public static boolean isWinRightButton(MouseEvent e) 
+  {
+	return !isAMacAndNotJS() && SwingUtilities.isRightMouseButton(e);
+  }
+
+  public static boolean isWinMiddleButton(MouseEvent evt) 
+  {
+	return !isAMacAndNotJS() && ((evt.getModifiers() & InputEvent.BUTTON2_MASK) == InputEvent.BUTTON2_MASK);
+  }
 }