aboutsummaryrefslogtreecommitdiffstats
path: root/netx/net/sourceforge/jnlp
diff options
context:
space:
mode:
Diffstat (limited to 'netx/net/sourceforge/jnlp')
-rw-r--r--netx/net/sourceforge/jnlp/resources/Messages.properties4
-rw-r--r--netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java12
2 files changed, 8 insertions, 8 deletions
diff --git a/netx/net/sourceforge/jnlp/resources/Messages.properties b/netx/net/sourceforge/jnlp/resources/Messages.properties
index b31da59..b372336 100644
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties
@@ -225,9 +225,9 @@ SAlwaysTrustPublisher=Always trust content from this publisher
SHttpsUnverified=The website's HTTPS certificate cannot be verified.
SRememberOption=<b>Remember this option?</b>
SRememberAppletOnly=For applet
-SRememberCodebase=For site
+SRememberCodebase=For site <u>{0}</u>
SUnsignedSummary=An unsigned Java application wants to run
-SUnsignedDetail=An unsigned application from the following location wants to run:<br><u>{0}</u><br><br><b>It is recommended you only run applications from sites you trust.</b>
+SUnsignedDetail=An unsigned application from the following location wants to run:<br>&nbsp;&nbsp;<u>{0}</u><br>The page which made the request was:<br>&nbsp;&nbsp;<u>{1}</u><br><br><b>It is recommended you only run applications from sites you trust.</b>
SUnsignedAllowedBefore=<font color="green">You have accepted this applet previously.</font>
SUnsignedRejectedBefore=<font color="red">You have rejected this applet previously.</font>
SUnsignedQuestion=Allow the applet to run?
diff --git a/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java b/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java
index 4cbcd6a..a90a643 100644
--- a/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java
+++ b/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java
@@ -98,7 +98,7 @@ public class UnsignedAppletTrustWarningPanel extends JPanel {
private final int PANE_WIDTH = 500;
private final int TOP_PANEL_HEIGHT = 60;
- private final int INFO_PANEL_HEIGHT = 100;
+ private final int INFO_PANEL_HEIGHT = 140;
private final int INFO_PANEL_HINT_HEIGHT = 25;
private final int QUESTION_PANEL_HEIGHT = 35;
@@ -156,7 +156,7 @@ public class UnsignedAppletTrustWarningPanel extends JPanel {
}
private void setupInfoPanel() {
- String infoLabelText = R("SUnsignedDetail", file.getCodeBase());
+ String infoLabelText = R("SUnsignedDetail", file.getCodeBase(), file.getSourceLocation());
ExecuteUnsignedApplet rememberedAction = UnsignedAppletTrustConfirmation.getStoredAction(file);
int panelHeight = INFO_PANEL_HEIGHT;
if (rememberedAction == ExecuteUnsignedApplet.YES) {
@@ -182,7 +182,7 @@ public class UnsignedAppletTrustWarningPanel extends JPanel {
questionPanel.add(new JLabel(htmlWrap(R("SUnsignedQuestion"))), BorderLayout.EAST);
questionPanel.setPreferredSize(new Dimension(PANE_WIDTH, QUESTION_PANEL_HEIGHT));
- questionPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+ questionPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
add(questionPanel);
}
@@ -195,7 +195,7 @@ public class UnsignedAppletTrustWarningPanel extends JPanel {
applyToAppletButton.setSelected(true);
applyToAppletButton.setEnabled(false); // Start disabled until 'Remember this option' is selected
- applyToCodeBaseButton = new JRadioButton(R("SRememberCodebase"));
+ applyToCodeBaseButton = new JRadioButton(htmlWrap(R("SRememberCodebase", file.getCodeBase())));
applyToCodeBaseButton.setEnabled(false);
group.add(applyToAppletButton);
@@ -208,7 +208,7 @@ public class UnsignedAppletTrustWarningPanel extends JPanel {
}
private JPanel createCheckBoxPanel() {
- JPanel checkBoxPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+ JPanel checkBoxPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
permanencyCheckBox = new JCheckBox(htmlWrap(R("SRememberOption")));
permanencyCheckBox.addActionListener(permanencyListener());
@@ -240,7 +240,7 @@ public class UnsignedAppletTrustWarningPanel extends JPanel {
buttonPanel.add(rejectButton);
buttonPanel.add(helpButton);
- buttonPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+ buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
return buttonPanel;
}