comments only

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

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index 49dc7ff..2953c97 100644 (file)
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -30,25 +30,80 @@ 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();
+  }
+
+// 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
+   */
   public static boolean isHeadless()
   {
     if (isHeadless == null)
@@ -121,8 +176,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();