Platform comment about isPopupTrigger

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index fc33b87..0bc49fa 100644 (file)
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -167,6 +167,34 @@ public class Platform
       // could we use e.isMetaDown() here?
   }
 
+  // BH: I don't know about that previous method. Here is what SwingJS uses.
+  // Notice the distinction in mouse events. (BUTTON3_MASK == META)
+  //
+  // private static boolean isPopupTrigger(int id, int mods, boolean isWin) {
+  // boolean rt = ((mods & InputEvent.BUTTON3_MASK) != 0);
+  // if (isWin) {
+  // if (id != MouseEvent.MOUSE_RELEASED)
+  // return false;
+  ////
+  //// // Oddly, Windows returns InputEvent.META_DOWN_MASK on release, though
+  //// // BUTTON3_DOWN_MASK for pressed. So here we just accept both.
+  ////
+  //// actually, we can use XXX_MASK, not XXX_DOWN_MASK and avoid this issue,
+  // because
+  //// J2S adds the appropriate extended (0x3FC0) and simple (0x3F) modifiers.
+  ////
+  // return rt;
+  // } else {
+  // // mac, linux, unix
+  // if (id != MouseEvent.MOUSE_PRESSED)
+  // return false;
+  // boolean lt = ((mods & InputEvent.BUTTON1_MASK) != 0);
+  // boolean ctrl = ((mods & InputEvent.CTRL_MASK) != 0);
+  // return rt || (ctrl && lt);
+  // }
+  // }
+  //
+
   /**
    * Windows (not Mac, Linux, or Unix) and right button
    * to test for the right-mouse pressed event in Windows
@@ -214,16 +242,22 @@ public class Platform
          case TIME_RESET:
                  time = mark = t;
                  if (msg != null)
-                 System.err.println("Platform: timer reset\t\t\t" + msg);
+      {
+        System.err.println("Platform: timer reset\t\t\t" + msg);
+      }
                  break;
          case TIME_MARK:
                  if (set > 0) {
                          duration += (t - set);
                  } else {
                  if (time == 0)
-                         time = mark = t;
+      {
+        time = mark = t;
+      }
                          if (msg != null)
-                 System.err.println("Platform: timer mark\t" + ((t - time)/1000f) + "\t" + ((t - mark)/1000f) + "\t" + msg);
+        {
+          System.err.println("Platform: timer mark\t" + ((t - time)/1000f) + "\t" + ((t - mark)/1000f) + "\t" + msg);
+        }
                  mark = t;
                  }
                  break;
@@ -232,7 +266,9 @@ public class Platform
                  break;
          case TIME_GET:
                  if (msg != null)
-                         System.err.println("Platform: timer dur\t" + ((t - time)/1000f) + "\t" + ((duration)/1000f) + "\t" + msg);
+      {
+        System.err.println("Platform: timer dur\t" + ((t - time)/1000f) + "\t" + ((duration)/1000f) + "\t" + msg);
+      }
                  set = 0;
                  break;
          }
@@ -241,7 +277,8 @@ public class Platform
   public static void cacheFileData(String path, byte[] data)  
   {
        if (!isJS())
-               return;
+  {
+    return;
          /**
           * @j2sNative 
           *   
@@ -249,6 +286,7 @@ public class Platform
           * 
           */
   }
+  }
 
   public static byte[] getFileBytes(File f) 
   {
@@ -268,8 +306,10 @@ public class Platform
 
   public static boolean setFileBytes(File f, String urlstring) 
   {
-       if (!isJS()) 
-               return false;
+       if (!isJS())
+  {
+    return false;
+  }
        @SuppressWarnings("unused")
        byte[] bytes = getFileAsBytes(urlstring);
                    /** @j2sNative 
@@ -300,8 +340,10 @@ public class Platform
 
   public static boolean openURL(String url) 
   {
-       if (!isJS()) 
-               return false;
+       if (!isJS())
+  {
+    return false;
+  }
                /**
                 * @j2sNative
                 *