Mercurial > hg > release > icedtea-web-1.6
changeset 1195:7de7aa9d01c2
fix lines displayed in javaws help
2015-04-09 Lukasz Dracz <ldracz@redhat.com>
fix lines displayed in javaws help
* netx/net/sourceforge/jnlp/resources/Messages.properties:
(JWSoptionsL1): modified
(JWSoptionsL3): added
* netx/net/sourceforge/jnlp/util/docprovider/JavaWsTextsProvider.java:
added a third line for javaws help
author | Lukasz Dracz <ldracz@redhat.com> |
---|---|
date | Thu, 09 Apr 2015 11:31:31 -0400 |
parents | 45c4323f5df3 |
children | 03e42ec1bc49 |
files | ChangeLog netx/net/sourceforge/jnlp/resources/Messages.properties netx/net/sourceforge/jnlp/util/docprovider/JavaWsTextsProvider.java |
diffstat | 3 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 03 16:48:26 2015 +0200 +++ b/ChangeLog Thu Apr 09 11:31:31 2015 -0400 @@ -1,3 +1,12 @@ +2015-04-09 Lukasz Dracz <ldracz@redhat.com> + + fix lines displayed in javaws help + * netx/net/sourceforge/jnlp/resources/Messages.properties: + (JWSoptionsL1): modified + (JWSoptionsL3): added + * netx/net/sourceforge/jnlp/util/docprovider/JavaWsTextsProvider.java: + added a third line for javaws help + 2015-04-03 Lukasz Dracz <ldracz@redhat.com> Added tool for manipulating deployment-properties during tests run
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Apr 03 16:48:26 2015 +0200 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Thu Apr 09 11:31:31 2015 -0400 @@ -309,8 +309,9 @@ JWSdescL1=is an implementation of a JNLP client. It uses a JNLP (Java Network Launch Protocol) file to securely run a remote Java application or a Java applet. \ This implementation of {0}is from the IcedTea project and is based on the NetX project. JWSdescL2=A JNLP file is an xml file that describes how to securely run a remote Java application or a Java applet. -JWSoptionsL1=When specifying options, the name of the jnlp file must be the last argument to javaws - all the options must preceede it. +JWSoptionsL1=When specifying options, the name of the jnlp file can be after the command, the -jnlp option, an option with no arguments, or after an argument with an option that takes one argument. A html file that launches a jnlp can be specified after the -html option. JWSoptionsL2=The jnlp-file can either be a url or a local path. +JWSoptionsL3=The JNLP file should only be specified once, whether as a main argument, after -jnlp or through an html file. JWSoptionsTitle1=Run options: JWSoptionsTitle2=Control options: JWSexampleL1=Shows basic help and about informations.
--- a/netx/net/sourceforge/jnlp/util/docprovider/JavaWsTextsProvider.java Fri Apr 03 16:48:26 2015 +0200 +++ b/netx/net/sourceforge/jnlp/util/docprovider/JavaWsTextsProvider.java Thu Apr 09 11:31:31 2015 -0400 @@ -82,7 +82,8 @@ String title = super.getOptions(); String add1 = Translator.R("JWSoptionsL1"); String add2 = Translator.R("JWSoptionsL2"); - String adds = getFormatter().wrapParagraph(add1 + getFormatter().getNewLine() + add2); + String add3 = Translator.R("JWSoptionsL3"); + String adds = getFormatter().wrapParagraph(add1 + getFormatter().getNewLine() + add2 + getFormatter().getNewLine() + add3); String runtime = getFormatter().getBold(Translator.R("JWSoptionsTitle1")) + getFormatter().getNewLine() + optionsToString(OptionsDefinitions.getJavaWsRuntimeOptions()); String control = getFormatter().getBold(Translator.R("JWSoptionsTitle2")) + getFormatter().getNewLine()