/hg/icedtea-web: Handle 'reset all' as an itweb-settings command

[omajid at icedtea.classpath.org]

changeset c4b91b61f88e in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c4b91b61f88e
author: Omair Majid <omajid at redhat.com>
date: Mon Feb 28 17:29:31 2011 -0500

	Handle 'reset all' as an itweb-settings command

	2011-02-28 Omair Majid <omajid at redhat.com>

	 * netx/net/sourceforge/jnlp/controlpanel/CommandLine.java
	(printResetHelp): Indicate that "all" is a valid argument.
	(handleResetCommand): Deal with "all" instead of a property name by
	reseting all properties.


diffstat:

1 file changed, 5 insertions(+)
ChangeLog |    5 +++++

diffs (56 lines):

diff -r 26b24fb414ec -r c4b91b61f88e ChangeLog
--- a/ChangeLog	Mon Feb 28 17:30:40 2011 -0500
+++ b/ChangeLog	Mon Feb 28 17:29:31 2011 -0500
@@ -1,3 +1,10 @@ 2011-02-28  Denis Lila  <dlila at redhat.co
+2011-02-28  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/controlpanel/CommandLine.java
+	(printResetHelp): Indicate that "all" is a valid argument.
+	(handleResetCommand): Deal with "all" instead of a property name by
+	reseting all properties.
+
 2011-02-28  Denis Lila  <dlila at redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginMain.java
diff -r 26b24fb414ec -r c4b91b61f88e netx/net/sourceforge/jnlp/controlpanel/CommandLine.java
--- a/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java	Mon Feb 28 17:30:40 2011 -0500
+++ b/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java	Mon Feb 28 17:29:31 2011 -0500
@@ -244,7 +244,7 @@ public class CommandLine {
      */
     public void printResetHelp() {
         System.out.println(R("Usage"));
-        System.out.println("  " + PROGRAM_NAME + " reset property-name");
+        System.out.println("  " + PROGRAM_NAME + " reset [all|property-name]");
         System.out.println(R("CLResetDescription"));
     }
 
@@ -268,14 +268,26 @@ public class CommandLine {
 
         String key = args.get(0);
 
+        boolean resetAll = false;
+        if (key.equals("all")) {
+            resetAll = true;
+        }
+
         Map<String, Setting<String>> all = config.getRaw();
-        if (!all.containsKey(key)) {
+        if (!resetAll && !all.containsKey(key)) {
             System.out.println(R("CLUnknownProperty", key));
             return ERROR;
         }
 
-        Setting<String> setting = all.get(key);
-        setting.setValue(setting.getDefaultValue());
+        if (resetAll) {
+            for (String aKey: all.keySet()) {
+                Setting<String> setting = all.get(aKey);
+                setting.setValue(setting.getDefaultValue());
+            }
+        } else {
+            Setting<String> setting = all.get(key);
+            setting.setValue(setting.getDefaultValue());
+        }
 
         try {
             config.save();