X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FPlatform.java;h=c89f1e7cac137c9e0954dcdf49df7d5ce22bcb08;hb=f7440b5a8c1f476bdc2828815a1cb5238137e017;hp=cd244323fccb61610a498818ea073b0ee094298c;hpb=775fa10f6afa3da6dd105e9528a7039ac1d9089f;p=jalview.git diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java index cd24432..c89f1e7 100644 --- a/src/jalview/util/Platform.java +++ b/src/jalview/util/Platform.java @@ -37,6 +37,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.attribute.BasicFileAttributes; import java.util.Date; +import java.util.Locale; +import java.util.Map; import java.util.Properties; import java.util.logging.ConsoleHandler; import java.util.logging.Level; @@ -49,6 +51,7 @@ import org.json.simple.parser.ParseException; import com.stevesoft.pat.Regex; +import jalview.bin.Jalview; import jalview.javascript.json.JSON; import swingjs.api.JSUtilI; @@ -67,14 +70,17 @@ public class Platform isWin = null; private static Boolean isHeadless = null; - + private static swingjs.api.JSUtilI jsutil; - static { - if (isJS) { + static + { + if (isJS) + { try { - // this is ok - it's a highly embedded method in Java; the deprecation is + // this is ok - it's a highly embedded method in Java; the deprecation + // is // really a recommended best practice. jsutil = ((JSUtilI) Class.forName("swingjs.JSUtil").newInstance()); } catch (InstantiationException | IllegalAccessException @@ -82,7 +88,7 @@ public class Platform { e.printStackTrace(); } - } + } } // private static Boolean isHeadless = null; @@ -141,18 +147,18 @@ public class Platform return (isNoJSWin == null ? (isNoJSWin = !isJS && isWin()) : isNoJSWin); } - /** - * - * @return true if we are running in non-interactive no UI mode - */ - public static boolean isHeadless() - { - if (isHeadless == null) - { - isHeadless = "true".equals(System.getProperty("java.awt.headless")); - } - return isHeadless; - } + /** + * + * @return true if we are running in non-interactive no UI mode + */ + public static boolean isHeadless() + { + if (isHeadless == null) + { + isHeadless = "true".equals(System.getProperty("java.awt.headless")); + } + return isHeadless; + } /** * @@ -175,7 +181,7 @@ public class Platform { return s == null ? null : s.replace("\\", "\\\\"); } - + /** * Answers true if the mouse event has Meta-down (Command key on Mac) or * Ctrl-down (on other o/s). Note this answers _false_ if the Ctrl key is @@ -365,7 +371,6 @@ public class Platform } } - public static void cacheFileData(File file) { if (isJS) @@ -395,7 +400,7 @@ public class Platform } return null; } - + public static String getFileAsString(String url) { if (isJS && url != null) @@ -419,7 +424,6 @@ public class Platform return false; } - public static void addJ2SBinaryType(String ext) { if (isJS) @@ -427,7 +431,7 @@ public class Platform jsutil.addBinaryFileType(ext); } } - + /** * Encode the URI using JavaScript encodeURIComponent * @@ -468,7 +472,6 @@ public class Platform return (isJS ? (String) jsutil.getAppletAttribute("_uniqueId") : null); } - /** * Read the Info block for this applet. * @@ -543,8 +546,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) @@ -575,8 +577,8 @@ public class Platform * @param is * @param outFile * @throws IOException - * if the file cannot be created or there is a problem - * reading the input stream. + * 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 @@ -622,15 +624,20 @@ public class Platform jsutil.addDirectDatabaseCall(domain); System.out.println( - "Platform adding known access-control-allow-origin * for domain " - + domain); + "Platform adding known access-control-allow-origin * for domain " + + domain); } } + /** + * Allow for URL-line command arguments. Untested. + * + */ public static void getURLCommandArguments() { + try { /** * 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 @@ -640,13 +647,16 @@ public class Platform * decodeURI((document.location.href.replace("&","?").split("?j2s")[0] * + "?").split("?")[1].split("#")[0]); a && * (J2S.thisApplet.__Info.args = a.split(" ")); + * + * System.out.println("URL arguments: " + a); */ - + } catch (Throwable t) { + } } /** - * A (case sensitive) file path comparator that ignores the difference between / - * and \ + * A (case sensitive) file path comparator that ignores the difference between + * / and \ * * @param path1 * @param path2 @@ -667,11 +677,8 @@ public class Platform return p1.equals(p2); } + ///////////// JAL-3253 Applet additions ////////////// - -///////////// JAL-3253 Applet additions ////////////// - - /** * Retrieve the object's embedded size from a div's style on a page if * embedded in SwingJS. @@ -758,7 +765,6 @@ public class Platform } } - /** * 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 @@ -841,7 +847,8 @@ public class Platform public static String getUserPath(String subpath) { char sep = File.separatorChar; - return System.getProperty("user.home") + sep + subpath.replace('/', sep); + return System.getProperty("user.home") + sep + + subpath.replace('/', sep); } /** @@ -856,8 +863,10 @@ public class Platform */ public static boolean isFileOlderThanThreshold(File file, int noOfDays) { - if (isJS()) { - // not meaningful in SwingJS -- this is a session-specific temp file. It doesn't have a timestamp. + if (isJS()) + { + // not meaningful in SwingJS -- this is a session-specific temp file. It + // doesn't have a timestamp. return false; } Path filePath = file.toPath(); @@ -892,8 +901,10 @@ public class Platform { return failValue; } - if (isJS) { - int val = /** @j2sNative 1 ? parseInt(input) : */ 0; + if (isJS) + { + int val = /** @j2sNative 1 ? parseInt(input) : */ + 0; return (val == val + 0 ? val : failValue); } // JavaScript does not support Regex ? lookahead @@ -905,5 +916,41 @@ public class Platform return failValue; } + public static Map getAppletInfoAsMap() + { + return (isJS ? jsutil.getAppletInfoAsMap() : null); + } + + /** + * Get the SwingJS applet ID and combine that with the frameType + * + * @param frameType + * "alignment", "desktop", etc., or null + * @return + */ + public static String getAppID(String frameType) + { + + String id = Jalview.getInstance().j2sAppletID; + if (id == null) + { + Jalview.getInstance().j2sAppletID = id = (isJS ? (String) jsutil + .getAppletAttribute("_id") : "jalview"); + } + return id + (frameType == null ? "" : "-" + frameType); + } + + + /** + * Option to avoid unnecessary seeking of nonexistent resources in JavaScript. + * Works in Java as well. + * + * @param loc + * @return + */ + public static Locale getLocaleOrNone(Locale loc) + { + return (isJS && loc.getCountry() == "en" ? new Locale("") : loc); + } }