/hg/icedtea-web: Add -version flag

[aazores at icedtea.classpath.org]

changeset bbf4cc4319da in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bbf4cc4319da
author: Andrew Azores <aazores at redhat.com>
date: Thu Mar 06 09:18:35 2014 -0500

	Add -version flag

	* NEWS: added -version flag entry
	* netx/net/sourceforge/jnlp/resources/Messages.properties: (BOVersion)
	new message for command line -version flag
	* netx/net/sourceforge/jnlp/runtime/Boot.java: (main) added "-version"
	flag


diffstat:

 ChangeLog                                               |   8 ++++++++
 NEWS                                                    |   1 +
 netx/net/sourceforge/jnlp/resources/Messages.properties |   1 +
 netx/net/sourceforge/jnlp/runtime/Boot.java             |  10 ++++++++--
 4 files changed, 18 insertions(+), 2 deletions(-)

diffs (85 lines):

diff -r 0a36108ce4b9 -r bbf4cc4319da ChangeLog
--- a/ChangeLog	Wed Mar 05 16:41:06 2014 +0100
+++ b/ChangeLog	Thu Mar 06 09:18:35 2014 -0500
@@ -1,3 +1,11 @@
+2014-03-06  Andrew Azores  <aazores at redhat.com>
+
+	* NEWS: added -version flag entry
+	* netx/net/sourceforge/jnlp/resources/Messages.properties: (BOVersion)
+	new message for command line -version flag
+	* netx/net/sourceforge/jnlp/runtime/Boot.java: (main) added "-version"
+	flag
+
 2014-03-05  Jiri Vanek  <jvanek at redhat.com>
 
 	All security dialogs moved to appropriate package
diff -r 0a36108ce4b9 -r bbf4cc4319da NEWS
--- a/NEWS	Wed Mar 05 16:41:06 2014 +0100
+++ b/NEWS	Thu Mar 06 09:18:35 2014 -0500
@@ -16,6 +16,7 @@
 * Dialogs center on screen before becoming visible
 * Support for u45 and u51 new manifest attributes (Application-Name, Codebase)
 * Custom applet permission policies panel in itweb-settings control panel
+* javaws -version flag
 * Cache Viewer
   - Can be closed by ESC key
   - Enabling and disabling of operational buttons is handled properly
diff -r 0a36108ce4b9 -r bbf4cc4319da netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Wed Mar 05 16:41:06 2014 +0100
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Thu Mar 06 09:18:35 2014 -0500
@@ -209,6 +209,7 @@
 BOLicense   = Display the GPL license and exit.
 BOVerbose   = Enable verbose output.
 BOAbout     = Shows a sample application.
+BOVersion   = Print the IcedTea-Web version and exit.
 BONosecurity= Disables the secure runtime environment.
 BONoupdate  = Disables checking for updates.
 BOHeadless  = Disables download window, other UIs.
diff -r 0a36108ce4b9 -r bbf4cc4319da netx/net/sourceforge/jnlp/runtime/Boot.java
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java	Wed Mar 05 16:41:06 2014 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java	Thu Mar 06 09:18:35 2014 -0500
@@ -63,6 +63,8 @@
     public static final String name = Boot.class.getPackage().getImplementationTitle();
     public static final String version = Boot.class.getPackage().getImplementationVersion();
 
+    private static final String nameAndVersion = name + " " + version;
+
     private static final String miniLicense = "\n"
             + "   netx - an open-source JNLP client.\n"
             + "   Copyright (C) 2001-2003 Jon A. Maxwell (JAM)\n"
@@ -83,7 +85,7 @@
             + "\n";
 
     private static final String itwInfoMessage = ""
-            + name + " " + version
+            + nameAndVersion
             + "\n\n*  "
             + R("BAboutITW")
             + "\n*  "
@@ -102,6 +104,7 @@
             + "  -viewer               " + R("BOViewer") + "\n"
             + "\n"
             + "run-options:" + "\n"
+            + "  -version              " + R("BOVersion") + "\n"
             + "  -arg arg              " + R("BOArg") + "\n"
             + "  -param name=value     " + R("BOParam") + "\n"
             + "  -property name=value  " + R("BOProperty") + "\n"
@@ -138,14 +141,17 @@
         DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched();
 
         if (null != getOption("-viewer")) {
-
             try {
                 CertificateViewer.main(null);
                 JNLPRuntime.exit(0);
             } catch (Exception e) {
                 OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e);
             }
+        }
 
+        if (null != getOption("-version")) {
+            OutputController.getLogger().printOutLn(nameAndVersion);
+            JNLPRuntime.exit(0);
         }
 
         if (null != getOption("-license")) {