From: Ben Soares <bsoares@dundee.ac.uk>
Date: Wed, 3 Jul 2019 00:36:50 +0000 (+0100)
Subject: JAL-3348 prepping getdown to pass JVM command line args
X-Git-Tag: Release_2_11_0~1^2~6^2~9
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=af5bc802477affd6e7843fc367f8e91a7831f741;p=jalview.git

JAL-3348 prepping getdown to pass JVM command line args
---

diff --git a/getdown/src/getdown/ant/pom.xml b/getdown/src/getdown/ant/pom.xml
index a2f95e3..3b29977 100644
--- a/getdown/src/getdown/ant/pom.xml
+++ b/getdown/src/getdown/ant/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings.getdown</groupId>
     <artifactId>getdown</artifactId>
-    <version>1.8.3-1.1.4_JVL</version>
+    <version>1.8.3-1.1.5_JVL</version>
   </parent>
 
   <artifactId>getdown-ant</artifactId>
diff --git a/getdown/src/getdown/core/pom.xml b/getdown/src/getdown/core/pom.xml
index 4cd0507..c63fd37 100644
--- a/getdown/src/getdown/core/pom.xml
+++ b/getdown/src/getdown/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings.getdown</groupId>
     <artifactId>getdown</artifactId>
-    <version>1.8.3-1.1.4_JVL</version>
+    <version>1.8.3-1.1.5_JVL</version>
   </parent>
 
   <artifactId>getdown-core</artifactId>
diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index 2dddd6f..799b5bb 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -286,7 +286,6 @@ public class Application
     	_envc = envc;
     	_config = getLocalPath(envc.appDir, CONFIG_FILE);
     	_backupConfig = getLocalPath(envc.appDir, BACKUP_CONFIG_DIR+File.separator+CONFIG_FILE);
-    	log.warning("Backup config file now", "_backupConfig", _backupConfig, "exists", _backupConfig.exists(), "isReadable", _backupConfig.canRead());
     }
 
     /**
@@ -1129,7 +1128,7 @@ public class Application
           if (j > -1) {
             ext = filename.substring(j+1);
           }
-          if (LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase())) {
+          if (ext != null && LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase())) {
             // this file extension should have been dealt with in Getdown class
           } else {
             _appargs.add(0, "-open");
diff --git a/getdown/src/getdown/launcher/pom.xml b/getdown/src/getdown/launcher/pom.xml
index 4c6b982..d1514df 100644
--- a/getdown/src/getdown/launcher/pom.xml
+++ b/getdown/src/getdown/launcher/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings.getdown</groupId>
     <artifactId>getdown</artifactId>
-    <version>1.8.3-1.1.4_JVL</version>
+    <version>1.8.3-1.1.5_JVL</version>
   </parent>
 
   <artifactId>getdown-launcher</artifactId>
diff --git a/getdown/src/getdown/launcher/src/main/java/jalview/bin/StartupNotificationListener.java b/getdown/src/getdown/launcher/src/main/java/jalview/bin/StartupNotificationListener.java
index 5c6c7c3..c6aadd7 100644
--- a/getdown/src/getdown/launcher/src/main/java/jalview/bin/StartupNotificationListener.java
+++ b/getdown/src/getdown/launcher/src/main/java/jalview/bin/StartupNotificationListener.java
@@ -25,5 +25,10 @@ public class StartupNotificationListener {
     }
 
   }
+  
+  public String[] getExtraCommandLineArguments() {
+    com.install4j.api.context.Context c = new com.install4j.api.context.Context();
+    return c.getExtraCommandLineArguments();
+  }
 
 }
diff --git a/getdown/src/getdown/pom.xml b/getdown/src/getdown/pom.xml
index 24efba8..4615ca8 100644
--- a/getdown/src/getdown/pom.xml
+++ b/getdown/src/getdown/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.threerings.getdown</groupId>
   <artifactId>getdown</artifactId>
   <packaging>pom</packaging>
-  <version>1.8.3-1.1.4_JVL</version>
+  <version>1.8.3-1.1.5_JVL</version>
 
   <name>getdown</name>
   <description>An application installer and updater.</description>