JAL-3631 Name changes to system properties and a fallback App name to avoid hard...

diff --git a/src/jalview/analytics/Plausible.java b/src/jalview/analytics/Plausible.java
index bff0448..adf324d 100644 (file)
--- a/src/jalview/analytics/Plausible.java
+++ b/src/jalview/analytics/Plausible.java
@@ -92,7 +92,7 @@ public class Plausible
     {
       defaultProps.put("install4j_version", val);
     }
-    val = System.getProperty("installer_template_version");
+    val = System.getProperty("installer.template_version");
     if (val != null)
     {
       defaultProps.put("install4j_template_version", val);

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index e188829..682f102 100755 (executable)
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -1250,7 +1250,7 @@ public class Cache
     appendIfNotNull(sb, "Install4j version: ",
             System.getProperty("sys.install4jVersion"), "\n", null);
     appendIfNotNull(sb, "Install4j template version: ",
-            System.getProperty("installer_template_version"), "\n", null);
+            System.getProperty("installer.template_version"), "\n", null);
     appendIfNotNull(sb, "Launcher version: ",
             System.getProperty("launcher_version"), "\n", null);
     LookAndFeel laf = UIManager.getLookAndFeel();

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 6d28da1..92ac5fc 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -403,7 +403,7 @@ public class Jalview implements JalviewObjectI
       {
         Console.outPrintln("Install4j version: " + val);
       }
-      val = System.getProperty("installer_template_version");
+      val = System.getProperty("installer.template_version");
       if (val != null)
       {
         Console.outPrintln("Install4j template version: " + val);

diff --git a/src/jalview/util/ChannelProperties.java b/src/jalview/util/ChannelProperties.java
index ffcb6a1..cf7da8c 100644 (file)
--- a/src/jalview/util/ChannelProperties.java
+++ b/src/jalview/util/ChannelProperties.java
@@ -51,12 +51,14 @@ public class ChannelProperties
 
   private static final ArrayList<Image> iconList;
 
+  public static final String FALLBACK_APPNAME = "Jalview";
+
   static
   {
     defaultProps = new Properties();
     // these should be kept up to date, but in real life they should never
     // actually be used anyway.
-    defaultProps.put("app_name", "Jalview");
+    defaultProps.put("app_name", FALLBACK_APPNAME);
     defaultProps.put("banner", "/default_images/jalview_banner.png");
     defaultProps.put("logo.16", "/default_images/jalview_logo-16.png");
     defaultProps.put("logo.32", "/default_images/jalview_logo-32.png");

diff --git a/src/jalview/util/LaunchUtils.java b/src/jalview/util/LaunchUtils.java
index 5894fec..f8cc269 100644 (file)
--- a/src/jalview/util/LaunchUtils.java
+++ b/src/jalview/util/LaunchUtils.java
@@ -230,7 +230,7 @@ public class LaunchUtils
       // appName and "Jalview" will not point to javaw.exe or java.exe but in
       // this case that's okay because the taskbar display name problem doesn't
       // manifest in Windows. See JAL-3820, JAL-4189.
-      for (String name : new String[] { appName, "Jalview", java, javaExe })
+      for (String name : new String[] { appName, ChannelProperties.FALLBACK_APPNAME, java, javaExe })
       {
         if (LaunchUtils.checkJVMSymlink(javaBinDir + name, winConsole))
         {