Mercurial > hg > release > icedtea-web-1.8
changeset 1249:c09f70284a5f
JnlpBoot and XBasicService are called with exitOnException true now. All other then boolean constructor of Launcher made private. True/False enforced and reconsidered
* netx/net/sourceforge/jnlp/Launcher.java: All other then boolean constructor of Launcher made private.
* netx/net/sourceforge/jnlp/runtime/JnlpBoot.java: (run) new Launcher called with true rather then false
* netx/net/sourceforge/jnlp/services/XBasicService.java: (lunchUrl) same
author | Jiri Vanek <jvanek@redhat.com> |
---|---|
date | Thu, 18 Jun 2015 17:56:22 +0200 |
parents | 7e1e9ab4824d |
children | ac236a9d0b92 |
files | ChangeLog netx/net/sourceforge/jnlp/Launcher.java netx/net/sourceforge/jnlp/runtime/JnlpBoot.java netx/net/sourceforge/jnlp/services/XBasicService.java |
diffstat | 4 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jun 18 12:29:34 2015 +0200 +++ b/ChangeLog Thu Jun 18 17:56:22 2015 +0200 @@ -1,3 +1,13 @@ +2015-06-18 Jiri Vanek <jvanek@redhat.com> + + JnlpBoot and XBasicService are called with exitOnException true now. + All other then boolean constructor of Launcher made private. True/False enforced and reconsidered + * netx/net/sourceforge/jnlp/Launcher.java: All other then boolean constructor + of Launcher made private. + * netx/net/sourceforge/jnlp/runtime/JnlpBoot.java: (run) new Launcher called with + true rather then false + * netx/net/sourceforge/jnlp/services/XBasicService.java: (lunchUrl) same + 2015-06-18 Jiri Vanek <jvanek@redhat.com> All dialogs are able to accept answer from standard input and thus works in headless mode
--- a/netx/net/sourceforge/jnlp/Launcher.java Thu Jun 18 12:29:34 2015 +0200 +++ b/netx/net/sourceforge/jnlp/Launcher.java Thu Jun 18 17:56:22 2015 +0200 @@ -88,7 +88,7 @@ * Create a launcher with the runtime's default update policy * and launch handler. */ - public Launcher() { + private Launcher() { this(null, null); if (handler == null) { @@ -118,7 +118,7 @@ * * @param handler the handler to use or null for no handler. */ - public Launcher(LaunchHandler handler) { + private Launcher(LaunchHandler handler) { this(handler, null); } @@ -129,7 +129,7 @@ * @param handler the handler to use or null for no handler. * @param policy the update policy to use or null for default policy. */ - public Launcher(LaunchHandler handler, UpdatePolicy policy) { + private Launcher(LaunchHandler handler, UpdatePolicy policy) { if (policy == null) policy = JNLPRuntime.getDefaultUpdatePolicy();
--- a/netx/net/sourceforge/jnlp/runtime/JnlpBoot.java Thu Jun 18 12:29:34 2015 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/JnlpBoot.java Thu Jun 18 17:56:22 2015 +0200 @@ -61,7 +61,7 @@ } try { OutputController.getLogger().log("Proceeding with jnlp"); - Launcher launcher = new Launcher(false); + Launcher launcher = new Launcher(true); launcher.setParserSettings(settings); launcher.setInformationToMerge(extra); launcher.launch(Boot.getFileLocation());
--- a/netx/net/sourceforge/jnlp/services/XBasicService.java Thu Jun 18 12:29:34 2015 +0200 +++ b/netx/net/sourceforge/jnlp/services/XBasicService.java Thu Jun 18 17:56:22 2015 +0200 @@ -166,7 +166,7 @@ if (url.toString().endsWith(".jnlp")) { try { - new Launcher().launchExternal(url); + new Launcher(false).launchExternal(url); return true; } catch (Exception ex) { return false;