diff --git a/netx/net/sourceforge/jnlp/security/AppTrustWarningDialog.java b/netx/net/sourceforge/jnlp/security/AppTrustWarningDialog.java
new file mode 100644
--- /dev/null
+++ b/netx/net/sourceforge/jnlp/security/AppTrustWarningDialog.java
@@ -0,0 +1,68 @@
+/* Copyright (C) 2013 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 net.sourceforge.jnlp.security;
+
+import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.security.AppTrustWarningPanel.ActionChoiceListener;
+import net.sourceforge.jnlp.security.AppTrustWarningPanel.AppSigningWarningAction;
+
+/**
+ * A panel that confirms that the user is OK with unsigned code running.
+ */
+public class AppTrustWarningDialog extends SecurityDialogPanel {
+
+ private AppTrustWarningDialog(final SecurityDialog dialog) {
+ super(dialog);
+ }
+
+ public static AppTrustWarningDialog unsigned(final SecurityDialog dialog, final JNLPFile file) {
+ final AppTrustWarningDialog warningDialog = new AppTrustWarningDialog(dialog);
+ warningDialog.add(new UnsignedAppletTrustWarningPanel(file, warningDialog.getActionChoiceListener()));
+ return warningDialog;
+ }
+
+ private ActionChoiceListener getActionChoiceListener() {
+ return new ActionChoiceListener() {
+ @Override
+ public void actionChosen(final AppSigningWarningAction action) {
+ parent.setValue(action);
+ parent.dispose();
+ }
+ };
+ }
+
+}
diff --git a/netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java b/netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java
new file mode 100644
--- /dev/null
+++ b/netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java
@@ -0,0 +1,321 @@
+/* Copyright (C) 2013 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 net.sourceforge.jnlp.security;
+
+import static net.sourceforge.jnlp.runtime.Translator.R;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.SwingConstants;
+
+import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.PluginBridge;
+import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction;
+import net.sourceforge.jnlp.security.appletextendedsecurity.ExtendedAppletSecurityHelp;
+import net.sourceforge.jnlp.util.ScreenFinder;
+
+/*
+ * This class is meant to provide a common layout and functionality for warning dialogs
+ * that appear when the user needs to confirm the running of applets/applications.
+ * Subclasses include UnsignedAppletTrustWarningPanel, for unsigned plugin applets, and
+ * PartiallySignedAppTrustWarningPanel, for partially signed JNLP applications as well as
+ * plugin applets. New implementations should be added to the unit test at
+ * unit/net/sourceforge/jnlp/security/AppTrustWarningPanelTest
+ */
+public abstract class AppTrustWarningPanel extends JPanel {
+
+ /*
+ * Details of decided action.
+ */
+ public static class AppSigningWarningAction {
+ private ExecuteAppletAction action;
+ private boolean applyToCodeBase;
+
+ public AppSigningWarningAction(ExecuteAppletAction action,
+ boolean applyToCodeBase) {
+ this.action = action;
+ this.applyToCodeBase = applyToCodeBase;
+ }
+
+ public ExecuteAppletAction getAction() {
+ return action;
+ }
+
+ public boolean rememberForCodeBase() {
+ return applyToCodeBase;
+ }
+ }
+
+ /*
+ * Callback for when action is decided.
+ */
+ public static interface ActionChoiceListener {
+ void actionChosen(AppSigningWarningAction action);
+ }
+
+ protected int PANE_WIDTH = 500;
+
+ protected int TOP_PANEL_HEIGHT = 60;
+ protected int INFO_PANEL_HEIGHT = 140;
+ protected int INFO_PANEL_HINT_HEIGHT = 25;
+ protected int QUESTION_PANEL_HEIGHT = 35;
+
+ private JButton allowButton;
+ private JButton rejectButton;
+ private JButton helpButton;
+ private JCheckBox permanencyCheckBox;
+ private JRadioButton applyToAppletButton;
+ private JRadioButton applyToCodeBaseButton;
+
+ protected JNLPFile file;
+
+ private ActionChoiceListener actionChoiceListener;
+
+ /*
+ * Subclasses should call addComponents() IMMEDIATELY after calling the super() constructor!
+ */
+ public AppTrustWarningPanel(JNLPFile file, ActionChoiceListener actionChoiceListener) {
+ this.file = file;
+ this.actionChoiceListener = actionChoiceListener;
+ }
+
+ /*
+ * Provides an image to be displayed near the upper left corner of the dialog.
+ */
+ protected abstract ImageIcon getInfoImage();
+
+ /*
+ * Provides a short description of why the dialog is appearing. The message is expected to be HTML-formatted.
+ */
+ protected abstract String getTopPanelText();
+
+ /*
+ * Provides in-depth information on why the dialog is appearing. The message is expected to be HTML-formatted.
+ */
+ protected abstract String getInfoPanelText();
+
+ /*
+ * This provides the text for the final prompt to the user. The message is expected to be HTML formatted.
+ * The user's action is a direct response to this question.
+ */
+ protected abstract String getQuestionPanelText();
+
+ public JButton getAllowButton() {
+ return allowButton;
+ }
+
+ public JButton getRejectButton() {
+ return rejectButton;
+ }
+
+ protected static String htmlWrap(String text) {
+ return "<html>" + text + "</html>";
+ }
+
+ private void setupTopPanel() {
+ final String topLabelText = getTopPanelText();
+
+ JLabel topLabel = new JLabel(topLabelText, getInfoImage(),
+ SwingConstants.LEFT);
+ topLabel.setFont(new Font(topLabel.getFont().toString(), Font.BOLD, 12));
+
+ JPanel topPanel = new JPanel(new BorderLayout());
+ topPanel.setBackground(Color.WHITE);
+ topPanel.add(topLabel, BorderLayout.CENTER);
+ topPanel.setPreferredSize(new Dimension(PANE_WIDTH, TOP_PANEL_HEIGHT));
+ topPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+
+ add(topPanel);
+ }
+
+ private void setupInfoPanel() {
+ String infoLabelText = getInfoPanelText();
+ int panelHeight = INFO_PANEL_HEIGHT + INFO_PANEL_HINT_HEIGHT;
+
+ JLabel infoLabel = new JLabel(infoLabelText);
+ JPanel infoPanel = new JPanel(new BorderLayout());
+ infoPanel.add(infoLabel, BorderLayout.CENTER);
+ infoPanel.setPreferredSize(new Dimension(PANE_WIDTH, panelHeight));
+ infoPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+
+ add(infoPanel);
+ }
+
+ private void setupQuestionsPanel() {
+ JPanel questionPanel = new JPanel(new BorderLayout());
+
+ final String questionPanelText = getQuestionPanelText();
+ questionPanel.add(new JLabel(questionPanelText), BorderLayout.EAST);
+
+ questionPanel.setPreferredSize(new Dimension(PANE_WIDTH, QUESTION_PANEL_HEIGHT));
+ questionPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
+
+ add(questionPanel);
+ }
+
+ private JPanel createMatchOptionsPanel() {
+ JPanel matchOptionsPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+
+ ButtonGroup group = new ButtonGroup();
+ applyToAppletButton = new JRadioButton(R("SRememberAppletOnly"));
+ applyToAppletButton.setSelected(true);
+ applyToAppletButton.setEnabled(false); // Start disabled until 'Remember this option' is selected
+
+ applyToCodeBaseButton = new JRadioButton(htmlWrap(R("SRememberCodebase", file.getCodeBase())));
+ applyToCodeBaseButton.setEnabled(false);
+
+ group.add(applyToAppletButton);
+ group.add(applyToCodeBaseButton);
+
+ matchOptionsPanel.add(applyToAppletButton);
+ matchOptionsPanel.add(applyToCodeBaseButton);
+
+ return matchOptionsPanel;
+ }
+
+ private JPanel createCheckBoxPanel() {
+ JPanel checkBoxPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+
+ permanencyCheckBox = new JCheckBox(htmlWrap(R("SRememberOption")));
+ permanencyCheckBox.addActionListener(permanencyListener());
+ checkBoxPanel.add(permanencyCheckBox);
+
+ return checkBoxPanel;
+ }
+
+ private JPanel createButtonPanel() {
+ JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+
+ allowButton = new JButton(R("ButProceed"));
+ rejectButton = new JButton(R("ButCancel"));
+ helpButton = new JButton(R("APPEXTSECguiPanelHelpButton"));
+
+ allowButton.addActionListener(chosenActionSetter(true));
+ rejectButton.addActionListener(chosenActionSetter(false));
+
+ helpButton.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ JDialog d = new ExtendedAppletSecurityHelp(null, false, "dialogue");
+ ScreenFinder.centerWindowsToCurrentScreen(d);
+ d.setVisible(true);
+ }
+ });
+
+ buttonPanel.add(allowButton);
+ buttonPanel.add(rejectButton);
+ buttonPanel.add(helpButton);
+
+ buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
+
+ return buttonPanel;
+ }
+
+ // Set up 'Remember Option' checkbox & Proceed/Cancel buttons
+ private void setupButtonAndCheckBoxPanel() {
+ JPanel outerPanel = new JPanel(new BorderLayout());
+ JPanel rememberPanel = new JPanel(new GridLayout(2 /*rows*/, 1 /*column*/));
+ rememberPanel.add(createCheckBoxPanel());
+ rememberPanel.add(createMatchOptionsPanel());
+ rememberPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+
+ outerPanel.add(rememberPanel, BorderLayout.WEST);
+ outerPanel.add(createButtonPanel(), BorderLayout.EAST);
+
+ add(outerPanel);
+ }
+
+ /**
+ * Creates the actual GUI components, and adds it to this panel. This should be called by all subclasses
+ * IMMEDIATELY after calling the super() constructor!
+ */
+ protected void addComponents() {
+ setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+
+ setupTopPanel();
+ setupInfoPanel();
+ setupQuestionsPanel();
+ setupButtonAndCheckBoxPanel();
+ }
+
+ // Toggles whether 'match applet' or 'match codebase' options are greyed out
+ private ActionListener permanencyListener() {
+ return new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ applyToAppletButton.setEnabled(permanencyCheckBox.isSelected());
+ applyToCodeBaseButton.setEnabled(permanencyCheckBox.isSelected());
+ }
+ };
+ }
+
+ // Sets action depending on allowApplet + checkbox state
+ private ActionListener chosenActionSetter(final boolean allowApplet) {
+ return new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ ExecuteAppletAction action;
+
+ if (allowApplet) {
+ action = permanencyCheckBox.isSelected() ? ExecuteAppletAction.ALWAYS : ExecuteAppletAction.YES;
+ } else {
+ action = permanencyCheckBox.isSelected() ? ExecuteAppletAction.NEVER : ExecuteAppletAction.NO;
+ }
+
+ boolean applyToCodeBase = applyToCodeBaseButton.isSelected();
+ actionChoiceListener.actionChosen(new AppSigningWarningAction(action, applyToCodeBase));
+ }
+ };
+ }
+}
diff --git a/netx/net/sourceforge/jnlp/security/SecurityDialog.java b/netx/net/sourceforge/jnlp/security/SecurityDialog.java
--- a/netx/net/sourceforge/jnlp/security/SecurityDialog.java
+++ b/netx/net/sourceforge/jnlp/security/SecurityDialog.java
@@ -308,7 +308,7 @@
else if (dialogType == DialogType.NOTALLSIGNED_WARNING)
panel = new NotAllSignedWarningPane(this);
else if (dialogType == DialogType.UNSIGNED_WARNING) // Only necessary for applets on 'high security' or above
- panel = new UnsignedAppletTrustWarningDialog(this, (PluginBridge)file);
+ panel = new UnsignedAppletTrustWarningDialog(this, file);
else if (dialogType == DialogType.AUTHENTICATION)
panel = new PasswordAuthenticationPane(this, extras);
diff --git a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java
--- a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java
+++ b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java
@@ -37,9 +37,6 @@
package net.sourceforge.jnlp.security;
-import net.sourceforge.jnlp.security.UnsignedAppletTrustWarningPanel.UnsignedWarningAction;
-import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteUnsignedApplet;
-
import java.awt.Dialog.ModalityType;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
@@ -54,6 +51,8 @@
import net.sourceforge.jnlp.JNLPFile;
import net.sourceforge.jnlp.config.DeploymentConfiguration;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.security.AppTrustWarningPanel.AppSigningWarningAction;
+import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction;
/**
* <p>
@@ -168,10 +167,10 @@
*
* @return true if permission was granted by the user, false otherwise.
*/
- public static UnsignedWarningAction showUnsignedWarningDialog(JNLPFile file) {
+ public static AppSigningWarningAction showUnsignedWarningDialog(JNLPFile file) {
if (!shouldPromptUser()) {
- return new UnsignedWarningAction(ExecuteUnsignedApplet.NO, false);
+ return new AppSigningWarningAction(ExecuteAppletAction.NO, false);
}
final SecurityDialogMessage message = new SecurityDialogMessage();
@@ -179,7 +178,7 @@
message.accessType = AccessType.UNSIGNED;
message.file = file;
- return (UnsignedWarningAction)getUserResponse(message);
+ return (AppSigningWarningAction) getUserResponse(message);
}
/**
diff --git a/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningDialog.java b/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningDialog.java
--- a/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningDialog.java
+++ b/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningDialog.java
@@ -36,9 +36,9 @@
package net.sourceforge.jnlp.security;
-import net.sourceforge.jnlp.PluginBridge;
-import net.sourceforge.jnlp.security.UnsignedAppletTrustWarningPanel.UnsignedWarningAction;
-import net.sourceforge.jnlp.security.UnsignedAppletTrustWarningPanel.ActionChoiceListener;
+import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.security.AppTrustWarningPanel.ActionChoiceListener;
+import net.sourceforge.jnlp.security.AppTrustWarningPanel.AppSigningWarningAction;
/**
* A panel that confirms that the user is OK with unsigned code running.
@@ -46,13 +46,13 @@
*/
public class UnsignedAppletTrustWarningDialog extends SecurityDialogPanel {
- public UnsignedAppletTrustWarningDialog(SecurityDialog x, PluginBridge file) {
+ public UnsignedAppletTrustWarningDialog(SecurityDialog x, JNLPFile file) {
super(x);
add(new UnsignedAppletTrustWarningPanel(file,
new ActionChoiceListener() {
@Override
- public void actionChosen(UnsignedWarningAction action) {
+ public void actionChosen(AppSigningWarningAction action) {
parent.setValue(action);
parent.dispose();
}
diff --git a/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java b/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java
--- a/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java
+++ b/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Red Hat, Inc.
+/* Copyright (C) 2014 Red Hat, Inc.
This file is part of IcedTea.
@@ -32,271 +32,63 @@
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 net.sourceforge.jnlp.security;
import static net.sourceforge.jnlp.runtime.Translator.R;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import javax.swing.ImageIcon;
+import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction;
+import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation;
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.ButtonGroup;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.SwingConstants;
-import net.sourceforge.jnlp.PluginBridge;
-import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteUnsignedApplet;
-import net.sourceforge.jnlp.security.appletextendedsecurity.ExtendedAppletSecurityHelp;
-import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation;
-import net.sourceforge.jnlp.util.ScreenFinder;
+public class UnsignedAppletTrustWarningPanel extends AppTrustWarningPanel {
-public class UnsignedAppletTrustWarningPanel extends JPanel {
-
- /*
- * Details of decided action.
- */
- public static class UnsignedWarningAction {
- private ExecuteUnsignedApplet action;
- private boolean applyToCodeBase;
-
- public UnsignedWarningAction(ExecuteUnsignedApplet action,
- boolean applyToCodeBase) {
- this.action = action;
- this.applyToCodeBase = applyToCodeBase;
- }
-
- public ExecuteUnsignedApplet getAction() {
- return action;
- }
- public boolean rememberForCodeBase() {
- return applyToCodeBase;
- }
+ public UnsignedAppletTrustWarningPanel(final JNLPFile file, final ActionChoiceListener listener) {
+ super(file, listener);
+ addComponents();
}
- /*
- * Callback for when action is decided.
- */
- public static interface ActionChoiceListener {
- void actionChosen(UnsignedWarningAction action);
+ @Override
+ protected ImageIcon getInfoImage() {
+ final String location = "net/sourceforge/jnlp/resources/info-small.png";
+ return new ImageIcon(ClassLoader.getSystemClassLoader().getResource(location));
}
- private final int PANE_WIDTH = 500;
-
- private final int TOP_PANEL_HEIGHT = 60;
- private final int INFO_PANEL_HEIGHT = 140;
- private final int INFO_PANEL_HINT_HEIGHT = 25;
- private final int QUESTION_PANEL_HEIGHT = 35;
-
- private JButton allowButton;
- private JButton rejectButton;
- private JButton helpButton;
- private JCheckBox permanencyCheckBox;
- private JRadioButton applyToAppletButton;
- private JRadioButton applyToCodeBaseButton;
-
- private PluginBridge file;
-
- private ActionChoiceListener actionChoiceListener;
-
- public UnsignedAppletTrustWarningPanel(PluginBridge file, ActionChoiceListener actionChoiceListener) {
-
- this.file = file;
- this.actionChoiceListener = actionChoiceListener;
-
- addComponents();
- }
-
- public JButton getAllowButton() {
- return allowButton;
+ protected static String getTopPanelTextKey() {
+ return "SUnsignedSummary";
}
- public JButton getRejectButton() {
- return rejectButton;
+ protected static String getInfoPanelTextKey() {
+ return "SUnsignedDetail";
}
- private String htmlWrap(String text) {
- return "<html>" + text + "</html>";
+ protected static String getQuestionPanelTextKey() {
+ return "SUnsignedQuestion";
}
- private ImageIcon infoImage() {
- final String location = "net/sourceforge/jnlp/resources/info-small.png";
- final ClassLoader appLoader = new sun.misc.Launcher().getClassLoader();
- return new ImageIcon(appLoader.getResource(location));
+ @Override
+ protected String getTopPanelText() {
+ return htmlWrap(R(getTopPanelTextKey()));
}
- private void setupTopPanel() {
- final String topLabelText = R("SUnsignedSummary");
-
- JLabel topLabel = new JLabel(htmlWrap(topLabelText), infoImage(),
- SwingConstants.LEFT);
- topLabel.setFont(new Font(topLabel.getFont().toString(), Font.BOLD, 12));
-
- JPanel topPanel = new JPanel(new BorderLayout());
- topPanel.setBackground(Color.WHITE);
- topPanel.add(topLabel, BorderLayout.CENTER);
- topPanel.setPreferredSize(new Dimension(PANE_WIDTH, TOP_PANEL_HEIGHT));
- topPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-
- add(topPanel);
+ @Override
+ protected String getInfoPanelText() {
+ String text = R(getInfoPanelTextKey(), file.getCodeBase(), file.getSourceLocation());
+ ExecuteAppletAction rememberedAction = UnsignedAppletTrustConfirmation.getStoredAction(file);
+ if (rememberedAction == ExecuteAppletAction.YES) {
+ text += "<br>" + R("SUnsignedAllowedBefore");
+ } else if (rememberedAction == ExecuteAppletAction.NO) {
+ text += "<br>" + R("SUnsignedRejectedBefore");
+ }
+ return htmlWrap(text);
}
- private void setupInfoPanel() {
- String infoLabelText = R("SUnsignedDetail", file.getCodeBase(), file.getSourceLocation());
- ExecuteUnsignedApplet rememberedAction = UnsignedAppletTrustConfirmation.getStoredAction(file);
- int panelHeight = INFO_PANEL_HEIGHT;
- if (rememberedAction == ExecuteUnsignedApplet.YES) {
- infoLabelText += "<br/>" + R("SUnsignedAllowedBefore");
- panelHeight += INFO_PANEL_HINT_HEIGHT;
- } else if (rememberedAction == ExecuteUnsignedApplet.NO) {
- infoLabelText += "<br/>" + R("SUnsignedRejectedBefore");
- panelHeight += INFO_PANEL_HINT_HEIGHT;
- }
-
- JLabel infoLabel = new JLabel(htmlWrap(infoLabelText));
- JPanel infoPanel = new JPanel(new BorderLayout());
- infoPanel.add(infoLabel, BorderLayout.CENTER);
- infoPanel.setPreferredSize(new Dimension(PANE_WIDTH, panelHeight));
- infoPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-
- add(infoPanel);
+ @Override
+ protected String getQuestionPanelText() {
+ return htmlWrap(R(getQuestionPanelTextKey()));
}
- private void setupQuestionsPanel() {
- JPanel questionPanel = new JPanel(new BorderLayout());
-
- questionPanel.add(new JLabel(htmlWrap(R("SUnsignedQuestion"))), BorderLayout.EAST);
-
- questionPanel.setPreferredSize(new Dimension(PANE_WIDTH, QUESTION_PANEL_HEIGHT));
- questionPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
-
- add(questionPanel);
- }
-
- private JPanel createMatchOptionsPanel() {
- JPanel matchOptionsPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-
- ButtonGroup group = new ButtonGroup();
- applyToAppletButton = new JRadioButton(R("SRememberAppletOnly"));
- applyToAppletButton.setSelected(true);
- applyToAppletButton.setEnabled(false); // Start disabled until 'Remember this option' is selected
-
- applyToCodeBaseButton = new JRadioButton(htmlWrap(R("SRememberCodebase", file.getCodeBase())));
- applyToCodeBaseButton.setEnabled(false);
-
- group.add(applyToAppletButton);
- group.add(applyToCodeBaseButton);
-
- matchOptionsPanel.add(applyToAppletButton);
- matchOptionsPanel.add(applyToCodeBaseButton);
-
- return matchOptionsPanel;
- }
-
- private JPanel createCheckBoxPanel() {
- JPanel checkBoxPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-
- permanencyCheckBox = new JCheckBox(htmlWrap(R("SRememberOption")));
- permanencyCheckBox.addActionListener(permanencyListener());
- checkBoxPanel.add(permanencyCheckBox);
-
- return checkBoxPanel;
- }
-
- private JPanel createButtonPanel() {
- JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-
- allowButton = new JButton(R("ButProceed"));
- rejectButton = new JButton(R("ButCancel"));
- helpButton = new JButton(R("APPEXTSECguiPanelHelpButton"));
-
- allowButton.addActionListener(chosenActionSetter(true));
- rejectButton.addActionListener(chosenActionSetter(false));
-
- helpButton.addActionListener(new ActionListener() {
-
- public void actionPerformed(ActionEvent e) {
- JDialog d = new ExtendedAppletSecurityHelp(null, false,"dialogue");
- ScreenFinder.centerWindowsToCurrentScreen(d);
- d.setVisible(true);
- }
- });
-
- buttonPanel.add(allowButton);
- buttonPanel.add(rejectButton);
- buttonPanel.add(helpButton);
-
- buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
-
- return buttonPanel;
- }
-
- // Set up 'Remember Option' checkbox & Proceed/Cancel buttons
- private void setupButtonAndCheckBoxPanel() {
- JPanel outerPanel = new JPanel(new BorderLayout());
- JPanel rememberPanel = new JPanel(new GridLayout(2 /*rows*/, 1 /*column*/));
- rememberPanel.add(createCheckBoxPanel());
- rememberPanel.add(createMatchOptionsPanel());
- rememberPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-
- outerPanel.add(rememberPanel, BorderLayout.WEST);
- outerPanel.add(createButtonPanel(), BorderLayout.EAST);
-
- add(outerPanel);
- }
-
- /**
- * Creates the actual GUI components, and adds it to this panel
- */
- private void addComponents() {
- setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-
- setupTopPanel();
- setupInfoPanel();
- setupQuestionsPanel();
- setupButtonAndCheckBoxPanel();
- }
-
- // Toggles whether 'match applet' or 'match codebase' options are greyed out
- private ActionListener permanencyListener() {
- return new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- applyToAppletButton.setEnabled(permanencyCheckBox.isSelected());
- applyToCodeBaseButton.setEnabled(permanencyCheckBox.isSelected());
- }
- };
- }
- // Sets action depending on allowApplet + checkbox state
- private ActionListener chosenActionSetter(final boolean allowApplet) {
- return new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- ExecuteUnsignedApplet action;
-
- if (allowApplet) {
- action = permanencyCheckBox.isSelected() ? ExecuteUnsignedApplet.ALWAYS : ExecuteUnsignedApplet.YES;
- } else {
- action = permanencyCheckBox.isSelected() ? ExecuteUnsignedApplet.NEVER : ExecuteUnsignedApplet.NO;
- }
-
- boolean applyToCodeBase = applyToCodeBaseButton.isSelected();
- actionChoiceListener.actionChosen(new UnsignedWarningAction(action, applyToCodeBase));
- }
- };
- }
}