From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Fri, 5 Apr 2019 18:43:12 +0000 (-0500)
Subject: File caching activated explicitly in Platform
X-Git-Tag: Release_2_11_4_0~45^2~18^2~169
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fc99200c2a40bb002f737065b52566b3b49a3be7;p=jalview.git

File caching activated explicitly in Platform
---

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index e94a416..fb786dc 100644
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -305,9 +305,9 @@ public class Platform
     }
   }
 
-  public static void cacheFileData(String path, byte[] data)
+  public static void cacheFileData(String path, Object data)
   {
-    if (!isJS())
+    if (!isJS() || data == null)
     {
       return;
     }
@@ -327,15 +327,28 @@ public class Platform
 
   public static byte[] getFileAsBytes(String fileStr)
   {
+    byte[] bytes = null;
     // BH 2018 hack for no support for access-origin
-    return /** @j2sNative swingjs.JSUtil.getFileAsBytes$O(fileStr) || */
-    null;
+    /**
+     * @j2sNative bytes = swingjs.JSUtil.getFileAsBytes$O(fileStr)
+     */
+    cacheFileData(fileStr, bytes);
+    return bytes;
   }
 
-  public static String getFileAsString(String data)
+  @SuppressWarnings("unused")
+  public static String getFileAsString(String url)
   {
-    return /** @j2sNative swingjs.JSUtil.getFileAsString$S(data) || */
-    null;
+    String ret = null;
+    /**
+     * @j2sNative
+     * 
+     *            ret = swingjs.JSUtil.getFileAsString$S(url);
+     * 
+     * 
+     */
+    cacheFileData(url, ret);
+    return ret;
   }
 
   public static boolean setFileBytes(File f, String urlstring)
@@ -521,16 +534,17 @@ public class Platform
   public static void streamToFile(InputStream is, File outFile)
           throws IOException
   {
-    if (isJS() && /**
-                   * @j2sNative outFile.setBytes$O && outFile.setBytes$O(is) &&
-                   */
-            true)
-    {
-      return;
-    }
     FileOutputStream fio = new FileOutputStream(outFile);
     try
     {
+      if (isJS()
+              && /**
+                  * @j2sNative outFile.setBytes$O && outFile.setBytes$O(is) &&
+                  */
+              true)
+      {
+        return;
+      }
       byte[] bb = new byte[32 * 1024];
       int l;
       while ((l = is.read(bb)) > 0)
diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index 4390f01..edc6a9c 100644
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/timestamp b/swingjs/timestamp
index 320cf73..486191a 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1 @@
-20190405113552 
+20190405133902 
diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip
index 4390f01..edc6a9c 100644
Binary files a/swingjs/ver/3.2.4/SwingJS-site.zip and b/swingjs/ver/3.2.4/SwingJS-site.zip differ
diff --git a/swingjs/ver/3.2.4/timestamp b/swingjs/ver/3.2.4/timestamp
index 320cf73..486191a 100644
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20190405113552 
+20190405133902