JAL-3543 Conditional reporting of Install4j and Getdown versions if null

[jalview.git] / src / jalview / bin / Jalview.java

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index a5cf48f..3cae900 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -198,17 +198,24 @@ public class Jalview
   {
     System.setSecurityManager(null);
     System.out
-            .println("Java version: " + System.getProperty("java.version"));
+            .println("Java version: "
+                    + System.getProperty("java.version"));
     System.out.println("Java Home: " + System.getProperty("java.home"));
     System.out.println(System.getProperty("os.arch") + " "
             + System.getProperty("os.name") + " "
             + System.getProperty("os.version"));
-    System.out.println("Install4j version: "
-            + System.getProperty("sys.install4jVersion"));
-    System.out.println("Install4j template version: "
-            + System.getProperty("installer_template_version"));
-    System.out.println(
-            "Launcher version: " + System.getProperty("launcher_version"));
+    String val = System.getProperty("sys.install4jVersion");
+    if (val != null) {
+    System.out.println("Install4j version: " + val);
+    }
+    val = System.getProperty("installer_template_version");
+    if (val != null) {
+      System.out.println("Install4j template version: " + val);
+    }
+    val = System.getProperty("launcher_version");
+    if (val != null) {
+      System.out.println("Launcher version: " + val);
+    }
 
     // report Jalview version
     Cache.loadBuildProperties(true);
@@ -414,6 +421,7 @@ public class Jalview
       BioJsHTMLOutput.updateBioJS();
     }
 
+    Cache.log.info("CHECKPOINT 1");
     // Move any new getdown-launcher-new.jar into place over old
     // getdown-launcher.jar
     String appdirString = System.getProperty("getdownappdir");
@@ -438,6 +446,7 @@ public class Jalview
     DataSourceType protocol = null;
     FileLoader fileLoader = new FileLoader(!headless);
 
+    Cache.log.info("CHECKPOINT 2");
     String groovyscript = null; // script to execute after all loading is
     // completed one way or another
     // extract groovy argument and execute if necessary