X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Futil%2FPlatform.java;h=fb786dcb6cd477d0d288963b6d66cf3394fea319;hb=fc99200c2a40bb002f737065b52566b3b49a3be7;hp=e94a4165874d20311c73324647ae8b9c3610cd58;hpb=cc0747f924db4f69b08d4ea369da857d6e6d8b00;p=jalview.git 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)