[icedtea-web] RFC: extend "itweb-settings reset" to accept "all"
Deepak Bhole
dbhole at redhat.com
Tue Mar 1 10:18:54 PST 2011
* Omair Majid <omajid at redhat.com> [2011-03-01 12:24]:
> On 02/28/2011 05:15 PM, Deepak Bhole wrote:
> >* Omair Majid<omajid at redhat.com> [2011-02-28 17:11]:
> >>On 02/28/2011 04:54 PM, Deepak Bhole wrote:
> >>>* Omair Majid<omajid at redhat.com> [2011-02-28 16:32]:
> >>>>Hi,
> >>>>
> >>>>The attached patch makes "itweb-settings reset all" reset the entire
> >>>>configuration.
> >>>>
> >>>>Okay to commit?
> >>>>
> >>>
> >>>I think we should have a GUI button for reset all, rather than a
> >>>command-line switch. If a GUI button already exists, we don't need a CL
> >>>switch.
> >>>
> >>
> >>This is just extending the existing command line (try
> >>"itweb-settings help" to see more info about it). Currently we have
> >>"itweb-settings reset<property_name>" which resets just one
> >>property; this patch makes reset work with "all" instead of a
> >>property name too.
> >>
> >>I can certainly add something to the GUI, but that would be another patch.
> >>
> >
> >Please do.
> >
>
> The attached patch adds a GUI method to accomplish this. However, I
> am not sure if adding this is needed (the change in command line
Well, most people are going to use the tool through the system menu and
will probably never try to run it from commandline or see the help
menu.. so it is definitely needed assuming we want to provide this
functionality to users.
> from reset foo to reset all is simple to use/understand, but there
> is no analogue in the GUI) . I certainly dont think adding it in a
> new tab is the right place. Any ideas?
>
Agreed re: no new tab. We can create a Misc. settings panel where this
and other such "doesn't fit anywhere" options go. Though I am not a big
fan of that idea either :/
Deepak
> Thanks,
> Omair
> diff -r c4b91b61f88e ChangeLog
> --- a/ChangeLog Mon Feb 28 17:29:31 2011 -0500
> +++ b/ChangeLog Tue Mar 01 12:19:12 2011 -0500
> @@ -1,3 +1,13 @@
> +2011-03-01 OMair Majid <omajid at redhat.com>
> +
> + * netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
> + (createMainSettingsPanel): Add new tab.
> + (createResetSettingsPanel): New method.
> + * netx/net/sourceforge/jnlp/controlpanel/ResetSettingsPanel.java: New
> + file.
> + * netx/net/sourceforge/jnlp/resources/Messages.properties: Add CPTabReset,
> + CPResetButton, CPResetLabel, CPResetPromptQuestion and CPResetPromptTitle.
> +
> 2011-02-28 Omair Majid <omajid at redhat.com>
>
> * netx/net/sourceforge/jnlp/controlpanel/CommandLine.java
> diff -r c4b91b61f88e netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
> --- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Mon Feb 28 17:29:31 2011 -0500
> +++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Tue Mar 01 12:19:12 2011 -0500
> @@ -226,7 +226,9 @@
> new SettingsPanel(Translator.R("CPTabDesktopIntegration"), createDesktopSettingsPanel()),
> new SettingsPanel(Translator.R("CPTabNetwork"), createNetworkSettingsPanel()),
> new SettingsPanel(Translator.R("CPTabRuntimes"), createRuntimesSettingsPanel()),
> - new SettingsPanel(Translator.R("CPTabSecurity"), createSecuritySettingsPanel()), };
> + new SettingsPanel(Translator.R("CPTabSecurity"), createSecuritySettingsPanel()),
> + new SettingsPanel(Translator.R("CPTabReset"), createResetSettingsPanel()),
> + };
>
> // Add panels.
> final JPanel settingsPanel = new JPanel(new CardLayout());
> @@ -302,6 +304,10 @@
> return new SecuritySettingsPanel(this.config);
> }
>
> + private JPanel createResetSettingsPanel() {
> + return new ResetSettingsPanel(this, config);
> + }
> +
> /**
> * This is a placeholder panel.
> *
> diff -r c4b91b61f88e netx/net/sourceforge/jnlp/controlpanel/ResetSettingsPanel.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/netx/net/sourceforge/jnlp/controlpanel/ResetSettingsPanel.java Tue Mar 01 12:19:12 2011 -0500
> @@ -0,0 +1,102 @@
> +/* ResetSettingsPanel.java -- Reset all settings.
> +Copyright (C) 2011 Red Hat
> +
> +This program is free software; you can redistribute it and/or modify
> +it under the terms of the GNU General Public License as published by
> +the Free Software Foundation; either version 2 of the License, or
> +(at your option) any later version.
> +
> +This program is distributed in the hope that it will be useful, but
> +WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with this program; if not, write to the Free Software
> +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> + */
> +
> +package net.sourceforge.jnlp.controlpanel;
> +
> +import static net.sourceforge.jnlp.runtime.Translator.R;
> +
> +import java.awt.Component;
> +import java.awt.Dimension;
> +import java.awt.GridBagConstraints;
> +import java.awt.GridBagLayout;
> +import java.awt.event.ActionEvent;
> +import java.awt.event.ActionListener;
> +import java.io.IOException;
> +import java.util.Map;
> +
> +import javax.swing.Box;
> +import javax.swing.JButton;
> +import javax.swing.JLabel;
> +import javax.swing.JOptionPane;
> +import javax.swing.JPanel;
> +
> +import net.sourceforge.jnlp.config.DeploymentConfiguration;
> +import net.sourceforge.jnlp.config.Setting;
> +
> +public class ResetSettingsPanel extends JPanel {
> +
> + private static final long serialVersionUID = 1385445234966873602L;
> + private final DeploymentConfiguration config;
> + private final ControlPanel parent;
> +
> + public ResetSettingsPanel(ControlPanel parent, DeploymentConfiguration config) {
> + this.config = config;
> + this.parent = parent;
> + addComponents();
> +
> + }
> +
> + private void addComponents() {
> +
> + GridBagLayout gbl = new GridBagLayout();
> + setLayout(gbl);
> +
> + GridBagConstraints c = new GridBagConstraints();
> + c.anchor = GridBagConstraints.LINE_START;
> +
> + JLabel resetLable = new JLabel(R("CPResetLabel"));
> + add(resetLable, c);
> +
> + JButton resetButton = new JButton(R("CPResetButton"));
> + resetButton.addActionListener(new ActionListener() {
> + @Override
> + public void actionPerformed(ActionEvent e) {
> + int selection = JOptionPane.showConfirmDialog(parent,
> + R("CPResetPromptQuestion"),
> + R("CPResetPromptTitle"),
> + JOptionPane.YES_NO_OPTION,
> + JOptionPane.QUESTION_MESSAGE);
> + if (selection == JOptionPane.YES_OPTION) {
> + Map<String, Setting<String>> raw = config.getRaw();
> + for (String key : raw.keySet()) {
> + raw.get(key).setValue(raw.get(key).getDefaultValue());
> + }
> + try {
> + config.save();
> + } catch (IOException e1) {
> + e1.printStackTrace();
> + }
> +
> + System.exit(0);
> + }
> + }
> + });
> +
> + add(resetButton, c);
> +
> + // Filler to pack the bottom of the panel.
> + Component filler = Box.createRigidArea(new Dimension(1, 1));
> + c.anchor = GridBagConstraints.CENTER;
> + c.fill = GridBagConstraints.BOTH;
> + c.gridy = 1;
> + c.gridx = 0;
> + c.weighty = 1;
> + c.weightx = 1;
> + add(filler, c);
> + }
> +}
> diff -r c4b91b61f88e netx/net/sourceforge/jnlp/resources/Messages.properties
> --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Feb 28 17:29:31 2011 -0500
> +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Mar 01 12:19:12 2011 -0500
> @@ -300,6 +300,7 @@
> CPTabNetwork=Network
> CPTabRuntimes=Runtimes
> CPTabSecurity=Security
> +CPTabReset=Reset
>
> # Control Panel - AboutPanel
> CPAboutInfo=This is the control panel for setting deployments.properties.<br/>Not all options will take effect until implemented.<br/>The use of multiple JREs is currently unsupported.<br/>
> @@ -392,6 +393,12 @@
> CVCPColType=Type
> CVCPColPath=Path
> CVCPColName=Name
> +
> +# Control Panel - Reset panel
> +CPResetButton=Reset...
> +CPResetLabel=Restore configuration to defaults
> +CPResetPromptQuestion=This will reset all settings to their defaults and exit.\n Are you sure you want to continue?
> +CPResetPromptTitle=Reset all?
>
> # Control Panel - Misc.
> CPJRESupport=IcedTea-Web currently does not support the use of multiple JREs.
More information about the distro-pkg-dev
mailing list