Let launcher handle parsing exceptions

2011-03-31  Omair Majid  <[email protected]>

    * netx/net/sourceforge/jnlp/Launcher.java: Add parserSettings and extra.
    (setParserSettings): New method.
    (setInformationToMerge): New method.
    (launch(JNLPFile,Container)): Call mergeExtraInformation.
    (launch(URL,boolean)): New method.
    (mergeExtraInformation): New method.
    (addProperties, addParameters, addArguments): Moved here from Boot.java
    (fromUrl): New method.
    * netx/net/sourceforge/jnlp/ParserSettings.java: New file.
    * netx/net/sourceforge/jnlp/resources/Messages.properties: Remove BArgNA,
    BParamNA.
    * netx/net/sourceforge/jnlp/runtime/Boot.java
    (run): Do not parse JNLP file. Pass ParserSettings and other command line
    additions to launcher.
    (getFile): Rename to...
    (getFileLocation): New method.
    (addProperties, addParameters, addArguments): Move to Launcher.java.

1 files changed, 0 insertions, 2 deletions

diff --git a/netx/net/sourceforge/jnlp/resources/Messages.properties b/netx/net/sourceforge/jnlp/resources/Messages.properties
index fb273c7..29593d0 100644
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties
@@ -129,8 +129,6 @@ BLaunchAbout=Launching about window...
 BNeedsFile=Must specify a .jnlp file

 RNoAboutJnlp=Unable to find about.jnlp

 BFileLoc=JNLP file location

-BArgNA=Arguments not used for this type of JNLP file (ignored).

-BParamNA=Parameters not used for this type of JNLP file (ignored).

 BBadProp=Incorrect property format {0} (should be key=value)

 BBadParam=Incorrect parameter format {0} (should be name=value)

 BNoDir=Directory {0} does not exist.