[RFC][icedtea-web]: Adding control panel to icedtea-web
Dr Andrew John Hughes
ahughes at redhat.com
Fri Nov 26 19:27:52 PST 2010
On 16:11 Fri 26 Nov , Andrew Su wrote:
> Hello,
>
> I have attached a patch to add a control panel for icedtea-web. This can be used to modify deployments.properties.
>
> Current features:
> - Enable/Disable caching.
> - Set cache location.
> - Set max space cache may use. (in MB)
> - Set compression level of jar files.
> - Import/View/Export/Remove certificates.
> - Turn tracing on/off.
> - Turn debugging on/off.
> - Set behaviour of Java Console.
> - Set whether to create desktop shortcut for javaws or not.
> - Set proxy settings.
> - Set how security warning behaviours.
>
> ChangeLog:
>
> * Makefile.am:
> (CONTROLPANEL_DIR): Build directory for control panel.
> (CONTROLPANEL_SRCDIR): Source directory for control panel.
> (CONTROLPANEL_LAUNCHER_OBJECTS): Objects used to compile binary
> control panel.
> (all-local): Add stamps/controlpanel-dist.stamp
> stamps/controlpanel.stamp $(CONTROLPANEL_DIR)/launcher/controlpanel.
> (clean-local): Add clean-controlpanel.
> (install-exec-local): Install the control panel jar file and control
> panel binary.
> (uninstall-local): Delete controlpanel.jar and controlpanel binary
> from installed location.
> (controlpanel-source-files.txt): Get the list of source files for
> control panel.
> (stamps/controlpanel.stamp): Compile the java files for control panel.
> (stamps/controlpanel-dist.stamp): Depend on stamps/controlpanel.stamp.
> Create the jar file for control panel.
> ($(CONTROLPANEL_DIR)/launcher/%.o): Create the launcher objects.
> ($(CONTROLPANEL_DIR)/launcher/controlpanel): Link the objects to make
> the launcher.
> (clean-controlpanel): Remove the compiled control panel.
> (controlpanel): Calls stamps/controlpanel.stamp.
> (controlpanel-dist): Calls stamps/controlpanel-dist.stamp.
> * controlpanel/org/classpath/controlpanel/AboutPanel.java,
> * controlpanel/org/classpath/controlpanel/ComboItem.java,
> * controlpanel/org/classpath/controlpanel/ControlPanel.java,
> * controlpanel/org/classpath/controlpanel/DebuggingPanel.java,
> * controlpanel/org/classpath/controlpanel/DesktopShortcutPanel.java,
> * controlpanel/org/classpath/controlpanel/JREPanel.java,
> * controlpanel/org/classpath/controlpanel/NamedBorderPanel.java,
> * controlpanel/org/classpath/controlpanel/SecuritySettingsPanel.java,
> * controlpanel/org/classpath/controlpanel/TemporaryInternetFilesPanel.java,
> * controlpanel/org/classpath/controlpanel/network/AdvancedProxySettingsDialog.java,
> * controlpanel/org/classpath/controlpanel/network/AdvancedProxySettingsPane.java,
> * controlpanel/org/classpath/controlpanel/network/NetworkSettingsPanel.java,
> * controlpanel/org/classpath/controlpanel/security/viewer/CertificatePane.java,
> * controlpanel/org/classpath/controlpanel/security/viewer/CertificateViewer.java,
> * controlpanel/org/classpath/controlpanel/translator/Translator.java:
> New classes. All methods are new as well.
> * netx/net/sourceforge/jnlp/resources/Messages.properties: Added
> messages for control panel.
>
> Comments? Question? Concerns?
>
> Cheers,
> Andrew
Further comments inline but why does this need to introduce a completely new source tree
and jar? Could it not just be part of the NetX trees?
As others have said, you need proper copyright notices, authorship and org.classpath.icedtea
as a package prefix if you insist on using a new hierarchy.
You also need to add documentation targets -- another reason to use the netx trees if possible
so you can just add a package rather than additional targets.
> diff -r 243ab4185293 ChangeLog
> --- a/ChangeLog Fri Nov 26 15:21:56 2010 +0000
> +++ b/ChangeLog Fri Nov 26 15:58:55 2010 -0500
> @@ -1,3 +1,47 @@
> +2010-11-26 Andrew Su <asu at redhat.com>
> +
> + * Makefile.am:
> + (CONTROLPANEL_DIR): Build directory for control panel.
> + (CONTROLPANEL_SRCDIR): Source directory for control panel.
> + (CONTROLPANEL_LAUNCHER_OBJECTS): Objects used to compile binary
> + control panel.
> + (all-local): Add stamps/controlpanel-dist.stamp
> + stamps/controlpanel.stamp $(CONTROLPANEL_DIR)/launcher/controlpanel.
> + (clean-local): Add clean-controlpanel.
> + (install-exec-local): Install the control panel jar file and control
> + panel binary.
> + (uninstall-local): Delete controlpanel.jar and controlpanel binary
> + from installed location.
> + (controlpanel-source-files.txt): Get the list of source files for
> + control panel.
> + (stamps/controlpanel.stamp): Compile the java files for control panel.
> + (stamps/controlpanel-dist.stamp): Depend on stamps/controlpanel.stamp.
> + Create the jar file for control panel.
> + ($(CONTROLPANEL_DIR)/launcher/%.o): Create the launcher objects.
> + ($(CONTROLPANEL_DIR)/launcher/controlpanel): Link the objects to make
> + the launcher.
> + (clean-controlpanel): Remove the compiled control panel.
> + (controlpanel): Calls stamps/controlpanel.stamp.
> + (controlpanel-dist): Calls stamps/controlpanel-dist.stamp.
> + * controlpanel/org/classpath/controlpanel/AboutPanel.java,
> + * controlpanel/org/classpath/controlpanel/ComboItem.java,
> + * controlpanel/org/classpath/controlpanel/ControlPanel.java,
> + * controlpanel/org/classpath/controlpanel/DebuggingPanel.java,
> + * controlpanel/org/classpath/controlpanel/DesktopShortcutPanel.java,
> + * controlpanel/org/classpath/controlpanel/JREPanel.java,
> + * controlpanel/org/classpath/controlpanel/NamedBorderPanel.java,
> + * controlpanel/org/classpath/controlpanel/SecuritySettingsPanel.java,
> + * controlpanel/org/classpath/controlpanel/TemporaryInternetFilesPanel.java,
> + * controlpanel/org/classpath/controlpanel/network/AdvancedProxySettingsDialog.java,
> + * controlpanel/org/classpath/controlpanel/network/AdvancedProxySettingsPane.java,
> + * controlpanel/org/classpath/controlpanel/network/NetworkSettingsPanel.java,
> + * controlpanel/org/classpath/controlpanel/security/viewer/CertificatePane.java,
> + * controlpanel/org/classpath/controlpanel/security/viewer/CertificateViewer.java,
> + * controlpanel/org/classpath/controlpanel/translator/Translator.java:
> + New classes. All methods are new as well.
> + * netx/net/sourceforge/jnlp/resources/Messages.properties: Added
> + messages for control panel.
> +
> 2010-11-25 Andrew John Hughes <ahughes at redhat.com>
>
> * Makefile.am:
> @@ -566,7 +610,7 @@
> 2010-10-27 Omair Majid <omajid at redhat.com>
>
> * netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java
> - (load): Do a security check at start. A security exception later on may
> + (load): Do a security check at start. * security exception later on may
> accidentally reveal a filename or a system property.
> (save): Likewise.
>
> diff -r 243ab4185293 Makefile.am
> --- a/Makefile.am Fri Nov 26 15:21:56 2010 +0000
> +++ b/Makefile.am Fri Nov 26 15:58:55 2010 -0500
> @@ -4,6 +4,8 @@
> NETX_SRCDIR = $(abs_top_srcdir)/netx
> NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
> NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources
> +CONTROLPANEL_DIR=$(abs_top_builddir)/controlpanel.build
> +CONTROLPANEL_SRCDIR=$(abs_top_srcdir)/controlpanel
>
> # Build directories
>
> @@ -74,6 +76,7 @@
> LAUNCHER_OBJECTS = java.o java_md.o splashscreen_stubs.o
> PLUGIN_LAUNCHER_OBJECTS = $(addprefix $(PLUGIN_DIR)/launcher/,$(LAUNCHER_OBJECTS))
> NETX_LAUNCHER_OBJECTS = $(addprefix $(NETX_DIR)/launcher/,$(LAUNCHER_OBJECTS))
> +CONTROLPANEL_LAUNCHER_OBJECTS = $(addprefix $(CONTROLPANEL_DIR)/launcher/,$(LAUNCHER_OBJECTS))
> LAUNCHER_FLAGS = -O2 -fno-strict-aliasing -fPIC -pthread -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer \
> -g -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -DLAUNCHER_NAME='"java"' -I$(LAUNCHER_SRCDIR) \
> -DJDK_MAJOR_VERSION='"1"' -DJDK_MINOR_VERSION='"6"' -DLIBARCHNAME='"$(JRE_ARCH_DIR)"'
> @@ -89,13 +92,15 @@
> # =================
>
> all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp $(NETX_DIR)/launcher/javaws \
> - javaws.desktop stamps/docs.stamp
> + javaws.desktop stamps/docs.stamp stamps/controlpanel-dist.stamp stamps/controlpanel.stamp \
> + $(CONTROLPANEL_DIR)/launcher/controlpanel
>
You don't need stamps/controlpanel.stamp here as it's a dependency of controlpanel-dist.stamp.
> clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory \
> - clean-native-ecj clean-desktop-files clean-docs
> + clean-native-ecj clean-desktop-files clean-docs clean-controlpanel
>
> .PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \
> - clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs
> + clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs \
> + clean-controlpanel
>
> install-exec-local:
> mkdir -p $(DESTDIR)$(bindir)
> @@ -108,6 +113,8 @@
> cp -pPRf $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(prefix)/jre/lib/netx.jar
> cp -pPRf $(NETX_DIR)/launcher/javaws $(DESTDIR)$(bindir)
> cp extra-lib/about.jar $(DESTDIR)$(prefix)/jre/lib
> + cp -pPRf $(CONTROLPANEL_DIR)/lib/classes.jar $(DESTDIR)$(prefix)/jre/lib/controlpanel.jar
> + cp -pPRf $(CONTROLPANEL_DIR)/launcher/controlpanel $(DESTDIR)$(bindir)
>
You'll need to modify these as I have in my forthcoming dist patch.
Again, why do we need a separate jar for this?
> install-data-local:
> mkdir -p $(DESTDIR)$(prefix)/man/man1
> @@ -127,9 +134,11 @@
> rm -f $(DESTDIR)$(prefix)/jre/lib/netx.jar
> rm -f $(DESTDIR)$(prefix)/jre/lib/about.jnlp
> rm -f $(DESTDIR)$(prefix)/jre/lib/about.jar
> + rm -f $(DESTDIR)$(prefix)/jre/lib/controlpanel.jar
> rm -f $(DESTDIR)$(prefix)/man/man1/javaws.1
> rm -f $(DESTDIR)$(bindir)/pluginappletviewer
> rm -f $(DESTDIR)$(bindir)/javaws
> + rm -f $(DESTDIR)$(bindir)/controlpanel
>
> # Plugin
>
> @@ -309,6 +318,48 @@
> javaws.desktop: javaws.desktop.in
> sed "s#PATH_TO_JAVAWS#$(DESTDIR)$(bindir)/javaws#" < $(srcdir)/javaws.desktop.in > javaws.desktop
>
> +# Control Panel
> +# Requires some netx functionality to use.
> +controlpanel-source-files.txt:
> + find $(CONTROLPANEL_SRCDIR) -name '*.java' | sort > $@
> +
> +stamps/controlpanel.stamp: controlpanel-source-files.txt stamps/bootstrap-directory.stamp
> + mkdir -p $(CONTROLPANEL_DIR)
> + $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
> + -d $(CONTROLPANEL_DIR) \
> + -classpath $(NETX_DIR) \
> + -sourcepath $(CONTROLPANEL_SRCDIR) \
> + -bootclasspath $(RUNTIME) \
> + @controlpanel-source-files.txt
> + mkdir -p stamps
> + touch $@
> +
> +stamps/controlpanel-dist.stamp: stamps/controlpanel.stamp
> + (cd $(CONTROLPANEL_DIR) ; \
> + mkdir -p lib ; \
> + $(BOOT_DIR)/bin/jar cf lib/classes.jar org ; \
> + cp -pPR $(SRC_DIR_LINK) $(CONTROLPANEL_SRCDIR) src; \
> + find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
> + cd src ; \
> + $(ZIP) -qr $(CONTROLPANEL_DIR)/lib/src.zip org )
> + mkdir -p stamps
> + touch $@
> +
> +$(CONTROLPANEL_DIR)/launcher/%.o: $(LAUNCHER_SRCDIR)/%.c
> + mkdir -p $(CONTROLPANEL_DIR)/launcher && \
> + $(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "-Xbootclasspath/a:$(DESTDIR)$(prefix)/jre/lib/controlpanel.jar", "-J-ms8m", "org.classpath.controlpanel.ControlPanel", }' -DPROGNAME="controlpanel" \
> + -c -o $@ $<
> +
The need for this to be on the bootclasspath is worrying. Is there not a more correct way around the security exception?
Also, maybe line break this better?
> +$(CONTROLPANEL_DIR)/launcher/controlpanel: $(CONTROLPANEL_LAUNCHER_OBJECTS)
> + mkdir -p launcher
> + $(CC) $(CONTROLPANEL_LAUNCHER_OBJECTS) $(LAUNCHER_LINK)
> +
> +clean-controlpanel:
> + rm -rf $(CONTROLPANEL_DIR)
> + rm -f stamps/controlpanel-dist.stamp
> + rm -f controlpanel-source-files.txt
> + rm -f stamps/controlpanel.stamp
> +
> # documentation
>
> stamps/docs.stamp: stamps/netx-docs.stamp stamps/plugin-docs.stamp
> @@ -425,6 +476,10 @@
>
> add-netx-debug: stamps/add-netx-debug.stamp
>
> +controlpanel: stamps/controlpanel.stamp
> +
> +controlpanel-dist: stamps/controlpanel-dist.stamp
> +
> netx: stamps/netx.stamp
>
> netx-dist: stamps/netx-dist.stamp
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/AboutPanel.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/AboutPanel.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,44 @@
> +package org.classpath.controlpanel;
> +
> +import java.awt.Component;
> +import java.awt.Dimension;
> +import java.awt.GridBagConstraints;
> +import java.awt.GridBagLayout;
> +
> +import javax.swing.Box;
> +import javax.swing.JLabel;
> +
> +import org.classpath.controlpanel.translator.Translator;
> +
> +/**
> + * This class provides a GUI interface which shows some basic information on
> + * this project.
> + *
> + * @author asu
> + *
> + */
> + at SuppressWarnings("serial")
> +public class AboutPanel extends NamedBorderPanel {
> +
> + public AboutPanel() {
> + super(Translator.R("CPHeadAbout"), new GridBagLayout());
> + GridBagConstraints c = new GridBagConstraints();
> + c.fill = GridBagConstraints.BOTH;
> + c.gridy = 0;
> +
> + JLabel logo = new JLabel();
> + JLabel aboutLabel = new JLabel("<html>" + Translator.R("CPAboutInfo") + "</html>");
> +
> + c.gridx = 0;
> + c.weighty = 0;
> + c.weightx = 0;
> + add(logo, c);
> + c.gridx = 1;
> + c.weightx = 1;
> + add(aboutLabel, c);
> + Component filler = Box.createRigidArea(new Dimension(1, 1));
> + c.weighty = 1;
> + c.gridy++;
> + add(filler, c);
> + }
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/ComboItem.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/ComboItem.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,28 @@
> +package org.classpath.controlpanel;
> +
> +public class ComboItem {
> + String text = null;
> + private String property;
> + private String value;
> +
> + public ComboItem(String text, String value) {
> + this.text = text;
> + this.value = value;
> + }
> +
> + public String toString() {
> + return this.text;
> + }
> +
> + public void setProperty(String property) {
> + this.property = property;
> + }
> +
> + public String getProperty() {
> + return this.property;
> + }
> +
> + public String getValue() {
> + return this.value;
> + }
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/ControlPanel.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/ControlPanel.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,291 @@
> +package org.classpath.controlpanel;
> +
> +import static net.sourceforge.jnlp.runtime.Translator.R;
> +
> +import java.awt.BorderLayout;
> +import java.awt.CardLayout;
> +import java.awt.Dimension;
> +import java.awt.FlowLayout;
> +import java.awt.GridLayout;
> +import java.awt.Image;
> +import java.awt.event.ActionEvent;
> +import java.awt.event.ActionListener;
> +import java.awt.event.MouseEvent;
> +import java.awt.event.MouseListener;
> +import java.io.IOException;
> +import java.net.URL;
> +import java.security.AccessController;
> +import java.security.PrivilegedAction;
> +import java.util.ArrayList;
> +import java.util.Arrays;
> +import java.util.List;
> +
> +import javax.imageio.ImageIO;
> +import javax.naming.ConfigurationException;
> +import javax.swing.ImageIcon;
> +import javax.swing.JButton;
> +import javax.swing.JCheckBox;
> +import javax.swing.JComboBox;
> +import javax.swing.JFrame;
> +import javax.swing.JLabel;
> +import javax.swing.JList;
> +import javax.swing.JPanel;
> +import javax.swing.JScrollPane;
> +import javax.swing.SwingConstants;
> +import javax.swing.SwingUtilities;
> +import javax.swing.UIManager;
> +import javax.swing.WindowConstants;
> +import javax.swing.border.EmptyBorder;
> +import javax.swing.event.ListSelectionEvent;
> +import javax.swing.event.ListSelectionListener;
> +
> +import org.classpath.controlpanel.network.NetworkSettingsPanel;
> +import org.classpath.controlpanel.security.viewer.CertificatePane;
> +import org.classpath.controlpanel.translator.Translator;
> +
> +import net.sourceforge.jnlp.LaunchException;
> +import net.sourceforge.jnlp.Launcher;
> +import net.sourceforge.jnlp.cache.UpdatePolicy;
> +import net.sourceforge.jnlp.runtime.Boot;
> +import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
> +import net.sourceforge.jnlp.runtime.JNLPRuntime;
> +
> + at SuppressWarnings( { "unused", "serial" })
> +public class ControlPanel extends JFrame {
> +
> + private class SettingsPanel {
> + final String value;
> + final JPanel panel;
> +
> + public SettingsPanel(String value, JPanel panel) {
> + this.value = value;
> + this.panel = panel;
> + }
> +
> + public JPanel getPanel() {
> + return panel;
> + }
> +
> + public String toString() {
> + return value;
> + }
> + }
> +
> + private DeploymentConfiguration config = null;
> +
> + /*
> + * actual configuration options
> + */
> + private String configBrowserCommand = null;
> +
> + public ControlPanel(DeploymentConfiguration config) {
> + super();
> + setTitle(Translator.R("CPHead"));
> +
> + this.config = config;
> +
> + JPanel mainPanel = createMainSettingsPanel();
> + JPanel buttonPanel = createButtonPanel();
> +
> + add(mainPanel, BorderLayout.CENTER);
> + add(buttonPanel, BorderLayout.SOUTH);
> + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
> + pack();
> + setMinimumSize(getPreferredSize());
> + setResizable(false);
> + }
> +
> + private JPanel createButtonPanel() {
> + JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.TRAILING));
> +
> + List<JButton> buttons = new ArrayList<JButton>();
> +
> + JButton okButton = new JButton(Translator.R("ButOk"));
> + okButton.addActionListener(new ActionListener() {
> + @Override
> + public void actionPerformed(ActionEvent e) {
> + ControlPanel.this.saveConfiguration();
> + ControlPanel.this.dispose();
> + }
> + });
> + buttons.add(okButton);
> +
> + JButton applyButton = new JButton(Translator.R("ButApply"));
> + applyButton.addActionListener(new ActionListener() {
> + @Override
> + public void actionPerformed(ActionEvent e) {
> + ControlPanel.this.saveConfiguration();
> + }
> + });
> + buttons.add(applyButton);
> +
> + JButton cancelButton = new JButton(Translator.R("ButCancel"));
> + cancelButton.addActionListener(new ActionListener() {
> + @Override
> + public void actionPerformed(ActionEvent e) {
> + ControlPanel.this.dispose();
> + }
> + });
> + buttons.add(cancelButton);
> +
> + int maxWidth = 0;
> + int maxHeight = 0;
> + for (JButton button : buttons) {
> + maxWidth = Math.max(button.getMinimumSize().width, maxWidth);
> + maxHeight = Math.max(button.getMinimumSize().height, maxHeight);
> + }
> +
> + int wantedWidth = maxWidth + 10;
> + int wantedHeight = maxHeight + 2;
> + for (JButton button : buttons) {
> + button.setPreferredSize(new Dimension(wantedWidth, wantedHeight));
> + buttonPanel.add(button);
> + }
> +
> + return buttonPanel;
> + }
> +
> + private JPanel createMainSettingsPanel() {
> +
> + loadConfiguration();
> +
> + SettingsPanel[] panels = new SettingsPanel[] { new SettingsPanel(Translator.R("CPTabAbout"), createAboutPanel()),
> + new SettingsPanel(Translator.R("CPTabCache"), createCacheSettingsPanel()),
> + new SettingsPanel(Translator.R("CPTabCertificate"), createCertificatesSettingsPanel()),
> +// new SettingsPanel(Translator.R("CPTabClassLoader"), createClassLoaderSettingsPanel()),
> + new SettingsPanel(Translator.R("CPTabDebugging"), createDebugSettingsPanel()),
> + new SettingsPanel(Translator.R("CPTabDesktopIntegration"), createDesktopSettingsPanel()),
> + new SettingsPanel(Translator.R("CPTabNetwork"), createNetworkSettingsPanel()),
> + new SettingsPanel(Translator.R("CPTabRuntimes"), createRuntimesSettingsPanel()),
> + new SettingsPanel(Translator.R("CPTabSecurity"), createSecuritySettingsPanel()), };
> +
> + final JPanel settingsPanel = new JPanel(new CardLayout());
> + for (SettingsPanel panel : panels) {
> + JPanel p = panel.getPanel();
> + p.setPreferredSize(new Dimension(530, 360));
> + settingsPanel.add(p, panel.toString());
> + }
> +
> + final JList settingsList = new JList(panels);
> + settingsList.addListSelectionListener(new ListSelectionListener() {
> + @Override
> + public void valueChanged(ListSelectionEvent e) {
> + JList list = (JList) e.getSource();
> + SettingsPanel panel = (SettingsPanel) list.getSelectedValue();
> + CardLayout cl = (CardLayout) settingsPanel.getLayout();
> + cl.show(settingsPanel, panel.toString());
> + }
> + });
> + JScrollPane settingsListScrollPane = new JScrollPane(settingsList);
> + settingsListScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
> +
> + final JPanel settingsDetailPanel = new JPanel();
> + settingsDetailPanel.setLayout(new BorderLayout());
> + settingsDetailPanel.add(settingsPanel, BorderLayout.CENTER);
> + settingsDetailPanel.setBorder(new EmptyBorder(0, 10, -3, 0));
> +
> + JPanel mainPanel = new JPanel();
> + mainPanel.setLayout(new BorderLayout());
> + mainPanel.add(settingsListScrollPane, BorderLayout.LINE_START);
> + mainPanel.add(settingsDetailPanel, BorderLayout.CENTER);
> + mainPanel.setBorder(new EmptyBorder(10, 10, 10, 10));
> +
> + settingsList.setSelectedIndex(0);
> +
> + return mainPanel;
> + }
> +
> + private JPanel createAboutPanel() {
> + return new AboutPanel();
> + }
> +
> + private JPanel createCacheSettingsPanel() {
> + return new TemporaryInternetFilesPanel(this.config);
> + }
> +
> + private JPanel createCertificatesSettingsPanel() {
> + JPanel p = new NamedBorderPanel(Translator.R("CPHeadCertificates"), new BorderLayout());
> + p.add(new CertificatePane(null), BorderLayout.CENTER);
> + return p;
> + }
> +
> + private JPanel createClassLoaderSettingsPanel() {
> + return createNotImplementedPanel();
> + }
> +
> + private JPanel createDebugSettingsPanel() {
> + return new DebuggingPanel(this.config);
> + }
> +
> + private JPanel createDesktopSettingsPanel() {
> + return new DesktopShortcutPanel(this.config);
> + }
> +
> + private JPanel createNetworkSettingsPanel() {
> + return new NetworkSettingsPanel(this.config);
> + }
> +
> + private JPanel createRuntimesSettingsPanel() {
> + return new JREPanel();
> + }
> +
> + private JPanel createSecuritySettingsPanel() {
> + return new SecuritySettingsPanel(this.config);
> + }
> +
> + /**
> + * This is a placeholder panel.
> + *
> + * @return
> + */
> + private JPanel createNotImplementedPanel() {
> +
> + JPanel notImplementedPanel = new NamedBorderPanel("Unimplemented");
> + notImplementedPanel.setLayout(new BorderLayout());
> +
> + URL imgUrl = getClass().getClassLoader().getResource("net/sourceforge/jnlp/resources/warning.png");
> + Image img;
> + try {
> + img = ImageIO.read(imgUrl);
> + ImageIcon icon = new ImageIcon(img);
> + JLabel label = new JLabel("Not Implemented", icon, SwingConstants.CENTER);
> + notImplementedPanel.add(label);
> + } catch (IOException e) {
> + e.printStackTrace();
> + }
> + return notImplementedPanel;
> + }
> +
> + private void loadConfiguration() {
> + configBrowserCommand = config.getProperty("deployment.browser.path");
> + if (configBrowserCommand == null) {
> + configBrowserCommand = "";
> + }
> + }
> +
> + private void saveConfiguration() {
> + try {
> + config.save();
> + } catch (IOException e) {
> + e.printStackTrace();
> + }
> + }
> +
> + public static void main(String[] args) throws Exception {
> + JNLPRuntime.initialize(true);
> + final DeploymentConfiguration config = JNLPRuntime.getConfiguration();
> + try {
> + config.load();
> + } catch (ConfigurationException e) {
> + // TODO Auto-generated catch block
> + e.printStackTrace();
> + }
> + SwingUtilities.invokeLater(new Runnable() {
> + @Override
> + public void run() {
> + final ControlPanel editor = new ControlPanel(config);
> + editor.setVisible(true);
> + }
> + });
> + }
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/DebuggingPanel.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/DebuggingPanel.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,115 @@
> +package org.classpath.controlpanel;
> +
> +import java.awt.Component;
> +import java.awt.Dimension;
> +import java.awt.FlowLayout;
> +import java.awt.GridBagConstraints;
> +import java.awt.GridBagLayout;
> +import java.awt.event.ItemEvent;
> +import java.awt.event.ItemListener;
> +import javax.swing.Box;
> +import javax.swing.JCheckBox;
> +import javax.swing.JComboBox;
> +import javax.swing.JLabel;
> +import javax.swing.JPanel;
> +
> +import org.classpath.controlpanel.translator.Translator;
> +
> +import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
> +
> + at SuppressWarnings("serial")
> +public class DebuggingPanel extends NamedBorderPanel implements ItemListener {
> +
> + /** List of properties used by this panel */
> + private String[] properties = { "deployment.trace", // Debugging
> + "deployment.log", // Debugging
> + "deployment.javapi.lifecycle.exception", // Debugging
> + "deployment.console.startup.mode", // Java Console
> + };
> + DeploymentConfiguration config;
> +
> + public DebuggingPanel(DeploymentConfiguration config) {
> + super(Translator.R("CPHeadDebugging"), new GridBagLayout());
> +
> + this.config = config;
> +
> + addComponents();
> + }
> +
> + private void addComponents() {
> + GridBagConstraints c = new GridBagConstraints();
> +
> + 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")) };
> +
> + ComboItem[] javaConsoleItems = { new ComboItem(Translator.R("DPDisable"), "DISABLE"),
> + new ComboItem(Translator.R("DPHide"), "HIDE"),
> + new ComboItem(Translator.R("DPShow"), "SHOW"), };
> +
> + JLabel consoleLabel = new JLabel(Translator.R("DPJavaConsole"));
> + JComboBox consoleComboBox = new JComboBox();
> +
> + JPanel consolePanel = new JPanel();
> + consolePanel.setLayout(new FlowLayout(FlowLayout.LEADING));
> + consolePanel.add(consoleLabel);
> + consolePanel.add(consoleComboBox);
> +
> + Component filler = Box.createRigidArea(new Dimension(1, 1));
> + c.fill = GridBagConstraints.BOTH;
> + c.weightx = 1;
> + c.gridx = 0;
> + c.gridy = 0;
> + add(debuggingDescription, c);
> +
> + for (int i = 0; i < properties.length; i++) {
> + try {
> + String s = config.getProperty(properties[i]);
> + c.gridy = i + 1;
> +
> + 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:
> + for (int j = 0; j < javaConsoleItems.length; j++) {
> + javaConsoleItems[j].setProperty("deployment.console.startup.mode");
> + consoleComboBox.addItem(javaConsoleItems[j]);
> + if (config.getProperty(javaConsoleItems[j].getProperty()).equals(javaConsoleItems[j].getValue())) consoleComboBox.setSelectedIndex(j);
> + }
> + consoleComboBox.addItemListener(this);
> + add(consolePanel, c);
> + }
> +
> + } catch (Exception e) {
> + debuggingOptions[i] = null;
> + }
> + }
> +
> + c.gridy = properties.length; // Pack the bottom
> + c.weighty = 1;
> + add(filler, c);
> + }
> +
> + @Override
> + public void itemStateChanged(ItemEvent e) {
> +
> + Object o = e.getSource();
> +
> + if (o instanceof JCheckBox) {
> + JCheckBox jcb = (JCheckBox) o;
> + config.setProperty(jcb.getActionCommand(), String.valueOf(jcb.isSelected()));
> + } else if (o instanceof JComboBox) {
> + ComboItem c = (ComboItem) e.getItem();
> + config.setProperty(c.getProperty(), c.getValue());
> + }
> +
> + }
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/DesktopShortcutPanel.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/DesktopShortcutPanel.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,67 @@
> +package org.classpath.controlpanel;
> +
> +import java.awt.Component;
> +import java.awt.Dimension;
> +import java.awt.GridBagConstraints;
> +import java.awt.GridBagLayout;
> +import java.awt.event.ItemEvent;
> +import java.awt.event.ItemListener;
> +
> +import javax.swing.Box;
> +import javax.swing.JComboBox;
> +import javax.swing.JLabel;
> +
> +import org.classpath.controlpanel.translator.Translator;
> +
> +import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
> +
> + at SuppressWarnings("serial")
> +public class DesktopShortcutPanel extends NamedBorderPanel implements ItemListener {
> +
> + private DeploymentConfiguration config;
> +
> + public DesktopShortcutPanel(DeploymentConfiguration config) {
> + super(Translator.R("CPHeadDesktopIntegration"), new GridBagLayout());
> + this.config = config;
> +
> + addComponents();
> + }
> +
> + private void addComponents() {
> + GridBagConstraints c = new GridBagConstraints();
> + JLabel description = new JLabel("<html>" + Translator.R("CPDesktopIntegrationDescription") + "<hr /></html>");
> + JComboBox shortcutComboOptions = new JComboBox();
> + ComboItem[] items = { new ComboItem(Translator.R("DSPNeverCreate"), "NEVER"),
> + new ComboItem(Translator.R("DSPAlwaysAllow"), "ALWAYS"),
> + new ComboItem(Translator.R("DSPAskUser"), "ASK_USER"),
> + new ComboItem(Translator.R("DSPAskIfHinted"), "ASK_IF_HINTED"),
> + new ComboItem(Translator.R("DSPAlwaysIfHinted"), "ALWAYS_IF_HINTED") };
> +
> + for (int j = 0; j < items.length; j++) {
> + items[j].setProperty("deployment.javaws.shortcut");
> + shortcutComboOptions.addItem(items[j]);
> + if (config.getProperty(items[j].getProperty()).equals(items[j].getValue())) shortcutComboOptions.setSelectedIndex(j);
> + }
> +
> + shortcutComboOptions.addItemListener(this);
> +
> + c.fill = GridBagConstraints.BOTH;
> + c.weightx = 1;
> + c.gridx = 0;
> +
> + c.gridy = 0;
> + add(description, c);
> + c.gridy = 1;
> + add(shortcutComboOptions, c);
> +
> + Component filler = Box.createRigidArea(new Dimension(1, 1));
> + c.weighty = 1;
> + c.gridy++;
> + add(filler, c);
> + }
> +
> + public void itemStateChanged(ItemEvent e) {
> + ComboItem c = (ComboItem) e.getItem();
> + config.setProperty(c.getProperty(), c.getValue());
> + }
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/JREPanel.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/JREPanel.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,44 @@
> +package org.classpath.controlpanel;
> +
> +import java.awt.BorderLayout;
> +import java.awt.FlowLayout;
> +
> +import javax.swing.JButton;
> +import javax.swing.JLabel;
> +import javax.swing.JPanel;
> +
> +import org.classpath.controlpanel.translator.Translator;
> +
> +
> +/**
> + * This panel is to allow access to setting the JRE but we currently do not
> + * support this.
> + *
> + * @author asu
> + *
> + */
> +public class JREPanel extends NamedBorderPanel {
> + /**
> + *
> + */
> + private static final long serialVersionUID = -712021664097515692L;
> +
> + public JREPanel() {
> + super(Translator.R("CPHeadJRESettings"));
> + setLayout(new BorderLayout());
> +
> + JLabel jreLabel = new JLabel("<html>" + Translator.R("CPJRESettingsDescription") + "<hr /></html>");
> + JButton viewButton = new JButton(Translator.R("CPButView"));
> + viewButton.setEnabled(false);
> +
> + JPanel jreButtonPanel = new JPanel();
> + jreButtonPanel.setLayout(new FlowLayout(FlowLayout.TRAILING));
> +
> + jreButtonPanel.add(viewButton);
> +
> + jreLabel = new JLabel("<html>" + Translator.R("CPJRESupport") + "</html>");
> + add(jreLabel, BorderLayout.NORTH);
> + // add(jreButtonPanel, BorderLayout.CENTER);
> +
> + }
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/NamedBorderPanel.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/NamedBorderPanel.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,28 @@
> +package org.classpath.controlpanel;
> +
> +import java.awt.LayoutManager;
> +
> +import javax.swing.BorderFactory;
> +import javax.swing.JPanel;
> +
> +/**
> + * This class provides the a panel that has a border with the name specified.
> + *
> + * @author asu
> + *
> + */
> + at SuppressWarnings("serial")
> +public class NamedBorderPanel extends JPanel {
> +
> + public NamedBorderPanel(String title, LayoutManager layout) {
> + this(title);
> + setLayout(layout);
> + }
> +
> + public NamedBorderPanel(String title) {
> + super();
> + setBorder(BorderFactory.createCompoundBorder(
> + BorderFactory.createTitledBorder(title),
> + BorderFactory.createEmptyBorder(5, 5, 5, 5)));
> + }
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/SecuritySettingsPanel.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/SecuritySettingsPanel.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,113 @@
> +package org.classpath.controlpanel;
> +import java.awt.BorderLayout;
> +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 javax.swing.Box;
> +import javax.swing.JCheckBox;
> +import javax.swing.JLabel;
> +import javax.swing.JPanel;
> +
> +import org.classpath.controlpanel.translator.Translator;
> +
> +import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
> +
> +/**
> + * This provides a way for the user to modify the security settings.
> + *
> + * @author asu
> + *
> + */
> + at SuppressWarnings("serial")
> +public class SecuritySettingsPanel extends NamedBorderPanel implements ActionListener {
> +
> + private DeploymentConfiguration config;
> +
> + // NOTE: All the ones listed with "Default" are in Oracle's implementation.
> + // Not shown on deployments.properties webpage. Add support for these later!
> + /** List of properties used by this panel */
> + private String[] properties = { "deployment.security.askgrantdialog.show",
> + "deployment.security.askgrantdialog.notinca",
> + "deployment.security.browser.keystore.use", // default TRUE
> + "deployment.security.clientauth.keystore.auto", // Default FALSE
> + "deployment.security.jsse.hostmismatch.warning",
> + "deployment.security.https.warning.show", // Default FALSE
> + "deployment.security.sandbox.awtwarningwindow",
> + "deployment.security.sandbox.jnlp.enhanced",
> + "deployment.security.validation.crl", // Default TRUE
> + "deployment.security.validation.ocsp", // Default FALSE
> + "deployment.security.pretrust.list", // Default TRUE
> + "deployment.security.blacklist.check", // Default TRUE
> + "deployment.security.password.cache", // Default TRUE
> + "deployment.security.SSLv2Hello", // Default FALSE
> + "deployment.security.SSLv3", // Default TRUE
> + "deployment.security.TLSv1", // Default TRUE
> +// "deployment.security.mixcode", // Default TRUE
> + };
> +
> + public SecuritySettingsPanel(DeploymentConfiguration config) {
> + super(Translator.R("CPHeadSecurity"), new BorderLayout());
> + this.config = config;
> +
> + addComponents();
> + }
> +
> + private void addComponents() {
> + JPanel topPanel = new JPanel(new GridBagLayout());
> + GridBagConstraints c = new GridBagConstraints();
> +
> + JLabel description = new JLabel("<html>" + Translator.R("CPSecurityDescription") + "<hr /></html>");
> +
> + JCheckBox[] securityGeneralOptions = { new JCheckBox(Translator.R("SGPAllowUserGrantSigned")),
> + new JCheckBox(Translator.R("SGPAllowUserGrantUntrust")),
> + new JCheckBox(Translator.R("SGpUseBrowserKeystore")),
> + new JCheckBox(Translator.R("SGPUsePersonalCertOneMatch")),
> + new JCheckBox(Translator.R("SGPWarnCertHostMismatch")),
> + new JCheckBox(Translator.R("SGPShowValid")),
> + new JCheckBox(Translator.R("SGPShowSandboxWarning")),
> + new JCheckBox(Translator.R("SGPAllowUserAcceptJNLPSecurityRequests")),
> + new JCheckBox(Translator.R("SGPCheckCertRevocationList")),
> + new JCheckBox(Translator.R("SGPEnableOnlineCertValidate")),
> + new JCheckBox(Translator.R("SGPEnableTrustedPublisherList")),
> + new JCheckBox(Translator.R("SGPEnableBlacklistRevocation")),
> + new JCheckBox(Translator.R("SGPEnableCachingPassword")),
> + new JCheckBox(Translator.R("SGPUseSSL2")),
> + new JCheckBox(Translator.R("SGPUseSSL3")),
> + new JCheckBox(Translator.R("SGPUseTLS1")), };
> +
> + c.fill = GridBagConstraints.BOTH;
> + c.gridx = 0;
> + c.weightx = 1;
> +
> + topPanel.add(description, c);
> +
> + for (int i = 0; i < properties.length; i++) {
> + try {
> + String s = config.getProperty(properties[i]);
> + securityGeneralOptions[i].setSelected(Boolean.parseBoolean(s));
> + securityGeneralOptions[i].setActionCommand(properties[i]);
> + securityGeneralOptions[i].addActionListener(this);
> + c.gridy = i + 1;
> + topPanel.add(securityGeneralOptions[i], c);
> + } catch (Exception e) {
> + securityGeneralOptions[i] = null;
> + }
> + }
> +
> + Component filler = Box.createRigidArea(new Dimension(1, 1));
> + c.weighty = 1;
> + c.gridy++;
> + topPanel.add(filler, c);
> +
> + add(topPanel, BorderLayout.CENTER);
> + }
> +
> + @Override
> + public void actionPerformed(ActionEvent e) {
> + config.setProperty(e.getActionCommand(), String.valueOf(((JCheckBox) e.getSource()).isSelected()));
> + }
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/TemporaryInternetFilesPanel.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/TemporaryInternetFilesPanel.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,230 @@
> +package org.classpath.controlpanel;
> +import java.awt.BorderLayout;
> +import java.awt.Dimension;
> +import java.awt.FlowLayout;
> +import java.awt.GridBagConstraints;
> +import java.awt.GridBagLayout;
> +import java.awt.event.ActionEvent;
> +import java.awt.event.ActionListener;
> +import java.awt.event.ItemEvent;
> +import java.awt.event.ItemListener;
> +import java.awt.event.KeyEvent;
> +import java.awt.event.KeyListener;
> +
> +import javax.naming.ConfigurationException;
> +import javax.swing.JButton;
> +import javax.swing.JCheckBox;
> +import javax.swing.JComboBox;
> +import javax.swing.JComponent;
> +import javax.swing.JDialog;
> +import javax.swing.JFileChooser;
> +import javax.swing.JLabel;
> +import javax.swing.JPanel;
> +import javax.swing.JSlider;
> +import javax.swing.JSpinner;
> +import javax.swing.JTextField;
> +import javax.swing.SpinnerNumberModel;
> +import javax.swing.event.ChangeEvent;
> +import javax.swing.event.ChangeListener;
> +
> +import org.classpath.controlpanel.translator.Translator;
> +
> +import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
> +
> +/**
> + * The actual panel that contains the fields that the user can edit accordingly.
> + * This is provided as a pane for inside the Panel itself, can also be used to
> + * display as a dialog.
> + *
> + * @author asu
> + *
> + */
> + at SuppressWarnings("serial")
> +public class TemporaryInternetFilesPanel extends NamedBorderPanel implements ChangeListener {
> +
> + private DeploymentConfiguration config;
> + private int minSize = -1;
> + private int maxSize = 1000;
> +
> + /** List of properties used by this panel */
> + private String[] properties = { "deployment.javapi.cache.enabled", // false == enabled
> + "deployment.user.cachedir",
> + "deployment.cache.max.size", // Specified in MB
> + "deployment.cache.jarcompression", // Allows values 0-9
> + };
> +
> + private JComponent defaultFocusComponent = null;
> + JSpinner spCacheSize;
> + JSlider slCacheSize;
> +
> + public TemporaryInternetFilesPanel(DeploymentConfiguration config) {
> + super(Translator.R("CPHeadTempInternetFiles"));
> + this.config = config;
> + setLayout(new BorderLayout());
> +
> + addComponents();
> + }
> +
> + private void addComponents() {
> + JPanel topPanel = new JPanel(new GridBagLayout());
> + GridBagConstraints c = new GridBagConstraints();
> + c.fill = GridBagConstraints.BOTH;
> +
> + JLabel description = new JLabel("<html>" + Translator.R("CPTempInternetFilesDescription") + "<hr /></html>");
> +
> + JCheckBox enableCaching = new JCheckBox(Translator.R("TIFPEnableCache"), !Boolean.parseBoolean(this.config.getProperty(properties[0])));
> + enableCaching.addItemListener(new ItemListener() {
> + @Override
> + public void itemStateChanged(ItemEvent e) {
> + config.setProperty(properties[0], String.valueOf(!(e.getStateChange() == ItemEvent.SELECTED)));
> + }
> + });
> + JPanel locationPanel = new NamedBorderPanel(Translator.R("TIFPLocation"), new GridBagLayout());
> + JLabel locationDescription = new JLabel(Translator.R("TIFPLocationLabel") + ":");
> + final JTextField location = new JTextField(this.config.getProperty(properties[1]));
> + location.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + config.setProperty(properties[1], location.getText());
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> + location.setEditable(false);
> + JButton bLocation = new JButton(Translator.R("TIFPChange") + "...");
> + bLocation.addActionListener(new ActionListener() {
> + @Override
> + public void actionPerformed(ActionEvent e) {
> + JFileChooser fileChooser = new JFileChooser();
> + fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
> + if (fileChooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
> + String result = fileChooser.getSelectedFile().getAbsolutePath();
> + location.setText(result);
> + config.setProperty(properties[1], result);
> + }
> + }
> +
> + });
> +
> + c.weightx = 1;
> + c.gridwidth = GridBagConstraints.REMAINDER;
> + c.gridx = 0;
> + c.gridy = 0;
> + locationPanel.add(locationDescription, c);
> + c.gridwidth = 1;
> + c.gridy = 1;
> + locationPanel.add(location, c);
> + c.gridx = 1;
> + c.weightx = 0;
> + locationPanel.add(bLocation, c);
> +
> + JPanel diskSpacePanel = new NamedBorderPanel(Translator.R("TIFPDiskSpace"), new GridBagLayout());
> + JLabel lCompression = new JLabel(Translator.R("TIFPCompressionLevel"));
> + ComboItem[] compressionOptions = { new ComboItem(Translator.R("TIFPNone"), "0"),
> + new ComboItem("1", "1"),
> + new ComboItem("2", "2"),
> + new ComboItem("3", "3"),
> + new ComboItem("4", "4"),
> + new ComboItem("5", "5"),
> + new ComboItem("6", "6"),
> + new ComboItem("7", "7"),
> + new ComboItem("8", "8"),
> + new ComboItem(Translator.R("TIFPMax"), "9"), };
> + JComboBox cbCompression = new JComboBox(compressionOptions);
> + cbCompression.setSelectedIndex(Integer.parseInt(this.config.getProperty(properties[3])));
> + cbCompression.addItemListener(new ItemListener() {
> +
> + @Override
> + public void itemStateChanged(ItemEvent e) {
> + config.setProperty(properties[3], ((ComboItem) e.getItem()).getValue());
> + }
> +
> + });
> + JLabel lCacheSize = new JLabel(Translator.R("TIFPCacheSize") + ":");
> + slCacheSize = new JSlider(minSize, maxSize, Integer.parseInt(this.config.getProperty(properties[2])));
> + slCacheSize.setMinorTickSpacing(50);
> + slCacheSize.setPaintTicks(true);
> + SpinnerNumberModel snmCacheSize = new SpinnerNumberModel(Integer.parseInt(this.config.getProperty(properties[2])), minSize, maxSize, 1);
> + spCacheSize = new JSpinner(snmCacheSize);
> +
> + slCacheSize.addChangeListener(this);
> + spCacheSize.addChangeListener(this);
> +
> + c.gridy = 0;
> + c.gridx = 0;
> + c.weightx = 1;
> + diskSpacePanel.add(lCompression, c);
> + c.gridx = 1;
> + c.weightx = 0;
> + diskSpacePanel.add(cbCompression, c);
> +
> + c.gridy = 1;
> + c.gridx = 0;
> + c.gridwidth = GridBagConstraints.REMAINDER;
> + c.weightx = 1;
> + diskSpacePanel.add(lCacheSize, c);
> + c.gridwidth = 1;
> + c.gridy = 2;
> + diskSpacePanel.add(slCacheSize, c);
> + c.gridx = 1;
> + diskSpacePanel.add(spCacheSize, c);
> +
> + JPanel buttonDeleteRestore = new JPanel(new FlowLayout(FlowLayout.TRAILING));
> + JButton bDelete = new JButton(Translator.R("TIFPDeleteFiles") + "...");
> + JButton bRestore = new JButton(Translator.R("TIFPResoreDefaults"));
> + //TODO: Add functionality to restore and delete. Also need to add a view button!
> + bDelete.setEnabled(false);
> + bRestore.setEnabled(false);
> + buttonDeleteRestore.add(bDelete);
> + buttonDeleteRestore.add(bRestore);
> +
> + c.weighty = 0;
> + c.gridx = 0;
> + c.gridy = 0;
> + topPanel.add(enableCaching, c);
> + c.gridy = 1;
> + topPanel.add(locationPanel, c);
> + c.gridy = 2;
> + topPanel.add(diskSpacePanel, c);
> + c.weighty = 1;
> + c.gridy = 3;
> + topPanel.add(buttonDeleteRestore, c);
> + add(description, BorderLayout.NORTH);
> + add(topPanel, BorderLayout.CENTER);
> + }
> +
> + public void focusOnDefaultButton() {
> + if (defaultFocusComponent != null) {
> + defaultFocusComponent.requestFocusInWindow();
> + }
> + }
> +
> + public static void main(String[] args) throws ConfigurationException {
> + final DeploymentConfiguration config = new DeploymentConfiguration();
> + config.load();
> + System.out.println("Adv Proxy Settings Test Dialog");
> + JDialog f = new JDialog();
> + f.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
> + f.setPreferredSize(new Dimension(500, 300));
> + TemporaryInternetFilesPanel apsp = new TemporaryInternetFilesPanel(config);
> + f.add(apsp);
> + f.pack();
> + f.setVisible(true);
> + }
> +
> + @Override
> + public void stateChanged(ChangeEvent e) {
> + Object o = e.getSource();
> + if (o instanceof JSlider)
> + spCacheSize.setValue(((JSlider) o).getValue());
> + else if (o instanceof JSpinner) slCacheSize.setValue((Integer) ((JSpinner) o).getValue());
> +
> + config.setProperty(properties[2], spCacheSize.getValue().toString());
> + }
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/network/AdvancedProxySettingsDialog.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/network/AdvancedProxySettingsDialog.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,103 @@
> +package org.classpath.controlpanel.network;
> +
> +import java.awt.Container;
> +import java.awt.Dimension;
> +import java.awt.Frame;
> +import java.awt.GridBagConstraints;
> +import java.awt.GridBagLayout;
> +import java.awt.Toolkit;
> +import java.awt.event.WindowAdapter;
> +import java.awt.event.WindowEvent;
> +
> +import javax.swing.JDialog;
> +import javax.swing.UIManager;
> +
> +import org.classpath.controlpanel.translator.Translator;
> +
> +import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
> +
> +/**
> + * This dialog provides a means for user to edit more of the proxy settings.
> + *
> + * @author asu
> + *
> + */
> + at SuppressWarnings("serial")
> +public class AdvancedProxySettingsDialog extends JDialog {
> +
> + private boolean initialized = false;
> + private static final String dialogTitle = Translator.R("APSDialogTitle");
> + private DeploymentConfiguration config;
> +
> + AdvancedProxySettingsPane topPanel;
> +
> + public AdvancedProxySettingsDialog(DeploymentConfiguration config) {
> + super((Frame) null, dialogTitle, true);
> + this.config = config;
> + Container contentPane = getContentPane();
> + contentPane.setLayout(new GridBagLayout());
> + setMinimumSize(new Dimension(456, 404));
> + setPreferredSize(new Dimension(456, 404));
> + setModal(true);
> + GridBagConstraints c = new GridBagConstraints();
> + c.fill = GridBagConstraints.BOTH;
> + c.weightx = 1;
> + c.weighty = 1;
> + c.gridx = 0;
> + c.gridy = 0;
> + topPanel = new AdvancedProxySettingsPane(this, this.config);
> + contentPane.add(topPanel, c);
> +
> + pack();
> +
> + WindowAdapter adapter = new WindowAdapter() {
> + private boolean gotFocus = false;
> +
> + public void windowGainedFocus(WindowEvent we) {
> + // Once window gets focus, set initial focus
> + if (!gotFocus) {
> + topPanel.focusOnDefaultButton();
> + gotFocus = true;
> + }
> + }
> + };
> + addWindowFocusListener(adapter);
> +
> + initialized = true;
> + }
> +
> + public boolean isInitialized() {
> + return initialized;
> + }
> +
> + private void centerDialog() {
> + Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
> + Dimension dialogSize = getSize();
> +
> + setLocation((screen.width - dialogSize.width) / 2, (screen.height - dialogSize.height) / 2);
> + }
> +
> + public static void showNetworkSettingsDialog(DeploymentConfiguration config) throws Exception {
> + setSystemLookAndFeel();
> +
> + AdvancedProxySettingsDialog nsd = new AdvancedProxySettingsDialog(config);
> + nsd.setResizable(false);
> + nsd.centerDialog();
> + nsd.setVisible(true);
> + nsd.dispose();
> + }
> +
> + private static void setSystemLookAndFeel() {
> + try {
> + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
> + } catch (Exception e) {
> + // don't worry if we can't.
> + }
> + }
> +
> + public static void main(String[] args) throws Exception {
> + final DeploymentConfiguration config = new DeploymentConfiguration();
> + config.load();
> + showNetworkSettingsDialog(config);
> + }
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/network/AdvancedProxySettingsPane.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/network/AdvancedProxySettingsPane.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,420 @@
> +package org.classpath.controlpanel.network;
> +
> +import java.awt.BorderLayout;
> +import java.awt.Dimension;
> +import java.awt.FlowLayout;
> +import java.awt.GridBagConstraints;
> +import java.awt.GridBagLayout;
> +import java.awt.event.ActionEvent;
> +import java.awt.event.ActionListener;
> +import java.awt.event.KeyEvent;
> +import java.awt.event.KeyListener;
> +import java.awt.event.MouseEvent;
> +import java.awt.event.MouseListener;
> +import java.util.ArrayList;
> +import java.util.List;
> +
> +import javax.naming.ConfigurationException;
> +import javax.swing.BoxLayout;
> +import javax.swing.JButton;
> +import javax.swing.JCheckBox;
> +import javax.swing.JComponent;
> +import javax.swing.JDialog;
> +import javax.swing.JLabel;
> +import javax.swing.JPanel;
> +import javax.swing.JScrollPane;
> +import javax.swing.JTextArea;
> +import javax.swing.JTextField;
> +
> +import org.classpath.controlpanel.NamedBorderPanel;
> +import org.classpath.controlpanel.translator.Translator;
> +
> +import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
> +
> +/**
> + * This is the pane that modifies the proxy settings in more detail.
> + *
> + * @author asu
> + *
> + */
> + at SuppressWarnings("serial")
> +public class AdvancedProxySettingsPane extends JPanel {
> +
> + private JDialog parent;
> + private DeploymentConfiguration config;
> +
> + /** List of properties used by this panel */
> + private String[] properties = { "deployment.proxy.http.host",
> + "deployment.proxy.http.port",
> + "deployment.proxy.https.host",
> + "deployment.proxy.https.port",
> + "deployment.proxy.ftp.host",
> + "deployment.proxy.ftp.port",
> + "deployment.proxy.socks.host",
> + "deployment.proxy.socks.port",
> + "deployment.proxy.same",
> + "deployment.proxy.override.hosts" };
> + private String[] fields = new String[properties.length];
> +
> + private JComponent defaultFocusComponent = null;
> +
> + public AdvancedProxySettingsPane(JDialog parent, DeploymentConfiguration config) {
> + super();
> + this.parent = parent;
> + this.config = config;
> + setLayout(new BorderLayout());
> +
> + getProperties();
> + addComponents();
> + }
> +
> + private void getProperties() {
> + for (int i = 0; i < fields.length; i++) {
> + fields[i] = this.config.getProperty(properties[i]);
> + }
> + }
> +
> + private void addComponents() {
> + JPanel topPanel = new JPanel(new GridBagLayout());
> + GridBagConstraints c = new GridBagConstraints();
> +
> + JPanel servers = new NamedBorderPanel(Translator.R("APSServersPanel"));
> + servers.setLayout(new GridBagLayout());
> + c.fill = GridBagConstraints.BOTH;
> + c.gridheight = 1;
> +
> + JLabel type = new JLabel(Translator.R("APSProxyTypeLabel"));
> + JLabel proxyAddress = new JLabel(Translator.R("APSProxyAddress"));
> + JLabel port = new JLabel(Translator.R("SPSProxyPortLabel"));
> +
> + JLabel http = new JLabel(Translator.R("APSLabelHTTP") + ":");
> + final JTextField httpAddressField = new JTextField(fields[0]);
> + final JTextField httpPortField = new JTextField(fields[1]);
> + httpAddressField.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + fields[0] = httpAddressField.getText();
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> + httpPortField.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + fields[1] = httpPortField.getText();
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> +
> + httpAddressField.addMouseListener(new MiddleClickListener(this.config, properties[0]));
> + httpPortField.addMouseListener(new MiddleClickListener(this.config, properties[1]));
> +
> + JLabel secure = new JLabel(Translator.R("APSLabelSecure") + ":");
> + final JTextField secureAddressField = new JTextField(fields[2]);
> + final JTextField securePortField = new JTextField(fields[3]);
> + secureAddressField.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + fields[2] = secureAddressField.getText();
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> + securePortField.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + fields[3] = securePortField.getText();
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> + secureAddressField.addMouseListener(new MiddleClickListener(this.config, properties[2]));
> + securePortField.addMouseListener(new MiddleClickListener(this.config, properties[3]));
> +
> + JLabel ftp = new JLabel(Translator.R("APSLabelFTP") + ":");
> + final JTextField ftpAddressField = new JTextField(fields[4]);
> + final JTextField ftpPortField = new JTextField(fields[5]);
> + ftpAddressField.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + fields[4] = ftpAddressField.getText();
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> + ftpPortField.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + fields[5] = ftpPortField.getText();
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> + ftpAddressField.addMouseListener(new MiddleClickListener(this.config, properties[4]));
> + ftpPortField.addMouseListener(new MiddleClickListener(this.config, properties[5]));
> +
> + JLabel socks = new JLabel(Translator.R("APSLabelSocks") + ":");
> + final JTextField socksAddressField = new JTextField(fields[6]);
> + final JTextField socksPortField = new JTextField(fields[7]);
> + socksAddressField.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + fields[6] = socksAddressField.getText();
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> + socksPortField.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + fields[7] = socksPortField.getText();
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> + socksAddressField.addMouseListener(new MiddleClickListener(this.config, properties[6]));
> + socksPortField.addMouseListener(new MiddleClickListener(this.config, properties[7]));
> +
> + JCheckBox sameProxyForAll = new JCheckBox(Translator.R("APSSameProxyForAllProtocols"), Boolean.parseBoolean(fields[8]));
> +
> + JPanel p = new JPanel();
> + BoxLayout bl = new BoxLayout(p, BoxLayout.Y_AXIS);
> + p.setLayout(bl);
> + p.add(sameProxyForAll);
> +
> + c.gridy = 0;
> + c.gridwidth = 1;
> + c.weightx = 0;
> + c.gridx = 0;
> + servers.add(type, c);
> + c.gridwidth = 2;
> + c.weightx = 1;
> + c.gridx = 1;
> + servers.add(proxyAddress, c);
> + c.gridwidth = 1;
> + c.weightx = 1;
> + c.gridx = 4;
> + servers.add(port, c);
> +
> + plant(1, http, httpAddressField, httpPortField, servers, c);
> + plant(2, secure, secureAddressField, securePortField, servers, c);
> + plant(3, ftp, ftpAddressField, ftpPortField, servers, c);
> + plant(4, socks, socksAddressField, socksPortField, servers, c);
> + c.gridwidth = 5;
> + c.gridx = 0;
> + c.gridy = 5;
> + servers.add(p, c);
> +
> + JPanel exceptions = new NamedBorderPanel(Translator.R("APSExceptionsLabel"));
> + exceptions.setLayout(new BorderLayout());
> + JLabel exceptionDescription = new JLabel(Translator.R("APSExceptionsDescription"));
> + final JTextArea exceptionListArea = new JTextArea();
> + exceptionListArea.setLineWrap(true);
> + exceptionListArea.setText(fields[9]);
> + exceptionListArea.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + fields[9] = exceptionListArea.getText();
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> + exceptionListArea.addMouseListener(new MiddleClickListener(this.config, fields[9]));
> + JLabel exceptionFormat = new JLabel(Translator.R("APSExceptionInstruction"));
> + JScrollPane exceptionScroll = new JScrollPane(exceptionListArea, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
> + exceptions.add(exceptionDescription, BorderLayout.NORTH);
> + exceptions.add(exceptionScroll, BorderLayout.CENTER);
> + exceptions.add(exceptionFormat, BorderLayout.SOUTH);
> +
> + c.gridx = 0;
> + c.weightx = 1;
> + c.weighty = 0;
> + c.gridy = 0;
> + topPanel.add(servers, c);
> + c.weighty = 1;
> + c.gridy = 1;
> + topPanel.add(exceptions, c);
> +
> + this.add(topPanel);
> + this.add(createButtonPanel(), BorderLayout.SOUTH);
> +
> + }
> +
> + private void plant(int y, JLabel label, JTextField addr, JTextField port, JPanel addTo, GridBagConstraints c) {
> + c.gridy = y;
> +
> + c.gridwidth = 1;
> + c.weightx = 0;
> + c.gridx = 0;
> + addTo.add(label, c);
> + c.gridwidth = 2;
> + c.weightx = 1;
> + c.gridx = 1;
> + addTo.add(addr, c);
> + c.gridwidth = 1;
> + c.weightx = 0;
> + c.gridx = 3;
> + addTo.add(new JLabel(":"), c);
> + c.gridwidth = 1;
> + c.weightx = 0.3;
> + c.gridx = 4;
> + addTo.add(port, c);
> + }
> +
> + private JPanel createButtonPanel() {
> + JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.TRAILING));
> +
> + List<JButton> buttons = new ArrayList<JButton>();
> +
> + JButton okButton = new JButton(Translator.R("ButOk"));
> + okButton.addActionListener(new ActionListener() {
> + @Override
> + public void actionPerformed(ActionEvent e) {
> +
> + for (int i = 0; i < fields.length; i++)
> + config.setProperty(properties[i], fields[i]);
> +
> + parent.dispose();
> + }
> + });
> + buttons.add(okButton);
> +
> + JButton cancelButton = new JButton(Translator.R("ButCancel"));
> + cancelButton.addActionListener(new ActionListener() {
> + @Override
> + public void actionPerformed(ActionEvent e) {
> + parent.dispose();
> + }
> + });
> + buttons.add(cancelButton);
> +
> + int maxWidth = 0;
> + int maxHeight = 0;
> + for (JButton button : buttons) {
> + maxWidth = Math.max(button.getMinimumSize().width, maxWidth);
> + maxHeight = Math.max(button.getMinimumSize().height, maxHeight);
> + }
> +
> + int wantedWidth = maxWidth + 10;
> + int wantedHeight = maxHeight;
> + for (JButton button : buttons) {
> + button.setPreferredSize(new Dimension(wantedWidth, wantedHeight));
> + buttonPanel.add(button);
> + }
> +
> + return buttonPanel;
> + }
> +
> + public void focusOnDefaultButton() {
> + if (defaultFocusComponent != null) {
> + defaultFocusComponent.requestFocusInWindow();
> + }
> + }
> +
> + public static void main(String[] args) throws ConfigurationException {
> + final DeploymentConfiguration config = new DeploymentConfiguration();
> + config.load();
> + System.out.println("Adv Proxy Settings Test Dialog");
> + JDialog f = new JDialog();
> + f.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
> + f.setPreferredSize(new Dimension(300, 300));
> + AdvancedProxySettingsPane apsp = new AdvancedProxySettingsPane(f, config);
> + f.add(apsp);
> + f.pack();
> + f.setVisible(true);
> + }
> +}
> +
> +class MiddleClickListener implements MouseListener {
> +
> + DeploymentConfiguration config;
> + private String property;
> +
> + public MiddleClickListener(DeploymentConfiguration config, String property) {
> + this.config = config;
> + this.property = property;
> + }
> +
> + @Override
> + public void mouseClicked(MouseEvent e) {
> + Object obj = e.getSource();
> + String result = null;
> + if (obj instanceof JTextField)
> + result = ((JTextField) obj).getText();
> + else if (obj instanceof JTextArea) result = ((JTextArea) obj).getText();
> +
> + config.setProperty(property, result);
> + }
> +
> + @Override
> + public void mousePressed(MouseEvent e) {
> + }
> +
> + @Override
> + public void mouseReleased(MouseEvent e) {
> + }
> +
> + @Override
> + public void mouseEntered(MouseEvent e) {
> + }
> +
> + @Override
> + public void mouseExited(MouseEvent e) {
> + }
> +
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/network/NetworkSettingsPanel.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/network/NetworkSettingsPanel.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,288 @@
> +package org.classpath.controlpanel.network;
> +
> +import java.awt.BorderLayout;
> +import java.awt.CardLayout;
> +import java.awt.Component;
> +import java.awt.Dimension;
> +import java.awt.FlowLayout;
> +import java.awt.GridBagConstraints;
> +import java.awt.GridBagLayout;
> +import java.awt.event.ActionEvent;
> +import java.awt.event.ActionListener;
> +import java.awt.event.ItemEvent;
> +import java.awt.event.ItemListener;
> +import java.awt.event.KeyEvent;
> +import java.awt.event.KeyListener;
> +import java.util.ArrayList;
> +
> +import javax.swing.Box;
> +import javax.swing.ButtonGroup;
> +import javax.swing.JButton;
> +import javax.swing.JCheckBox;
> +import javax.swing.JComponent;
> +import javax.swing.JLabel;
> +import javax.swing.JPanel;
> +import javax.swing.JRadioButton;
> +import javax.swing.JTextField;
> +
> +import org.classpath.controlpanel.NamedBorderPanel;
> +import org.classpath.controlpanel.translator.Translator;
> +
> +import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
> +
> +/**
> + * This is the pane used with creating a JDialog version. This allows changing
> + * the network configuration: Proxy
> + *
> + * @author asu
> + *
> + */
> + at SuppressWarnings("serial")
> +public class NetworkSettingsPanel extends JPanel implements ActionListener {
> +
> + private DeploymentConfiguration config;
> +
> + private JPanel description;
> + private ArrayList<JPanel> proxyPanels = new ArrayList<JPanel>(); // The stuff with editable fields
> +
> + private JComponent defaultFocusComponent = null;
> +
> + /** List of properties used by this panel */
> + private String[] properties = { "deployment.proxy.type",
> + "deployment.proxy.http.host",
> + "deployment.proxy.http.port",
> + "deployment.proxy.bypass.local",
> + "deployment.proxy.auto.config.url", };
> + private String[] fields = new String[properties.length];
> +
> + public NetworkSettingsPanel(DeploymentConfiguration config) {
> + super();
> + this.config = config;
> + setLayout(new BorderLayout());
> +
> + getProperties();
> + addComponents();
> + }
> +
> + private void getProperties() {
> +
> + for (int i = 0; i < properties.length; i++)
> + fields[i] = this.config.getProperty(properties[i]);
> + }
> +
> + // create the GUI here.
> + protected void addComponents() {
> + JPanel settingPanel = new NamedBorderPanel(Translator.R("CPHeadNetworkSettings"));
> + settingPanel.setLayout(new GridBagLayout());
> + GridBagConstraints c = new GridBagConstraints();
> + c.fill = GridBagConstraints.BOTH;
> + c.weightx = 1;
> + c.weighty = 1;
> + c.gridx = 0;
> +
> + JLabel networkDesc = new JLabel("<html>" + Translator.R("CPNetworkSettingsDescription") + "<hr /></html>");
> +
> + JLabel description = new JLabel("<html>" + Translator.R("NSDescription-1") + "</html>");
> + JLabel description0 = new JLabel("<html>" + Translator.R("NSDescription0") + "</html>");
> + JLabel description1 = new JLabel("<html>" + Translator.R("NSDescription1") + "</html>");
> + JLabel description2 = new JLabel("<html>" + Translator.R("NSDescription2") + "</html>");
> + JLabel description3 = new JLabel("<html>" + Translator.R("NSDescription3") + "</html>");
> +
> + this.description = new JPanel(new CardLayout());
> + this.description.add(description, "-1");
> + this.description.add(description0, "0");
> + this.description.add(description1, "1");
> + this.description.add(description2, "2");
> + this.description.add(description3, "3");
> +
> + // Settings for selecting Proxy Server
> + JPanel proxyServerPanel = new JPanel(new BorderLayout());
> + JPanel proxyLocationPanel = new JPanel(new FlowLayout(FlowLayout.LEADING));
> + JPanel proxyBypassPanel = new JPanel(new FlowLayout(FlowLayout.LEADING));
> +
> + JLabel addressLabel = new JLabel(Translator.R("NSAddress") + ":");
> + JLabel portLabel = new JLabel(Translator.R("NSPort") + ":");
> + final JTextField addressField = new JTextField(fields[1], 10);
> + addressField.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + fields[1] = addressField.getText();
> + config.setProperty(properties[1], fields[1]);
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> + addressField.addMouseListener(new MiddleClickListener(this.config, properties[1]));
> + final JTextField portField = new JTextField(fields[2], 3);
> + portField.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + fields[2] = portField.getText();
> + config.setProperty(properties[2], fields[2]);
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> + JButton advancedProxyButton = new JButton(Translator.R("NSAdvanced") + "...");
> +
> + advancedProxyButton.addActionListener(new ActionListener() {
> + @Override
> + public void actionPerformed(ActionEvent e) {
> + try {
> + AdvancedProxySettingsDialog.showNetworkSettingsDialog(config);
> + } catch (Exception e1) {
> + e1.printStackTrace();
> + }
> + }
> + });
> +
> + JCheckBox bypassCheckBox = new JCheckBox(Translator.R("NSBypassLocal"), Boolean.parseBoolean(fields[3]));
> + bypassCheckBox.addItemListener(new ItemListener() {
> + @Override
> + public void itemStateChanged(ItemEvent e) {
> + fields[3] = String.valueOf(e.getStateChange() == ItemEvent.SELECTED);
> + config.setProperty(properties[3], fields[3]);
> + }
> +
> + });
> + proxyLocationPanel.add(Box.createRigidArea(new Dimension(13, 0)));
> + proxyLocationPanel.add(addressLabel);
> + proxyLocationPanel.add(addressField);
> + proxyLocationPanel.add(portLabel);
> + proxyLocationPanel.add(portField);
> + proxyLocationPanel.add(advancedProxyButton);
> + proxyBypassPanel.add(Box.createRigidArea(new Dimension(10, 0)));
> + proxyBypassPanel.add(bypassCheckBox);
> +
> + proxyServerPanel.add(proxyLocationPanel, BorderLayout.CENTER);
> + proxyServerPanel.add(proxyBypassPanel, BorderLayout.SOUTH);
> +
> + JRadioButton directConnection = new JRadioButton(Translator.R("NSDirectConnection"), fields[0].equals("0"));
> + directConnection.setActionCommand("0");
> + directConnection.addActionListener(this);
> +
> + JRadioButton useProxyServer = new JRadioButton(Translator.R("NSManualProxy"), fields[0].equals("1"));
> + useProxyServer.setActionCommand("1");
> + useProxyServer.addActionListener(this);
> +
> + JRadioButton useAutoProxyConfigScript = new JRadioButton(Translator.R("NSAutoProxy"), fields[0].equals("2"));
> + useAutoProxyConfigScript.setActionCommand("2");
> + useAutoProxyConfigScript.addActionListener(this);
> +
> + JRadioButton useBrowserSettings = new JRadioButton(Translator.R("NSBrowserProxy"), fields[0].equals("3"));
> + useBrowserSettings.setActionCommand("3");
> + useBrowserSettings.addActionListener(this);
> +
> + ButtonGroup modeSelect = new ButtonGroup();
> + modeSelect.add(useBrowserSettings);
> + modeSelect.add(useProxyServer);
> + modeSelect.add(useAutoProxyConfigScript);
> + modeSelect.add(directConnection);
> +
> + // Settings for Automatic Proxy Configuration Script
> + JPanel proxyAutoPanel = new JPanel(new FlowLayout(FlowLayout.LEADING));
> + JLabel locationLabel = new JLabel(Translator.R("NSScripLocation") + ":");
> + final JTextField locationField = new JTextField(fields[4], 20);
> + locationField.addKeyListener(new KeyListener() {
> + @Override
> + public void keyPressed(KeyEvent e) {
> + }
> +
> + @Override
> + public void keyReleased(KeyEvent e) {
> + String value = locationField.getText();
> + if (value.trim().equals("")) value = null;
> + fields[4] = value;
> + config.setProperty(properties[4], value);
> + }
> +
> + @Override
> + public void keyTyped(KeyEvent e) {
> + }
> + });
> +
> + proxyAutoPanel.add(Box.createRigidArea(new Dimension(13, 0)));
> + proxyAutoPanel.add(locationLabel);
> + proxyAutoPanel.add(locationField);
> +
> + c.gridy = 0;
> + settingPanel.add(networkDesc, c);
> + c.gridy = 1;
> + settingPanel.add(this.description, c);
> + c.gridy = 2;
> + settingPanel.add(directConnection, c);
> + c.gridy = 3;
> + settingPanel.add(useBrowserSettings, c);
> + c.gridy = 4;
> + settingPanel.add(useProxyServer, c);
> + c.gridy = 5;
> + settingPanel.add(proxyServerPanel, c);
> + proxyPanels.add(proxyServerPanel);
> + c.gridy = 6;
> + settingPanel.add(useAutoProxyConfigScript, c);
> + c.gridy = 7;
> + settingPanel.add(proxyAutoPanel, c);
> + proxyPanels.add(proxyAutoPanel);
> +
> + setState(); // depending on default setting we will enable or disable
> +
> + this.add(settingPanel, BorderLayout.CENTER);
> + }
> +
> + public void focusOnDefaultButton() {
> + if (defaultFocusComponent != null) {
> + defaultFocusComponent.requestFocusInWindow();
> + }
> + }
> +
> + private void enablePanel(JPanel panel, boolean enable) {
> + // This will be used to enable all components in this panel recursively.
> + // Ridiculously slow if lots of nested panels and may error, too many
> + // calls?
> + for (Component c : panel.getComponents()) {
> + if (c instanceof JPanel) {
> + enablePanel((JPanel) c, enable);
> + }
> + c.setEnabled(enable);
> + }
> + }
> +
> + @Override
> + public void actionPerformed(ActionEvent e) {
> + fields[0] = e.getActionCommand();
> + config.setProperty(properties[0], fields[0]);
> + setState();
> + }
> +
> + /**
> + * This enables and disables the appropriate panels.
> + */
> + private void setState() {
> + ((CardLayout) this.description.getLayout()).show(this.description, fields[0]);
> + if (fields[0].equals("0")) {
> + for (JPanel panel : proxyPanels)
> + enablePanel(panel, false);
> + } else if (fields[0].equals("1")) {
> + enablePanel(proxyPanels.get(1), false);
> + enablePanel(proxyPanels.get(0), true);
> + } else if (fields[0].equals("2")) {
> + enablePanel(proxyPanels.get(0), false);
> + enablePanel(proxyPanels.get(1), true);
> + } else if (fields[0].equals("3")) {
> + for (JPanel panel : proxyPanels)
> + enablePanel(panel, false);
> + }
> + }
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/security/viewer/CertificatePane.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/security/viewer/CertificatePane.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,496 @@
> +/* CertificatePane.java
> + Copyright (C) 2008 Red Hat, Inc.
> +
> +This file is part of IcedTea.
> +
> +IcedTea 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, version 2.
> +
> +IcedTea 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 IcedTea; see the file COPYING. If not, write to
> +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library. Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module. An independent module is a module which is not derived from
> +or based on this library. If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so. If you do not wish to do so, delete this
> +exception statement from your version.
> +*/
> +
> +package org.classpath.controlpanel.security.viewer;
> +
> +import static net.sourceforge.jnlp.runtime.Translator.R;
> +
> +import java.awt.BorderLayout;
> +import java.awt.Dimension;
> +import java.awt.FlowLayout;
> +import java.awt.event.ActionEvent;
> +import java.awt.event.ActionListener;
> +import java.awt.event.KeyEvent;
> +import java.io.File;
> +import java.io.FileOutputStream;
> +import java.io.OutputStream;
> +import java.io.PrintStream;
> +import java.security.KeyStore;
> +import java.security.cert.Certificate;
> +import java.security.cert.X509Certificate;
> +import java.util.ArrayList;
> +import java.util.Enumeration;
> +import java.util.List;
> +
> +import javax.swing.BorderFactory;
> +import javax.swing.JButton;
> +import javax.swing.JComboBox;
> +import javax.swing.JComponent;
> +import javax.swing.JDialog;
> +import javax.swing.JFileChooser;
> +import javax.swing.JLabel;
> +import javax.swing.JOptionPane;
> +import javax.swing.JPanel;
> +import javax.swing.JScrollPane;
> +import javax.swing.JTabbedPane;
> +import javax.swing.JTable;
> +import javax.swing.event.ChangeEvent;
> +import javax.swing.event.ChangeListener;
> +import javax.swing.table.DefaultTableModel;
> +
> +import net.sourceforge.jnlp.security.CertificateUtils;
> +import net.sourceforge.jnlp.security.KeyStores;
> +import net.sourceforge.jnlp.security.SecurityUtil;
> +import net.sourceforge.jnlp.security.SecurityWarningDialog;
> +import net.sourceforge.jnlp.security.KeyStores.Level;
> +import net.sourceforge.jnlp.util.FileUtils;
> +
> +public class CertificatePane extends JPanel {
> +
> + /**
> + * The certificates stored in the certificates file.
> + */
> + private ArrayList<X509Certificate> certs = null;
> +
> + private static final Dimension TABLE_DIMENSION = new Dimension(500,200);
> +
> + /**
> + * "Issued To" and "Issued By" string pairs for certs.
> + */
> + private String[][] issuedToAndBy = null;
> + private final String[] columnNames = { R("CVIssuedTo"), R("CVIssuedBy") };
> +
> + private final CertificateType[] certificateTypes = new CertificateType[] {
> + new CertificateType(KeyStores.Type.CA_CERTS),
> + new CertificateType(KeyStores.Type.JSSE_CA_CERTS),
> + new CertificateType(KeyStores.Type.CERTS),
> + new CertificateType(KeyStores.Type.JSSE_CERTS),
> + };
> +
> + JTabbedPane tabbedPane;
> + private final JTable userTable;
> + private final JTable systemTable;
> + private JComboBox certificateTypeCombo;
> + private KeyStores.Type currentKeyStoreType;
> + private KeyStores.Level currentKeyStoreLevel;
> +
> + /** JComponents that should be disbled for system store */
> + private final List<JComponent> disableForSystem;
> +
> + private JDialog parent;
> + private JComponent defaultFocusComponent = null;
> +
> + /**
> + * The Current KeyStore. Only one table/tab is visible for interaction to
> + * the user. This KeyStore corresponds to that.
> + */
> + private KeyStore keyStore = null;
> +
> + public CertificatePane(JDialog parent) {
> + super();
> + this.parent = parent;
> +
> + userTable = new JTable(null);
> + systemTable = new JTable(null);
> + disableForSystem = new ArrayList<JComponent>();
> +
> + addComponents();
> +
> + currentKeyStoreType = ((CertificateType)(certificateTypeCombo.getSelectedItem())).getType();
> + if (tabbedPane.getSelectedIndex() == 0) {
> + currentKeyStoreLevel = Level.USER;
> + } else {
> + currentKeyStoreLevel = Level.SYSTEM;
> + }
> +
> + repopulateTables();
> + }
> +
> + /**
> + * Reads the user's trusted.cacerts keystore.
> + */
> + private void initializeKeyStore() {
> + try {
> + keyStore = KeyStores.getKeyStore(currentKeyStoreLevel, currentKeyStoreType);
> + } catch (Exception e) {
> + e.printStackTrace();
> + }
> + }
> +
> + //create the GUI here.
> + protected void addComponents() {
> +
> + JPanel main = new JPanel(new BorderLayout());
> +
> + JPanel certificateTypePanel = new JPanel(new BorderLayout());
> + certificateTypePanel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
> +
> + JLabel certificateTypeLabel = new JLabel(R("CVCertificateType"));
> +
> + certificateTypeCombo = new JComboBox(certificateTypes);
> + certificateTypeCombo.addActionListener(new CertificateTypeListener());
> +
> + certificateTypePanel.add(certificateTypeLabel, BorderLayout.LINE_START);
> + certificateTypePanel.add(certificateTypeCombo, BorderLayout.CENTER);
> +
> + JPanel tablePanel = new JPanel(new BorderLayout());
> +
> + // User Table
> + DefaultTableModel userTableModel
> + = new DefaultTableModel(issuedToAndBy, columnNames);
> + userTable.setModel(userTableModel);
> + userTable.getTableHeader().setReorderingAllowed(false);
> + userTable.setFillsViewportHeight(true);
> + JScrollPane userTablePane = new JScrollPane(userTable);
> + userTablePane.setPreferredSize(TABLE_DIMENSION);
> + userTablePane.setSize(TABLE_DIMENSION);
> + userTablePane.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
> +
> + // System Table
> + DefaultTableModel systemTableModel = new DefaultTableModel(issuedToAndBy, columnNames);
> + systemTable.setModel(systemTableModel);
> + systemTable.getTableHeader().setReorderingAllowed(false);
> + systemTable.setFillsViewportHeight(true);
> + JScrollPane systemTablePane = new JScrollPane(systemTable);
> + systemTablePane.setPreferredSize(TABLE_DIMENSION);
> + systemTablePane.setSize(TABLE_DIMENSION);
> + systemTablePane.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
> +
> + tabbedPane = new JTabbedPane();
> + tabbedPane.addTab(R("CVUser"), userTablePane);
> + tabbedPane.addTab(R("CVSystem"), systemTablePane);
> + tabbedPane.addChangeListener(new TabChangeListener());
> +
> + JPanel buttonPanel = new JPanel(new FlowLayout());
> +
> + String[] buttonNames = {R("CVImport"), R("CVExport"), R("CVRemove"), R("CVDetails")};
> + char[] buttonMnemonics = { KeyEvent.VK_I,
> + KeyEvent.VK_E,
> + KeyEvent.VK_M,
> + KeyEvent.VK_D};
> + ActionListener[] listeners = { new ImportButtonListener(),
> + new ExportButtonListener(),
> + new RemoveButtonListener(),
> + new DetailsButtonListener() };
> + JButton button;
> +
> + //get the max width
> + int maxWidth = 0;
> + for (int i = 0; i < buttonNames.length; i++) {
> + button = new JButton(buttonNames[i]);
> + maxWidth = Math.max(maxWidth, button.getMinimumSize().width);
> + }
> +
> + for (int i = 0; i < buttonNames.length; i++) {
> + button = new JButton(buttonNames[i]);
> + button.setMnemonic(buttonMnemonics[i]);
> + button.addActionListener(listeners[i]);
> + button.setSize(maxWidth, button.getSize().height);
> + // import and remove buttons
> + if (i == 0 || i == 2) {
> + disableForSystem.add(button);
> + }
> + buttonPanel.add(button);
> + }
> +
> + tablePanel.add(tabbedPane, BorderLayout.CENTER);
> + tablePanel.add(buttonPanel, BorderLayout.SOUTH);
> +
> + main.add(certificateTypePanel, BorderLayout.NORTH);
> + main.add(tablePanel, BorderLayout.CENTER);
> + if (parent != null){
> + JPanel closePanel = new JPanel(new BorderLayout());
> + closePanel.setBorder(BorderFactory.createEmptyBorder(7,7,7,7));
> + JButton closeButton = new JButton(R("ButClose"));
> + closeButton.addActionListener(new CloseButtonListener());
> + defaultFocusComponent = closeButton;
> + closePanel.add(closeButton, BorderLayout.EAST);
> + main.add(closePanel, BorderLayout.SOUTH);
> + }
> +
> + add(main);
> +
> + }
> +
> + /**
> + * Read in the optionPane's keystore to issuedToAndBy.
> + */
> + private void readKeyStore() {
> +
> + Enumeration<String> aliases = null;
> + certs = new ArrayList<X509Certificate>();
> + try {
> +
> + //Get all of the X509Certificates and put them into an ArrayList
> + aliases = keyStore.aliases();
> + while (aliases.hasMoreElements()) {
> + Certificate c = keyStore.getCertificate(aliases.nextElement());
> + if (c instanceof X509Certificate)
> + certs.add((X509Certificate)c);
> + }
> +
> + //get the publisher and root information
> + issuedToAndBy = new String[certs.size()][2];
> + for (int i = 0; i < certs.size(); i++) {
> + X509Certificate c = certs.get(i);
> + issuedToAndBy[i][0] =
> + SecurityUtil.getCN(c.getSubjectX500Principal().getName());
> + issuedToAndBy[i][1] =
> + SecurityUtil.getCN(c.getIssuerX500Principal().getName());
> + }
> + } catch (Exception e) {
> + //TODO
> + e.printStackTrace();
> + }
> + }
> +
> + /**
> + * Re-reads the certs file and repopulates the JTable. This is typically
> + * called after a certificate was deleted from the keystore.
> + */
> + private void repopulateTables() {
> + initializeKeyStore();
> + readKeyStore();
> + DefaultTableModel tableModel
> + = new DefaultTableModel(issuedToAndBy, columnNames);
> +
> + userTable.setModel(tableModel);
> +
> + tableModel = new DefaultTableModel(issuedToAndBy, columnNames);
> + systemTable.setModel(tableModel);
> + }
> +
> + public void focusOnDefaultButton() {
> + if (defaultFocusComponent != null) {
> + defaultFocusComponent.requestFocusInWindow();
> + }
> + }
> +
> + /** Allows storing KeyStores.Types in a JComponent */
> + private class CertificateType {
> + private final KeyStores.Type type;
> +
> + public CertificateType(KeyStores.Type type) {
> + this.type = type;
> + }
> +
> + public KeyStores.Type getType() {
> + return type;
> + }
> +
> + public String toString() {
> + return KeyStores.toDisplayableString(null, type);
> + }
> + }
> +
> + /** Invoked when a user selects a different certificate type */
> + private class CertificateTypeListener implements ActionListener {
> + @Override
> + public void actionPerformed(ActionEvent e) {
> + JComboBox source = (JComboBox) e.getSource();
> + CertificateType type = (CertificateType) source.getSelectedItem();
> + currentKeyStoreType = type.getType();
> + repopulateTables();
> + }
> + }
> +
> + /**
> + * Invoked when a user selects a different tab (switches from user to system
> + * or vice versa). Changes the currentKeyStore Enables or disables buttons.
> + */
> + private class TabChangeListener implements ChangeListener {
> + @Override
> + public void stateChanged(ChangeEvent e) {
> + JTabbedPane source = (JTabbedPane) e.getSource();
> + switch (source.getSelectedIndex()) {
> + case 0:
> + currentKeyStoreLevel = Level.USER;
> + for (JComponent component : disableForSystem) {
> + component.setEnabled(true);
> + }
> + break;
> + case 1:
> + currentKeyStoreLevel = Level.SYSTEM;
> + for (JComponent component : disableForSystem) {
> + component.setEnabled(false);
> + }
> + break;
> + }
> + repopulateTables();
> +
> + }
> + }
> +
> + private class ImportButtonListener implements ActionListener {
> + public void actionPerformed(ActionEvent e) {
> +
> + JFileChooser chooser = new JFileChooser();
> + int returnVal = chooser.showOpenDialog(parent);
> + if(returnVal == JFileChooser.APPROVE_OPTION) {
> + try {
> + KeyStore ks = keyStore;
> + CertificateUtils.addToKeyStore(chooser.getSelectedFile(), ks);
> + File keyStoreFile = new File(KeyStores
> + .getKeyStoreLocation(currentKeyStoreLevel, currentKeyStoreType));
> + if (!keyStoreFile.isFile()) {
> + FileUtils.createRestrictedFile(keyStoreFile, true);
> + }
> +
> + OutputStream os = new FileOutputStream(keyStoreFile);
> + ks.store(os, KeyStores.getPassword());
> + repopulateTables();
> + } catch (Exception ex) {
> + // TODO: handle exception
> + ex.printStackTrace();
> + }
> + }
> + }
> + }
> +
> + private class ExportButtonListener implements ActionListener {
> + public void actionPerformed(ActionEvent e) {
> +
> + JTable table = null;
> + if (currentKeyStoreLevel == Level.USER) {
> + table = userTable;
> + } else {
> + table = systemTable;
> + }
> +
> + //For now, let's just export in -rfc mode as keytool does.
> + //we'll write to a file the exported certificate.
> +
> +
> + try {
> + int selectedRow = table.getSelectedRow();
> + if (selectedRow != -1) {
> + JFileChooser chooser = new JFileChooser();
> + int returnVal = chooser.showOpenDialog(parent);
> + if(returnVal == JFileChooser.APPROVE_OPTION) {
> + String alias = keyStore.getCertificateAlias(certs
> + .get(selectedRow));
> + if (alias != null) {
> + Certificate c = keyStore.getCertificate(alias);
> + PrintStream ps = new PrintStream(chooser.getSelectedFile().getAbsolutePath());
> + CertificateUtils.dump(c, ps);
> + repopulateTables();
> + }
> + }
> + }
> + } catch (Exception ex) {
> + // TODO
> + ex.printStackTrace();
> + }
> + }
> + }
> +
> + private class RemoveButtonListener implements ActionListener {
> +
> + /**
> + * Removes a certificate from the keyStore and writes changes to disk.
> + */
> + public void actionPerformed(ActionEvent e) {
> +
> + JTable table = null;
> + if (currentKeyStoreLevel == Level.USER) {
> + table = userTable;
> + } else {
> + table = systemTable;
> + }
> + try {
> + int selectedRow = table.getSelectedRow();
> +
> + if (selectedRow != -1){
> + String alias = keyStore.getCertificateAlias(certs.get(selectedRow));
> + if (alias != null) {
> +
> + int i = JOptionPane.showConfirmDialog(parent,
> + R("CVRemoveConfirmMessage"),
> + R("CVRemoveConfirmTitle"),
> + JOptionPane.YES_NO_OPTION);
> + if (i == 0) {
> + keyStore.deleteEntry(alias);
> + File keyStoreFile = new File(KeyStores
> + .getKeyStoreLocation(currentKeyStoreLevel, currentKeyStoreType));
> + if (!keyStoreFile.isFile()) {
> + FileUtils.createRestrictedFile(keyStoreFile, true);
> + }
> + FileOutputStream fos = new FileOutputStream(keyStoreFile);
> + keyStore.store(fos, KeyStores.getPassword());
> + fos.close();
> + }
> + }
> + repopulateTables();
> + }
> + } catch (Exception ex) {
> + // TODO
> + ex.printStackTrace();
> + }
> +
> + }
> + }
> +
> + private class DetailsButtonListener implements ActionListener {
> +
> + /**
> + * Shows the details of a trusted certificate.
> + */
> + public void actionPerformed(ActionEvent e) {
> +
> + JTable table = null;
> + if (currentKeyStoreLevel == Level.USER) {
> + table = userTable;
> + } else {
> + table = systemTable;
> + }
> +
> + int selectedRow = table.getSelectedRow();
> + if (selectedRow != -1 && selectedRow >= 0) {
> + X509Certificate c = certs.get(selectedRow);
> + SecurityWarningDialog.showSingleCertInfoDialog(c, parent);
> + }
> + }
> + }
> +
> + private class CloseButtonListener implements ActionListener {
> + @Override
> + public void actionPerformed(ActionEvent e) {
> + parent.dispose();
> + }
> + }
> +
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/security/viewer/CertificateViewer.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/security/viewer/CertificateViewer.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,125 @@
> +/* CertificateViewer.java
> + Copyright (C) 2008 Red Hat, Inc.
> +
> +This file is part of IcedTea.
> +
> +IcedTea 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, version 2.
> +
> +IcedTea 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 IcedTea; see the file COPYING. If not, write to
> +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library. Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module. An independent module is a module which is not derived from
> +or based on this library. If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so. If you do not wish to do so, delete this
> +exception statement from your version.
> +*/
> +
> +package org.classpath.controlpanel.security.viewer;
> +
> +import static net.sourceforge.jnlp.runtime.Translator.R;
> +
> +import java.awt.BorderLayout;
> +import java.awt.Container;
> +import java.awt.Dimension;
> +import java.awt.Frame;
> +import java.awt.Toolkit;
> +import java.awt.event.WindowAdapter;
> +import java.awt.event.WindowEvent;
> +
> +import javax.swing.JDialog;
> +import javax.swing.UIManager;
> +
> +import net.sourceforge.jnlp.runtime.JNLPRuntime;
> +
> +public class CertificateViewer extends JDialog {
> +
> + private boolean initialized = false;
> + private static final String dialogTitle = R("CVCertificateViewer");
> +
> + CertificatePane panel;
> +
> + public CertificateViewer() {
> + super((Frame)null, dialogTitle, true);
> +
> + Container contentPane = getContentPane();
> + contentPane.setLayout(new BorderLayout());
> +
> + panel = new CertificatePane(this);
> +
> + add(panel);
> +
> + pack();
> +
> + WindowAdapter adapter = new WindowAdapter() {
> + private boolean gotFocus = false;
> +
> + public void windowGainedFocus(WindowEvent we) {
> + // Once window gets focus, set initial focus
> + if (!gotFocus) {
> + panel.focusOnDefaultButton();
> + gotFocus = true;
> + }
> + }
> + };
> + addWindowFocusListener(adapter);
> +
> + initialized = true;
> + }
> +
> + public boolean isInitialized(){
> + return initialized;
> + }
> +
> + private void centerDialog() {
> + Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
> + Dimension dialogSize = getSize();
> +
> + setLocation((screen.width - dialogSize.width)/2,
> + (screen.height - dialogSize.height)/2);
> + }
> +
> +
> + public static void showCertificateViewer() throws Exception {
> + JNLPRuntime.initialize(true);
> + setSystemLookAndFeel();
> +
> + CertificateViewer cv = new CertificateViewer();
> + cv.setResizable(true);
> + cv.centerDialog();
> + cv.setVisible(true);
> + cv.dispose();
> + }
> +
> + private static void setSystemLookAndFeel() {
> + try {
> + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
> + } catch (Exception e) {
> + // don't worry if we can't.
> + }
> + }
> +
> + public static void main(String[] args) throws Exception {
> + CertificateViewer.showCertificateViewer();
> + }
> +}
> diff -r 243ab4185293 controlpanel/org/classpath/controlpanel/translator/Translator.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/controlpanel/org/classpath/controlpanel/translator/Translator.java Fri Nov 26 15:58:55 2010 -0500
> @@ -0,0 +1,42 @@
> +// Copyright (C) 2010 Red Hat, Inc.
> +//
> +// This library is free software; you can redistribute it and/or
> +// modify it under the terms of the GNU Lesser General Public
> +// License as published by the Free Software Foundation; either
> +// version 2.1 of the License, or (at your option) any later version.
> +//
> +// This library 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
> +// Lesser General Public License for more details.
> +//
> +// You should have received a copy of the GNU Lesser General Public
> +// License along with this library; if not, write to the Free Software
> +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
> +
> +package org.classpath.controlpanel.translator;
> +
> +import net.sourceforge.jnlp.runtime.JNLPRuntime;
> +
> +/**
> + * Utility class to provide simple methods to help localize messages
> + */
> +public class Translator {
> +
> + /**
> + * @return the localized string for the message
> + */
> + public static String R(String message, Object... params) {
> + return JNLPRuntime.getMessage(message, params);
> + }
> +
> + /**
> + * Return a translated (localized) version of the message
> + * @param message the message to translate
> + * @return a string representing the localized message
> + */
> + public static String R(String message) {
> + return JNLPRuntime.getMessage(message);
> + }
> +
> +}
> diff -r 243ab4185293 netx/net/sourceforge/jnlp/resources/Messages.properties
> --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Nov 26 15:21:56 2010 +0000
> +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Nov 26 15:58:55 2010 -0500
> @@ -233,3 +233,130 @@
> KSCaCerts=Trusted Root CA Certificates
> KSJsseCaCerts=Trusted JSSE Root CA Certificates,
> KSClientCerts=Client Authentication Certificates
> +
> +# Control Panel - Tab Descriptions
> +CPAboutDescription=View version information about Icedtea Control Panel.
> +CPNetworkSettingsDescription=Configure network settings, including how IcedTea Web connects to the internet and whether to use any proxies.
> +CPNetworkSettingsDescription2=Network settings are used when making internet connections. By default, Java will use the network settings in your web browser. Only advanced users should modify these settings.
> +CPTempInternetFilesDescription=Java stores application data for faster execution the next time you run it.
> +CPJRESettingsDescription=View and manage Java Runtime Environment versions and settings for Java applications and applets.
> +CPCertificatesDescription=Use certificates to positively identify yourself, certifications, authorities, and plublishers.
> +CPSecurityDescription=Use this to configure security settings.
> +CPDebuggingDescription=Enable options here to help with debugging
> +CPDesktopIntegrationDescription=Set whether or not to allow creation of desktop shortcut.
> +
> +# Control Panel - Buttons
> +CPButAbout=About...
> +CPButNetworkSettings=Network Settings...
> +CPButSettings=Settings...
> +CPButView=View...
> +CPButCertificates=Certificates...
> +
> +# Control Panel - Headers
> +CPHead=IcedTea Web Control Panel
> +CPHeadAbout=About
> +CPHeadNetworkSettings=Network Proxy Settings
> +CPHeadTempInternetFiles=Temporary Internet Files
> +CPHeadJRESettings=Java Runtime Environment Settings
> +CPHeadCertificates=Certificates
> +CPHeadDebugging=Debugging Settings
> +CPHeadDesktopIntegration=Desktop Integrations
> +CPHeadSecurity=Security Settings
> +
> +# Control Panel - Tabs
> +CPTabAbout=About IcedTea-Web
> +CPTabCache=Cache
> +CPTabCertificate=Certificates
> +CPTabClassLoader=Class Loaders
> +CPTabDebugging=Debugging
> +CPTabDesktopIntegration=Desktop Integration
> +CPTabNetwork=Network
> +CPTabRuntimes=Runtimes
> +CPTabSecurity=Security
> +
> +# Control Panel - AboutPanel
> +CPAboutInfo=This is the control panel for setting deployments.properties which is used by the plugin and netx and webstart.
> +
> +# Control Panel - AdvancedProxySettings
> +APSDialogTitle=Network Settings
> +APSServersPanel=Servers
> +APSProxyTypeLabel=Type
> +APSProxyAddressLabel=Proxy Address
> +APSProxyPortLabel=Port
> +APSLabelHTTP=HTTP
> +APSLabelSecure=Secure
> +APSLabelFTP=FTP
> +APSLabelSocks=Socks
> +APSSameProxyForAllProtocols=Use same proxy server for all protocols.
> +APSExceptionsLabel=Exceptions
> +APSExceptionsDescription=Do not use proxy server for addresses beginning with
> +APSExceptionInstruction=Separate each entry with a semicolon.
> +
> +# Control Panel - DebugginPanel
> +DPEnableTracing=Enable tracing
> +DPEnableLogging=Enable logging
> +DPLifeCycleExceptions=Show applet lifecycle exceptions
> +DPDisable=Disable
> +DPHide=Hide on startup
> +DPShow=Show on startup
> +DPJavaConsole=Java Console
> +
> +# Control Panel - DesktopShortcutPanel
> +DSPNeverCreate=Never create
> +DSPAlwaysAllow=Always allow
> +DSPAskUser=Ask user
> +DSPAskIfHinted=Ask if hinted
> +DSPAlwaysIfHinted=Always if hinted
> +
> +# Control Panel - NetworkSettingsPanel
> +NSDescription-1=Unknown Setting.
> +NSDescription0=Use direct connection.
> +NSDescription1=Override browser proxy settings.
> +NSDescription2=Use automatic proxy configuration script at the specified location.
> +NSDescription3=Use proxy settings from your default browser to connect to the internet.
> +NSAddress=Address
> +NSPort=Port
> +NSAdvanced=Advanced
> +NSBypassLocal=Bypass proxy server for local addresses
> +NSDirectConnection=Direct connection
> +NSManualProxy=Manual proxy server
> +NSAutoProxy=Automatic proxy configuration script
> +NSBrowserProxy=Use browser settings
> +NSScripLocation=Script location
> +
> +# Control Panel - SecurityGeneralPanel
> +SGPAllowUserGrantSigned=Allow users to grant permissions to signed content
> +SGPAllowUserGrantUntrust=Allow users to grant permissions to content from an untrusted authority
> +SGPUseBrowserKeystore=Use certificates and keys in browser keystore (Unsupported)
> +SGPUsePersonalCertOneMatch=Use personal certificate automatically if only one matches server request (Unsupported)
> +SGPWarnCertHostMismatch=Warn if site certificate does not match hostname
> +SGPShowValid=Show site certificate even if it is valid (Unsupported)
> +SGPShowSandboxWarning=Show sandbox warning banner
> +SGPAllowUserAcceptJNLPSecurityRequests=Allow user to accept JNLP security requests
> +SGPCheckCertRevocationList=Check certificates for revocation using Certificate Revocation Lists (CRLs) (Unsupported)
> +SGPEnableOnlineCertValidate=Enable online certificate validation (Unsupported)
> +SGPEnableTrustedPublisherList=Enable list of trusted publishers (Unsupported)
> +SGPEnableBlacklistRevocation=Enable blacklist revocation check (Unsupported)
> +SGPEnableCachingPassword=Enable caching password for authentication (Unsupported)
> +SGPUseSSL2=Use SSL 2.0 compatible ClientHello format (Unsupported)
> +SGPUseSSL3=Use SSL 3.0 (Unsupported)
> +SGPUseTLS1=Use TLS 1.0 (Unsupported)
> +
> +# Control Panel - TemporaryInternetFilesPanel
> +TIFPEnableCache=Keep temporary files on my computer
> +TIFPLocation=Location
> +TIFPLocationLabel=Select the location where temporary files are kept
> +TIFPChange=Change
> +TIFPDiskSpace=Disk space
> +TIFPCompressionLevel=Select the compression level for JAR files
> +TIFPNone=None
> +TIFPMax=Max
> +TIFPCacheSize=Set the amount of disk space for storing temporary files
> +TIFPDeleteFiles=Delete files
> +TIFPRestoreDefaults=Restore defaults
> +
> +# Control Panel - Misc.
> +CPJRESupport=Icedtea-web currently does not support multiple JRE.
> +
> +# Buttons
> +ButApply=Apply
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
More information about the distro-pkg-dev
mailing list