X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FPlatform.java;h=b779c20220468fd6ea2fdd285288a180aa72832c;hb=14bfc6fb57f123b815f08dbf5b35544abd33b3af;hp=121ac1b55045e381e9702839f39ad56c4bf4c099;hpb=d8e8c742b864e58406d13e21d124699a26b6492f;p=jalview.git diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java index 121ac1b..b779c20 100644 --- a/src/jalview/util/Platform.java +++ b/src/jalview/util/Platform.java @@ -22,7 +22,7 @@ package jalview.util; import jalview.javascript.json.JSON; -import java.awt.Color; +import java.awt.Component; import java.awt.Dimension; import java.awt.Toolkit; import java.awt.event.MouseEvent; @@ -34,14 +34,15 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; -import java.net.MalformedURLException; import java.net.URL; +import java.util.HashMap; +import java.util.HashSet; import java.util.Properties; +import java.util.Set; import java.util.logging.ConsoleHandler; import java.util.logging.Level; import java.util.logging.Logger; -import javax.swing.JComponent; import javax.swing.SwingUtilities; import org.json.simple.parser.JSONParser; @@ -49,6 +50,8 @@ import org.json.simple.parser.ParseException; import com.stevesoft.pat.Regex; +import swingjs.api.JSUtilI; + /** * System platform information used by Applet and Application * @@ -60,6 +63,13 @@ public class Platform private static boolean isJS = /** @j2sNative true || */ false; + private static JSUtilI jsutil = /** + * @j2sNative new Clazz.new_("swingjs.JSUtil") + * || + */ + null; + + private static Boolean isNoJSMac = null, isNoJSWin = null, isMac = null, isWin = null; @@ -330,61 +340,95 @@ public class Platform } } - public static void cacheFileData(String path, Object data) + /** + * Encode the URI using JavaScript encodeURIComponent + * + * @param value + * @return encoded value + */ + public static String encodeURI(String 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) throws IOException { - if (!isJS() || data == null) + if (!isJS()) { - return; + BrowserLauncher.openURL(url); + return false; } /** * @j2sNative * - * swingjs.JSUtil.cacheFileData$S$O(path, data); * + * window.open(url); */ + return true; + } + + public static void stackTrace() + { + new NullPointerException("testing only").printStackTrace(); + } + + public static void cacheFileData(String path, Object data) + { + if (isJS()) + { + jsutil.cachePathData(path, data); + } } public static void cacheFileData(File file) { - byte[] data; - if (!isJS() || (data = Platform.getFileBytes(file)) == null) + if (isJS()) { - return; + byte[] bytes = getFileBytes(file); + if (bytes != null) + { + cacheFileData(file.toString(), bytes); + } } - cacheFileData(file.toString(), data); } public static byte[] getFileBytes(File f) { - // TODO temporary doubling of 秘bytes and _bytes; - // just remove _bytes when new transpiler has been installed - return /** @j2sNative f && (f.秘bytes || f._bytes) || */ - null; + return (isJS() && f != null ? jsutil.getBytes(f) : null); } public static byte[] getFileAsBytes(String fileStr) { - byte[] bytes = null; - // BH 2018 hack for no support for access-origin - /** - * @j2sNative bytes = swingjs.JSUtil.getFileAsBytes$O(fileStr) - */ - cacheFileData(fileStr, bytes); + byte[] bytes = (isJS() && fileStr != null + ? (byte[]) jsutil.getFile(fileStr, false) + : null); + if (bytes != null) + { + cacheFileData(fileStr, bytes); + } return bytes; } - @SuppressWarnings("unused") public static String getFileAsString(String url) { String ret = null; - /** - * @j2sNative - * - * ret = swingjs.JSUtil.getFileAsString$S(url); - * - * - */ - cacheFileData(url, ret); + if (isJS()) + { + ret = (String) jsutil.getFile(url, true); + if (ret != null) + { + cacheFileData(url, ret); + } + } return ret; } @@ -394,72 +438,24 @@ public class Platform { return false; } - @SuppressWarnings("unused") byte[] bytes = getFileAsBytes(urlstring); - // TODO temporary doubling of 秘bytes and _bytes; - // just remove _bytes when new transpiler has been installed - /** - * @j2sNative f.秘bytes = f._bytes = bytes; - */ - return true; + boolean ok = false; + try + { + jsutil.setFileBytes(f, bytes); + } catch (Throwable t) + { + System.out.println("Platform.setFileBytes failed: " + t); + } + return ok; } public static void addJ2SBinaryType(String ext) { - /** - * @j2sNative - * - * J2S._binaryTypes.push("." + ext + "?"); - * - */ - } - - /** - * Encode the URI using JavaScript encodeURIComponent - * - * @param value - * @return encoded value - */ - public static String encodeURI(String 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) throws IOException - { - if (!isJS()) + if (isJS()) { - BrowserLauncher.openURL(url); - return false; + jsutil.addBinaryFileType(ext); } - /** - * @j2sNative - * - * - * window.open(url); - */ - return true; - } - - public static String getUniqueAppletID() - { - @SuppressWarnings("unused") - ThreadGroup g = Thread.currentThread().getThreadGroup(); - /** - * @j2sNative return g.秘html5Applet._uniqueId; - * - */ - return null; - } /** @@ -472,29 +468,10 @@ public class Platform */ public static void readInfoProperties(String prefix, Properties p) { - if (!isJS()) + if (isJS()) { - return; + jsutil.readInfoProperties(prefix, 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]; - */ - - System.out.println( - "Platform id=" + id + " reading Info." + key + " = " + value); - p.put(key, value); - - /** - * @j2sNative - * - * - * } } - */ } public static void setAjaxJSON(URL url) @@ -535,8 +512,7 @@ public class Platform public static Object parseJSON(String json) throws ParseException { - return (isJS() ? JSON.parse(json) - : new JSONParser().parse(json)); + return (isJS() ? JSON.parse(json) : new JSONParser().parse(json)); } public static Object parseJSON(Reader r) @@ -574,17 +550,13 @@ public class Platform public static void streamToFile(InputStream is, File outFile) throws IOException { + if (isJS() && jsutil.streamToFile(is, outFile)) + { + 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) @@ -613,97 +585,63 @@ public class Platform if (isJS()) { - System.out.println( - "Platform adding known access-control-allow-origin * for domain " - + domain); - /** - * @j2sNative - * - * J2S.addDirectDatabaseCall(domain); - */ + jsutil.addDirectDatabaseCall(domain); } - } + /** + * 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. + */ + + @SuppressWarnings("unused") public static void getURLCommandArguments() { - + if (!isJS()) + { + return; + } + String[] args = null; /** - * 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 = + * @j2sNative args = * decodeURI((document.location.href.replace("&","?").split("?j2s")[0] - * + "?").split("?")[1].split("#")[0]); a && - * (J2S.thisApplet.__Info.args = a.split(" ")); + * + "?").split("?")[1].split("#")[0]); args && (args = + * args.split(" ")); */ + if (args != null) + { + jsutil.setAppletInfo("args", args); + } } public static URL getDocumentBase() { - try - { - if (isJS()) - { - @SuppressWarnings("unused") - Object g = Thread.currentThread().getThreadGroup(); - return new URL(/** - * @j2sNative g.秘html5Applet._appletPanel.appletDocumentBase - * || - */ - ""); - } - } catch (MalformedURLException e) - { - } - return null; + return (isJS() ? jsutil.getDocumentBase() : null); } public static URL getCodeBase() { - try - { - if (isJS()) - { - @SuppressWarnings("unused") - Object g = Thread.currentThread().getThreadGroup(); - return new URL(/** - * @j2sNative g.秘html5Applet._appletPanel.appletCodeBase - * || - */ - ""); - } - } catch (MalformedURLException e) - { - } - return null; + return (isJS() ? jsutil.getCodeBase() : null); } - /** - * load a resource -- probably a core file -- if and only if a particular - * class has not been instantialized. We use a String here because if we used - * a .class object, that reference itself would simply load the class, and we - * want the core package to include that as well. - * - * @param resourcePath - * @param className - */ - public static void loadStaticResource(Object resourcePath, - String className) + public static void ensureJmol() { - /** - * - * @j2sNative if (!swingjs.JSUtil.isClassLoaded$S(className)) - * swingjs.JSUtil.loadStaticResource$S(resourcePath); - */ + if (isJS()) + { + jsutil.loadResourceIfClassUnknown("core/core_jvjmol.z.js", + "org.jmol.viewer.Viewer"); + } } public static void ensureRegex() { - loadStaticResource("core/core_stevesoft.z.js", + if (isJS()) + { + jsutil.loadResourceIfClassUnknown("core/core_stevesoft.z.js", "com.stevesoft.pat.Regex"); + } } public static Regex newRegex(String searchString, String replaceString) @@ -768,23 +706,14 @@ public class Platform * that page developers use that is similar to the original Java applet object * that was accessed via LiveConnect. * - * @param j + * @param app */ - public static void setAppClass(Object j) + public static void setAppClass(Object app) { - if (!isJS()) + if (isJS()) { - return; + jsutil.setAppletAttribute("app", app); } - @SuppressWarnings("unused") - Thread t = Thread.currentThread(); - /** - * Set up "testApplet.app" to be this instance - * - * @j2sNative - * - * try {self[t.name].app = j}catch(e){} - */ } /** @@ -798,11 +727,10 @@ public class Platform * @param defaultHeight * @return the embedded dimensions or null (no default size or not embedded) */ - public static Dimension getDimIfEmbedded(JComponent frame, + public static Dimension getDimIfEmbedded(Component frame, int defaultWidth, int defaultHeight) { - Dimension d = /** @j2sNative frame.ui.getEmbedded$S("dim") || */ - null; + Dimension d = (Dimension) getEmbeddedAttribute(frame, "dim"); return (d == null && defaultWidth >= 0 ? new Dimension(defaultWidth, defaultHeight) : d); @@ -817,26 +745,53 @@ public class Platform * @param type * @return null if frame is not embedded. */ - public static Object getEmbeddedAttribute(Object frame, String type) + public static Object getEmbeddedAttribute(Component frame, String type) { - if (!isJS()) - { - return null; - } - return (/** @j2sNative frame.ui.getEmbedded$S(type) || */ - null); + return (isJS() ? jsutil.getEmbeddedAttribute(frame, type) : null); } - public static void stackTrace() + /** + * Only called for JavaScript. + * + * @return Map for static singleton classes unique to a given applet + */ + public static HashMap getJSSingletons() { - try - { - throw new NullPointerException(); - } catch (Exception e) - { - e.printStackTrace(); - } + return (isJS() ? jsutil.getJSContext("jssingletons") : null); + } + /** + * By designating initialCapacity and loadFactor, we tell SwingJS to use a + * standard (slower) Java HashMap to back this HashSet, thus providing exactly + * the same iterator order (until a new Java version changes it!) + * + * @return a standard Java HashSet + */ + public static Set getJavaOrderedHashSet() + { + return new HashSet<>(16, 0.75f); } + /** + * Switch the flag in SwingJS to use or not use the JavaScript Map object in + * any Hashtable, HashMap, or HashSet. Default is enabled. + * + * For testing purposes only. + * + */ + public static boolean setJavaScriptMapObjectEnabled(boolean enabled) + { + if (!isJS()) + { + return false; + } + jsutil.setJavaScriptMapObjectEnabled(enabled); + HashSet hs = new HashSet<>(); + // Java hash table iterator in HashMap will return "one" before "two" + // because of its hash code; + // JavaScript Map object will return "two" first because it was added first. + hs.add("two"); + hs.add("one"); + return (hs.iterator().next() == (enabled ? "two" : "one")); + } }