X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FPlatform.java;h=f9eb2a6bd853fc6087f933c1dab7bac58b416025;hb=6d9ff99acf35278e6dc1c85bbc65f8e419cd91b6;hp=e4ee1979570a0b8ed05dd383694057c247cc694f;hpb=d9f0a24d9662a0b530fd79b51108dd074d03d6e0;p=jalview.git diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java index e4ee197..f9eb2a6 100644 --- a/src/jalview/util/Platform.java +++ b/src/jalview/util/Platform.java @@ -20,13 +20,26 @@ */ package jalview.util; +import jalview.javascript.json.JSON; + import java.awt.Toolkit; import java.awt.event.MouseEvent; +import java.io.BufferedReader; import java.io.File; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.net.URL; import java.util.Properties; import javax.swing.SwingUtilities; +import org.json.simple.parser.JSONParser; +import org.json.simple.parser.ParseException; + /** * System platform information used by Applet and Application * @@ -292,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; } @@ -306,6 +319,16 @@ public class Platform */ } + public static void cacheFileData(File file) + { + byte[] data; + if (!isJS() || (data = Platform.getFileBytes(file)) == null) + { + return; + } + cacheFileData(file.toString(), data); + } + public static byte[] getFileBytes(File f) { return /** @j2sNative f && f._bytes || */ @@ -314,15 +337,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) @@ -349,14 +385,26 @@ public class Platform */ } + /** + * Encode the URI using JavaScript encodeURIComponent + * + * @param value + * @return encoded value + */ public static String encodeURI(String value) { /** - * @j2sNative return encodeURIComponent(value); + * @j2sNative value = encodeURIComponent(value); */ return value; } + /** + * Open the URL using a simple window call if this is JavaScript + * + * @param url + * @return true if window has been opened + */ public static boolean openURL(String url) { if (!isJS()) @@ -394,6 +442,10 @@ public class Platform */ public static void readInfoProperties(String prefix, Properties p) { + if (!isJS()) + { + return; + } @SuppressWarnings("unused") ThreadGroup g = Thread.currentThread().getThreadGroup(); String id = getUniqueAppletID(); @@ -403,6 +455,8 @@ public class Platform * if (key.indexOf(prefix) == 0) { value = "" + info[key]; */ + System.out.println( + "Platform id=" + id + " reading Info." + key + " = " + value); p.put(id + "_" + key, value); /** @@ -413,4 +467,148 @@ public class Platform */ } + public static void setAjaxJSON(URL url) + { + if (isJS()) + { + JSON.setAjax(url); + } + } + + public static Object parseJSON(InputStream response) + throws IOException, ParseException + { + if (isJS()) + { + return JSON.parse(response); + } + + BufferedReader br = null; + try + { + br = new BufferedReader(new InputStreamReader(response, "UTF-8")); + return new JSONParser().parse(br); + } finally + { + if (br != null) + { + try + { + br.close(); + } catch (IOException e) + { + // ignore + } + } + } + } + + public static Object parseJSON(String json) throws ParseException + { + return (isJS() ? JSON.parse(json) + : new JSONParser().parse(json)); + } + + public static Object parseJSON(Reader r) + throws IOException, ParseException + { + if (r == null) + { + return null; + } + + if (!isJS()) + { + return new JSONParser().parse(r); + } + // Using a file reader is not currently supported in SwingJS JavaScript + + if (r instanceof FileReader) + { + throw new IOException( + "StringJS does not support FileReader parsing for JSON -- but it could..."); + } + return JSON.parse(r); + + } + + /** + * Dump the input stream to an output file. + * + * @param is + * @param outFile + * @throws IOException + * if the file cannot be created or there is a problem reading the + * input stream. + */ + public static void streamToFile(InputStream is, File outFile) + throws IOException + { + 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) + { + fio.write(bb, 0, l); + } + } finally + { + fio.close(); + } + } + + /** + * Add a known domain that implements access-control-allow-origin:* + * + * These should be reviewed periodically. + * + * @param domain + * for a service that is not allowing ajax + * + * @author hansonr@stolaf.edu + * + */ + public static void addJ2SDirectDatabaseCall(String domain) + { + + if (isJS()) + { + System.out.println( + "Platform adding known access-control-allow-origin * for domain " + + domain); + /** + * @j2sNative + * + * J2S.addDirectDatabaseCall(domain); + */ + } + + } + + public static void getURLCommandArguments() + { + + /** + * Retrieve the first query field as command arguments to Jalview. Include + * only if prior to "?j2s" or "&j2s" or "#". Assign the applet's __Info.args + * element to this value. + * + * @j2sNative var a = + * decodeURI((document.location.href.replace("&","?").split("?j2s")[0] + * + "?").split("?")[1].split("#")[0]); a && + * (J2S.thisApplet.__Info.args = a.split(" ")); + */ + + } + }