From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 6 Dec 2019 17:34:04 +0000 (+0000)
Subject: JAL-3449 Added more versions to getdown splashscreen and fixed Jalview's Java Console... 
X-Git-Tag: Develop-2_11_2_0-d20201215~80^2~28^2~23
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=2aa652e077b8479ff637b87df5f0dea161c7cde2

JAL-3449 Added more versions to getdown splashscreen and fixed Jalview's Java Console installer version reporting
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index 2c1e03a..12752c8 100644
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git a/getdown/lib/getdown-launcher-local.jar b/getdown/lib/getdown-launcher-local.jar
index b2275c6..a79d379 100644
Binary files a/getdown/lib/getdown-launcher-local.jar and b/getdown/lib/getdown-launcher-local.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index 8ece2b6..e3a676a 100644
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java
index 620182b..89b621e 100644
--- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java
+++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java
@@ -32,8 +32,8 @@ import com.threerings.getdown.data.Build;
 import com.threerings.getdown.util.MessageUtil;
 import com.threerings.getdown.util.Rectangle;
 import com.threerings.getdown.util.StringUtil;
-
 import static com.threerings.getdown.Log.log;
+import com.install4j.api.launcher.Variables;
 
 /**
  * Displays download and patching status.
@@ -278,11 +278,19 @@ public final class StatusPanel extends JComponent
  
     	StringBuilder labelText = new StringBuilder();
     	if (_ifc.displayVersion) {
-    		labelText.append("launcher version: "+Build.version());
+    		labelText.append("launcher version: " + Build.version());
+    		labelText.append("\n");
+        try {
+          labelText.append("install4j version: " + Variables.getCompilerVariable("sys.install4jVersion"));
+        } catch(java.io.IOException e) {
+          labelText.append("install4j version: not available");
+        }
+    		labelText.append("\n");
+    		labelText.append("installer version: " + System.getProperty("installer_template_version"));
     		labelText.append("\n");
     	}
     	if (_ifc.displayAppbase) {
-    		labelText.append("appbase: "+_appbase);
+    		labelText.append("appbase: " + _appbase);
     		labelText.append("\n");
     	}
     	labelText.append(status); 
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index 2c1e03a..12752c8 100644
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar
index 2c1e03a..12752c8 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ
diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 4e4a021..3b9b98a 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -1092,13 +1092,15 @@ public class Cache
     sb.append("\n");
     sb.append(System.getProperty("os.arch") + " " + System.getProperty("os.name") + " " + System.getProperty("os.version"));
     sb.append("\n");
-    System.out.println("Install4j version: "
+    sb.append("Install4j version: "
             + System.getProperty("sys.install4jVersion"));
-    System.out.println("Install4j template version: "
+    sb.append("\n");
+    sb.append("Install4j template version: "
             + System.getProperty("installer_template_version"));
-    System.out.println(
+    sb.append("\n");
+    sb.append(
             "Launcher version: " + System.getProperty("launcher_version"));
-
+    sb.append("\n");
     if (jalview.bin.Cache.getDefault("VERSION", "TEST").equals("DEVELOPMENT")) {
       sb.append("Getdown appdir: " + System.getProperty("getdownappdir"));
       sb.append("\n");