/hg/release/icedtea-web-1.1: Remove non-standard option from itw...

Mon May 30 10:16:23 PDT 2011

changeset de182e65a6e1 in /hg/release/icedtea-web-1.1
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=de182e65a6e1
author: Andrew Su <asu at redhat.com>
date: Mon May 30 13:15:50 2011 -0400

	Remove non-standard option from itweb-settings.


diffstat:

 ChangeLog                                                  |  8 ++++++++
 netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java |  7 ++-----
 netx/net/sourceforge/jnlp/resources/Messages.properties    |  1 -
 3 files changed, 10 insertions(+), 6 deletions(-)

diffs (62 lines):

diff -r 015b544f05d8 -r de182e65a6e1 ChangeLog

--- a/ChangeLog	Fri May 27 18:01:27 2011 -0400
+++ b/ChangeLog	Mon May 30 13:15:50 2011 -0400
@@ -1,3 +1,11 @@
+2011-05-30  Andrew Su  <asu at redhat.com>
+
+	* netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java:
+	(properties): Removed property.
+	(addComponents): Removed checkbox.
+	* netx/net/sourceforge/jnlp/resources/Messages.properties:
+	Removed translation string for DPLifeCycleExceptions.
+
 2011-05-27  Deepak Bhole <dbhole at redhat.com>
 
 	PR723: AccessControlException while downloading resource
diff -r 015b544f05d8 -r de182e65a6e1 netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java	Fri May 27 18:01:27 2011 -0400
+++ b/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java	Mon May 30 13:15:50 2011 -0400
@@ -46,7 +46,6 @@
     /** List of properties used by this panel */
     public static String[] properties = { "deployment.trace", // Debugging
             "deployment.log", // Debugging
-            "deployment.javapi.lifecycle.exception", // Debugging
             "deployment.console.startup.mode", // Java Console
     };
     private DeploymentConfiguration config;
@@ -74,8 +73,7 @@
         JLabel debuggingDescription = new JLabel("<html>" + Translator.R("CPDebuggingDescription") + "<hr /><br /></html>");
 
         JCheckBox[] debuggingOptions = { new JCheckBox(Translator.R("DPEnableTracing")),
-                new JCheckBox(Translator.R("DPEnableLogging")),
-                new JCheckBox(Translator.R("DPLifeCycleExceptions")) };
+                new JCheckBox(Translator.R("DPEnableLogging")), };
 
         ComboItem[] javaConsoleItems = { new ComboItem(Translator.R("DPDisable"), "DISABLE"),
                 new ComboItem(Translator.R("DPHide"), "HIDE"),
@@ -107,13 +105,12 @@
                 switch (i) {
                     case 0:
                     case 1:
-                    case 2:
                         debuggingOptions[i].setSelected(Boolean.parseBoolean(s));
                         debuggingOptions[i].setActionCommand(properties[i]);
                         debuggingOptions[i].addItemListener(this);
                         add(debuggingOptions[i], c);
                         break;
-                    case 3:
+                    case 2:
                         for (int j = 0; j < javaConsoleItems.length; j++) {
                             consoleComboBox.addItem(javaConsoleItems[j]);
                             if (config.getProperty("deployment.console.startup.mode").equals(javaConsoleItems[j].getValue()))
diff -r 015b544f05d8 -r de182e65a6e1 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Fri May 27 18:01:27 2011 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Mon May 30 13:15:50 2011 -0400
@@ -334,7 +334,6 @@
 # Control Panel - DebugginPanel
 DPEnableTracing=Enable tracing
 DPEnableLogging=Enable logging
-DPLifeCycleExceptions=Show applet lifecycle exceptions
 DPDisable=Disable
 DPHide=Hide on startup
 DPShow=Show on startup

