Mercurial > hg > release > icedtea-web-1.5

changeset 909:907fe0c8a3fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed layout of AppTrustWarningPanel so buttons do not disappear under radioboxes.
author Jiri Vanek <jvanek@redhat.com>
date Wed, 05 Mar 2014 15:43:03 +0100
parents 01e20acaf6af
children 0a36108ce4b9
files ChangeLog netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java
diffstat 3 files changed, 26 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 05 15:34:24 2014 +0100
+++ b/ChangeLog	Wed Mar 05 15:43:03 2014 +0100
@@ -1,3 +1,10 @@
+2014-03-05  Jiri Vanek  <jvanek@redhat.com>
+
+	* netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java: fixed
+	layout so buttons do not disappear under radioboxes.
+	* netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java:
+	added testable main method.	
+
 2014-03-05  Jiri Vanek  <jvanek@redhat.com>
 
 	* tests/netx/unit/net/sourceforge/jnlp/security/AppTrustWarningPanelTest.java:
--- a/netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java	Wed Mar 05 15:34:24 2014 +0100
+++ b/netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java	Wed Mar 05 15:43:03 2014 +0100
@@ -237,7 +237,7 @@
     }
 
     private JPanel createMatchOptionsPanel() {
-        JPanel matchOptionsPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        JPanel matchOptionsPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
 
         ButtonGroup group = new ButtonGroup();
         applyToAppletButton = new JRadioButton(R("SRememberAppletOnly"));
@@ -257,11 +257,12 @@
     }
 
     private JPanel createCheckBoxPanel() {
-        JPanel checkBoxPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        JPanel checkBoxPanel = new JPanel(new BorderLayout());
 
         permanencyCheckBox = new JCheckBox(htmlWrap(R("SRememberOption")));
         permanencyCheckBox.addActionListener(permanencyListener());
-        checkBoxPanel.add(permanencyCheckBox);
+        checkBoxPanel.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 0));
+        checkBoxPanel.add(permanencyCheckBox,  BorderLayout.SOUTH);
 
         return checkBoxPanel;
     }
@@ -282,11 +283,11 @@
     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));
+        rememberPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
 
-        outerPanel.add(rememberPanel, BorderLayout.WEST);
+        outerPanel.add(createCheckBoxPanel(), BorderLayout.WEST);
+        outerPanel.add(rememberPanel, BorderLayout.SOUTH);
         outerPanel.add(createButtonPanel(), BorderLayout.EAST);
 
         add(outerPanel);
--- a/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java	Wed Mar 05 15:34:24 2014 +0100
+++ b/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java	Wed Mar 05 15:43:03 2014 +0100
@@ -36,9 +36,12 @@
 
 package net.sourceforge.jnlp.security;
 
+import java.awt.BorderLayout;
+import java.net.URL;
 import static net.sourceforge.jnlp.runtime.Translator.R;
 
 import javax.swing.ImageIcon;
+import javax.swing.JFrame;
 import net.sourceforge.jnlp.JNLPFile;
 import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction;
 import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation;
@@ -90,5 +93,14 @@
     protected String getQuestionPanelText() {
         return htmlWrap(R(getQuestionPanelTextKey()));
     }
+    
+    public static void main(String[] args) throws Exception {
+        UnsignedAppletTrustWarningPanel w = new UnsignedAppletTrustWarningPanel(new JNLPFile(new URL("http://www.geogebra.org/webstart/geogebra.jnlp")), null);
+        JFrame f = new JFrame();
+        f.setSize(600, 400);
+        f.add(w, BorderLayout.CENTER);
+        f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        f.setVisible(true);
+    }
 
 }