X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FPlatform.java;fp=src%2Fjalview%2Futil%2FPlatform.java;h=573e2d584db09e7deac6c36abee5ec239a3cf53f;hb=afbff636fa2dfa01daa1f4ec4e8a936e61e3cf16;hp=2d05a1b6ae9bbdcd25ae1e8e030aa2b54e3c2e9d;hpb=c6df3928336440918d23b4e7cb579f134e2f48dd;p=jalview.git diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java index 2d05a1b..573e2d5 100644 --- a/src/jalview/util/Platform.java +++ b/src/jalview/util/Platform.java @@ -88,7 +88,8 @@ public class Platform public static boolean isLinux() { return (isLinux == null - ? (isLinux = (System.getProperty("os.name").indexOf("Linux") >= 0)) + ? (isLinux = (System.getProperty("os.name") + .indexOf("Linux") >= 0)) : isLinux); } @@ -522,8 +523,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) @@ -555,8 +555,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 @@ -600,8 +600,8 @@ public class Platform if (isJS()) { System.out.println( - "Platform adding known access-control-allow-origin * for domain " - + domain); + "Platform adding known access-control-allow-origin * for domain " + + domain); /** * @j2sNative * @@ -613,7 +613,8 @@ public class Platform public static void getURLCommandArguments() { - try { + try + { /** * Retrieve the first query field as command arguments to Jalview. Include * only if prior to "?j2s" or "&j2s" or "#". Assign the applet's @@ -621,9 +622,13 @@ public class Platform * * @j2sNative var a = * decodeURI((document.location.href.replace("&","?").split("?j2s")[0] - * + "?").split("?")[1].split("#")[0]); a && (System.out.println("URL arguments detected were "+a)) && - * (J2S.thisApplet.__Info.urlargs = a.split(" ")); - * (!J2S.thisApplet.__Info.args || J2S.thisApplet.__Info.args == "" || J2S.thisApplet.__Info.args == "??") && (J2S.thisApplet.__Info.args = a) && (System.out.println("URL arguments were passed to J2S main.")); + * + "?").split("?")[1].split("#")[0]); a && + * (System.out.println("URL arguments detected were "+a)) && + * (J2S.thisApplet.__Info.urlargs = a.split(" ")); + * (!J2S.thisApplet.__Info.args || J2S.thisApplet.__Info.args + * == "" || J2S.thisApplet.__Info.args == "??") && + * (J2S.thisApplet.__Info.args = a) && (System.out.println("URL + * arguments were passed to J2S main.")); */ } catch (Throwable t) { @@ -631,8 +636,8 @@ public class Platform } /** - * 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