X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=getdown%2Fsrc%2Fgetdown%2Flauncher%2Fsrc%2Fmain%2Fjava%2Fcom%2Fthreerings%2Fgetdown%2Flauncher%2FGetdownApp.java;h=5e168ff240590f4ab26ddf6f24f05be5a99c6fd8;hb=dbfa10a0954d79fe8f0cde05dd23aa86efc3885b;hp=32890fab5f68c1edb7b4f1fc7b8565466da26c91;hpb=46ba8ba2466d929d023295f38bc3572aef5467f1;p=jalview.git 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 32890fa..5e168ff 100644 --- 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 @@ -29,6 +29,7 @@ import javax.swing.WindowConstants; import com.install4j.api.launcher.StartupNotification; import com.samskivert.swing.util.SwingUtil; +import com.threerings.getdown.data.Application; import com.threerings.getdown.data.EnvConfig; import com.threerings.getdown.data.SysProps; import com.threerings.getdown.util.LaunchUtil; @@ -97,8 +98,9 @@ public class GetdownApp new StartupNotification.Listener() { @Override public void startupPerformed(String parameters) - { - GetdownApp.setStartupFilesParameterString(parameters); + { + log.warning("StartupNotification.Listener.startupPerformed: '"+parameters+"'"); + setStartupFilesParameterString(parameters); } }); } catch (Exception e) @@ -106,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")); @@ -267,9 +267,12 @@ public class GetdownApp protected JFrame _frame; }; - if (getStartupFilesParameterString() != null) { - app.setStartupFilesFromParameterString(getStartupFilesParameterString()); + + String startupFile = getStartupFilesParameterString(); + if (!StringUtil.isBlank(startupFile)) { + Application.setStartupFilesFromParameterString(startupFile); } + app.start(); return app; }