JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...

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

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index e7be77d..fba669b 100644 (file)
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -276,6 +276,8 @@ public class Platform
    * 
    * Platform.timeCheck("some message", Platform.TIME_MARK);
    * 
+   * reset...[set/mark]n...get
+   * 
    * @param msg
    * @param mode
    */
@@ -286,6 +288,7 @@ public class Platform
     {
     case TIME_RESET:
       time = mark = t;
+      duration = 0;
       if (msg != null)
       {
         System.err.println("Platform: timer reset\t\t\t" + msg);
@@ -294,6 +297,7 @@ public class Platform
     case TIME_MARK:
       if (set > 0)
       {
+        // total time between set/mark points
         duration += (t - set);
       }
       else
@@ -316,7 +320,7 @@ public class Platform
     case TIME_GET:
       if (msg != null)
       {
-        System.err.println("Platform: timer dur\t" + ((t - time) / 1000f)
+        System.err.println("Platform: timer get\t" + ((t - time) / 1000f)
                 + "\t" + ((duration) / 1000f) + "\t" + msg);
       }
       set = 0;
@@ -807,5 +811,62 @@ public class Platform
     }
   }
 
+  /**
+   * Set the "app" property of the HTML5 applet object, for example,
+   * "testApplet.app", to point to the Jalview instance. This will be the object
+   * that page developers use that is similar to the original Java applet object
+   * that was accessed via LiveConnect.
+   * 
+   * @param j
+   */
+  public static void setAppClass(Object j)
+  {
+    if (!isJS())
+    {
+      return;
+    }
+    @SuppressWarnings("unused")
+    Thread t = Thread.currentThread();
+    /**
+     * Set up "testApplet.app" to be this instance
+     * 
+     * @j2sNative
+     * 
+     *            try {self[t.name].app = j}catch(e){}
+     */
+  }
+
+  public final static String EMBEDDED_DIM = "dim";
+
+  /**
+   *
+   * If this frame Is this frame embedded in a web page, return a known type.
+   * 
+   * @param frame
+   *          a JFrame or JInternalFrame
+   * @param type
+   * @return null if frame is not embedded.
+   */
+  public static Object getEmbeddedAttribute(Object frame, String type)
+  {
+    if (!isJS())
+    {
+      return null;
+    }
+    return (/** swingjs@j2sNative || frame.ui.getEmbedded(type) */
+    null);
+  }
+
+  public static void stackTrace()
+  {
+    try
+    {
+      throw new NullPointerException();
+    } catch (Exception e)
+    {
+      e.printStackTrace();
+    }
+
+  }
 
 }