/hg/icedtea-web: 2 new changesets
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Fri Dec 17 13:22:33 PST 2010
changeset 87126a2fff84 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=87126a2fff84
author: Omair Majid <omajid at redhat.com>
date: Fri Dec 17 16:19:35 2010 -0500
use full privileges when checking whether to prompt user or not
2010-12-17 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/security/SecurityWarning.java
(shouldPromptUser): Use full privileges when checking configuration.
This value is not security-sensitive and the method is private.
* netx/net/sourceforge/jnlp/services/ServiceUtil.java
(shouldPromptUser): Likewise.
changeset 5f77ece02afd in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=5f77ece02afd
author: Omair Majid <omajid at redhat.com>
date: Fri Dec 17 16:22:11 2010 -0500
add a description to the top of the Control Panel
2010-12-17 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
(ControlPanel): Create and add the topPanel. (createTopPanel):
New method. Creates a JPanel to display the description on top
of the Control Panel. (createNotImplementedPanel): Use the same
way to load resource as createTopPanel to avoid null pointer
exceptions.
* netx/net/sourceforge/jnlp/resources/Messages.properties: Add
CPMainDescriptionShort and CPMainDescriptionLong.
diffstat:
5 files changed, 90 insertions(+), 6 deletions(-)
ChangeLog | 19 ++++
netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java | 55 +++++++++++++-
netx/net/sourceforge/jnlp/resources/Messages.properties | 4 +
netx/net/sourceforge/jnlp/security/SecurityWarning.java | 9 +-
netx/net/sourceforge/jnlp/services/ServiceUtil.java | 9 +-
diffs (183 lines):
diff -r 9397074c2c39 -r 5f77ece02afd ChangeLog
--- a/ChangeLog Wed Dec 15 10:17:51 2010 -0500
+++ b/ChangeLog Fri Dec 17 16:22:11 2010 -0500
@@ -1,3 +1,22 @@ 2010-12-15 Omair Majid <omajid at redhat.
+2010-12-17 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
+ (ControlPanel): Create and add the topPanel.
+ (createTopPanel): New method. Creates a JPanel to display the
+ description on top of the Control Panel.
+ (createNotImplementedPanel): Use the same way to load resource
+ as createTopPanel to avoid null pointer exceptions.
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: Add
+ CPMainDescriptionShort and CPMainDescriptionLong.
+
+2010-12-17 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/security/SecurityWarning.java
+ (shouldPromptUser): Use full privileges when checking configuration. This
+ value is not security-sensitive and the method is private.
+ * netx/net/sourceforge/jnlp/services/ServiceUtil.java
+ (shouldPromptUser): Likewise.
+
2010-12-15 Omair Majid <omajid at redhat.com>
* Makefile.am
diff -r 9397074c2c39 -r 5f77ece02afd netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Wed Dec 15 10:17:51 2010 -0500
+++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Fri Dec 17 16:22:11 2010 -0500
@@ -18,10 +18,14 @@ Foundation, Inc., 59 Temple Place, Suite
package net.sourceforge.jnlp.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.Font;
+import java.awt.GridLayout;
import java.awt.Image;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -41,6 +45,7 @@ import javax.swing.JScrollPane;
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;
@@ -79,6 +84,7 @@ public class ControlPanel extends JFrame
return panel;
}
+ @Override
public String toString() {
return value;
}
@@ -104,15 +110,55 @@ public class ControlPanel extends JFrame
this.config = config;
+ JPanel topPanel = createTopPanel();
JPanel mainPanel = createMainSettingsPanel();
JPanel buttonPanel = createButtonPanel();
+ add(topPanel, BorderLayout.PAGE_START);
add(mainPanel, BorderLayout.CENTER);
- add(buttonPanel, BorderLayout.SOUTH);
+ add(buttonPanel, BorderLayout.PAGE_END);
setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
pack();
setMinimumSize(getPreferredSize());
setResizable(false);
+ }
+
+ private JPanel createTopPanel() {
+ Font currentFont = null;
+ JLabel about = new JLabel(R("CPMainDescriptionShort"));
+ currentFont = about.getFont();
+ about.setFont(currentFont.deriveFont(currentFont.getSize2D() + 2));
+ currentFont = about.getFont();
+ about.setFont(currentFont.deriveFont(Font.BOLD));
+
+ JLabel description = new JLabel(R("CPMainDescriptionLong"));
+ description.setBorder(new EmptyBorder(2, 0, 2, 0));
+
+ JPanel descriptionPanel = new JPanel(new GridLayout(0, 1));
+ descriptionPanel.setBackground(UIManager.getColor("TextPane.background"));
+ descriptionPanel.add(about);
+ descriptionPanel.add(description);
+
+ JLabel image = new JLabel();
+
+ ClassLoader cl = getClass().getClassLoader();
+ if (cl == null) {
+ cl = ClassLoader.getSystemClassLoader();
+ }
+
+ try {
+ URL imgUrl = cl.getResource("net/sourceforge/jnlp/resources/netx-icon.png");
+ image.setIcon(new ImageIcon(ImageIO.read(imgUrl)));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ JPanel topPanel = new JPanel(new BorderLayout());
+ topPanel.setBackground(UIManager.getColor("TextPane.background"));
+ topPanel.add(descriptionPanel, BorderLayout.LINE_START);
+ topPanel.add(image, BorderLayout.LINE_END);
+ topPanel.setBorder(new EmptyBorder(10, 10, 10, 10));
+ return topPanel;
}
/**
@@ -273,7 +319,12 @@ public class ControlPanel extends JFrame
JPanel notImplementedPanel = new NamedBorderPanel("Unimplemented");
notImplementedPanel.setLayout(new BorderLayout());
- URL imgUrl = getClass().getClassLoader().getResource("net/sourceforge/jnlp/resources/warning.png");
+ ClassLoader cl = getClass().getClassLoader();
+ if (cl == null) {
+ cl = ClassLoader.getSystemClassLoader();
+ }
+
+ URL imgUrl = cl.getResource("net/sourceforge/jnlp/resources/warning.png");
Image img;
try {
img = ImageIO.read(imgUrl);
diff -r 9397074c2c39 -r 5f77ece02afd netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Wed Dec 15 10:17:51 2010 -0500
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Dec 17 16:22:11 2010 -0500
@@ -243,6 +243,10 @@ VVPossibleFileValues=include the absolut
VVPossibleFileValues=include the absolute location of a file - it must begin with a /
VVPossibleRangedIntegerValues=are in range {0} to {1} (inclusive)
VVPossibleUrlValues=include any valid url (eg http://icedtea.classpath.org/hg/)
+
+# Control Panel - Main
+CPMainDescriptionShort=Configure IcedTea-Web
+CPMainDescriptionLong=Configure how the browser plugin (IcedTeaNPPlugin) and javaws (NetX) work
# Control Panel - Tab Descriptions
CPAboutDescription=View version information about Icedtea Control Panel.
diff -r 9397074c2c39 -r 5f77ece02afd netx/net/sourceforge/jnlp/security/SecurityWarning.java
--- a/netx/net/sourceforge/jnlp/security/SecurityWarning.java Wed Dec 15 10:17:51 2010 -0500
+++ b/netx/net/sourceforge/jnlp/security/SecurityWarning.java Fri Dec 17 16:22:11 2010 -0500
@@ -319,8 +319,13 @@ public class SecurityWarning {
* @return true if security warnings should be shown to the user.
*/
private static boolean shouldPromptUser() {
- return Boolean.valueOf(JNLPRuntime.getConfiguration()
- .getProperty(DeploymentConfiguration.KEY_SECURITY_PROMPT_USER));
+ return AccessController.doPrivileged(new PrivilegedAction<Boolean >() {
+ @Override
+ public Boolean run() {
+ return Boolean.valueOf(JNLPRuntime.getConfiguration()
+ .getProperty(DeploymentConfiguration.KEY_SECURITY_PROMPT_USER));
+ }
+ });
}
}
diff -r 9397074c2c39 -r 5f77ece02afd netx/net/sourceforge/jnlp/services/ServiceUtil.java
--- a/netx/net/sourceforge/jnlp/services/ServiceUtil.java Wed Dec 15 10:17:51 2010 -0500
+++ b/netx/net/sourceforge/jnlp/services/ServiceUtil.java Fri Dec 17 16:22:11 2010 -0500
@@ -299,8 +299,13 @@ public class ServiceUtil {
* @return true if the user should be prompted for JNLP API related permissions.
*/
private static boolean shouldPromptUser() {
- return Boolean.valueOf(JNLPRuntime.getConfiguration()
- .getProperty(DeploymentConfiguration.KEY_SECURITY_PROMPT_USER_FOR_JNLP));
+ return AccessController.doPrivileged(new PrivilegedAction<Boolean >() {
+ @Override
+ public Boolean run() {
+ return Boolean.valueOf(JNLPRuntime.getConfiguration()
+ .getProperty(DeploymentConfiguration.KEY_SECURITY_PROMPT_USER_FOR_JNLP));
+ }
+ });
}
}
More information about the distro-pkg-dev
mailing list