From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 27 Mar 2019 16:29:29 +0000 (+0000)
Subject: JAL-3032 small formatting and isJS() tidy
X-Git-Tag: Release_2_11_4_0~45^2~18^2~203
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=91dd5d379e0624f6cd4be02c17187ec1a630d693;p=jalview.git

JAL-3032 small formatting and isJS() tidy
---

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 7cbbd7d..66375e1 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -87,18 +87,30 @@ import groovy.util.GroovyScriptEngine;
  */
 public class Jalview
 {
+  // @formatter:off
 	/**
-   * // find first query parameter (if any) that doesn't start with j2s // and
-   * set as space-delimited arguments to Jalview main
+   * find first query parameter (if any) that doesn't start with j2s
+   * and set as space-delimited arguments to Jalview main
    * 
    * @j2sNative
-   * 
-   *            var hr = decodeURI(document.location.href); var pos =
-   *            hr.indexOf("?"); if (pos > 0) { q = hr.substring(pos+1); args =
-   *            q.split("&"); for (i = 0 ; i < args.length; i++) { arg1 =
-   *            args[i]; if (!arg1.startsWith("j2s")) { thisApplet.__Info.args =
-   *            arg1.split(" "); break; } } }
+   *  var hr = decodeURI(document.location.href);
+   *  var pos = hr.indexOf("?");
+   *  if (pos > 0)
+   *  {
+   *     q = hr.substring(pos+1);
+   *     args = q.split("&");
+   *     for (i = 0 ; i < args.length; i++)
+   *     {
+   *      arg1 = args[i];
+   *      if (!arg1.startsWith("j2s"))
+   *      {
+   *       thisApplet.__Info.args = arg1.split(" ");
+   *       break;
+   *      }
+   *     }
+   *  }
    */
+  // @formatter:on
 
   /*
    * singleton instance of this class
diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 52bd64f..6bb96c0 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -140,8 +140,7 @@ public class SplashScreen extends JPanel
       java.net.URL urllogo = getClass()
               .getResource("/images/Jalview_Logo_small.png");
 
-      if (/** @j2sNative false || */
-      url != null)
+      if (!Platform.isJS() && url != null)
       {
         image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
         Image logo = java.awt.Toolkit.getDefaultToolkit()
@@ -157,7 +156,6 @@ public class SplashScreen extends JPanel
           } catch (InterruptedException x)
           {
           }
-          ;
           if (mt.isErrorAny())
           {
             System.err.println("Error when loading images!");