upgraded Platform.java

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index 0b9185c..fc33b87 100644 (file)
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -22,6 +22,8 @@ package jalview.util;
 
 import java.awt.Toolkit;
 import java.awt.event.MouseEvent;
+import java.io.File;
+import java.util.Properties;
 
 import javax.swing.SwingUtilities;
 
@@ -212,17 +214,17 @@ 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;
+                 if (time == 0)
+                         time = mark = t;
                          if (msg != null)
-                                 System.err.println("Platform: timer mark\t" + ((t - time)/1000f) + "\t" + ((t - mark)/1000f) + "\t" + msg);
-                         mark = t;
+                 System.err.println("Platform: timer mark\t" + ((t - time)/1000f) + "\t" + ((t - mark)/1000f) + "\t" + msg);
+                 mark = t;
                  }
                  break;
          case TIME_SET:
@@ -236,5 +238,120 @@ public class Platform
          }
   }
 
+  public static void cacheFileData(String path, byte[] data)  
+  {
+       if (!isJS())
+               return;
+         /**
+          * @j2sNative 
+          *   
+          *   swingjs.JSUtil.cacheFileData$S$O(path, data);
+          * 
+          */
+  }
+
+  public static byte[] getFileBytes(File f) 
+  {
+       return /** @j2sNative   f && f._bytes || */null;
+  }
+
+  public static byte[] getFileAsBytes(String fileStr) 
+  {
+    // BH 2018 hack for no support for access-origin
+       return /** @j2sNative swingjs.JSUtil.getFileAsBytes$O(fileStr) || */ null;
+  }
+
+  public static String getFileAsString(String data) 
+  {
+       return /** @j2sNative swingjs.JSUtil.getFileAsString$S(data) || */ null;
+  }
+
+  public static boolean setFileBytes(File f, String urlstring) 
+  {
+       if (!isJS()) 
+               return false;
+       @SuppressWarnings("unused")
+       byte[] bytes = getFileAsBytes(urlstring);
+                   /** @j2sNative 
+                    * f._bytes = bytes; 
+                    */
+       return true;
+  }
+
    
+  public static void addJ2SBinaryType(String ext)
+  {
+  /**
+   * @j2sNative
+   * 
+   *            J2S._binaryTypes.push("." + ext + "?");
+   * 
+   */
+  }
+
+  public static String encodeURI(String value) 
+  {
+    /**
+     * @j2sNative
+     * return encodeURIComponent(value);
+     */
+       return value;
+  }
+
+  public static boolean openURL(String url) 
+  {
+       if (!isJS()) 
+               return false;
+               /**
+                * @j2sNative
+                * 
+                * 
+                *                      window.open(url);
+                */
+       return true;
+  }
+
+       public static String getUniqueAppletID() {
+               @SuppressWarnings("unused")
+               ThreadGroup g = Thread.currentThread().getThreadGroup();
+               /**
+                * @j2sNative return g.html5Applet._uniqueId;
+                *
+                */
+               return null;
+
+       }
+  /**
+   * Read the Info block for this applet. 
+   * 
+   * @param prefix "jalview_"
+   * @param p
+   * @return   unique id for this applet
+   */
+  public static void readInfoProperties(String prefix, Properties p) 
+  {
+         @SuppressWarnings("unused")
+       ThreadGroup g = Thread.currentThread().getThreadGroup(); 
+         String id = getUniqueAppletID();
+         String key = "", value = "";
+         /**
+          * @j2sNative
+              var info = g.html5Applet.__Info || {};
+              for (var key in info) {
+                 if (key.indexOf(prefix) == 0) {
+                    value = "" + info[key];
+       */
+        
+         p.put(id + "_" + key, value);
+         
+         /**
+          * @j2sNative
+
+              
+                 }
+              }
+          */
+  }
+
+
 }