JAL-3246 JAL-3247 Reworked JVL files as getdown.txt config with limitations

[jalview.git] / getdown / src / getdown / launcher / src / main / java / com / threerings / getdown / launcher / GetdownApp.java

diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
index a907cef..5e168ff 100644 (file)
--- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
+++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
@@ -99,7 +99,7 @@ public class GetdownApp
                 @Override
                 public void startupPerformed(String parameters)
                 { 
-                  log.warning("startupPerformed: '"+parameters+"'");
+                  log.warning("StartupNotification.Listener.startupPerformed: '"+parameters+"'");
                   setStartupFilesParameterString(parameters);
                 }
               });
@@ -108,8 +108,6 @@ public class GetdownApp
       e.printStackTrace();
     }
     
-    //Thread.sleep(200);
-
     // record a few things for posterity
     log.info("------------------ VM Info ------------------");
     log.info("-- OS Name: " + System.getProperty("os.name"));
@@ -269,34 +267,12 @@ public class GetdownApp
 
       protected JFrame _frame;
     };
-    /*
-    log.warning("Startup file?",
-            "paramstring", '"'+getStartupFilesParameterString()+'"',
-            "isWindows", LaunchUtil.isWindows(),
-            "argv.length", argv.length,
-            "argv[0]", argv.length>0?argv[0]:"NULL",
-            "argv[1]", argv.length>1?argv[1]:"NULL",
-            "argv[2]", argv.length>2?argv[2]:"NULL",
-            "argv[3]", argv.length>3?argv[3]:"NULL"
-              );
-              */
-    if (getStartupFilesParameterString() != null && getStartupFilesParameterString().length() > 0) {
-      app.setStartupFilesFromParameterString(getStartupFilesParameterString());
-    } else if (
-            getStartupFilesParameterString().length() == 0
-            && LaunchUtil.isWindows()
-            && argv.length >= 3
-            && argv[0].equals(".")
-            && argv[1].equals("noappid")
-            && argv[2].endsWith("."+Application.locatorFileExtension)
-            ) {
-      log.info("Jalview Version Locator in args: "+argv[2]);
-      app.setStartupFilesFromParameterString(argv[2]);
-      String[] newArgv = new String[argv.length - 1];
-      System.arraycopy(argv, 0, newArgv, 0, 2);
-      System.arraycopy(argv, 3, newArgv, 2, argv.length - 3);
-      argv = newArgv;
+    
+    String startupFile = getStartupFilesParameterString();
+    if (!StringUtil.isBlank(startupFile)) {
+      Application.setStartupFilesFromParameterString(startupFile);
     }
+ 
     app.start();
     return app;
   }