/hg/icedtea-web: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Mar 5 14:39:16 UTC 2014
changeset 6334973af853 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6334973af853
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Mar 05 15:27:53 2014 +0100
Use bash as shebang in launchers.in
changeset 01e20acaf6af in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=01e20acaf6af
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Mar 05 15:34:24 2014 +0100
added test for plain * in ClasspathMatcher.ClasspathMatchers.compile()
changeset 907fe0c8a3fa in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=907fe0c8a3fa
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Mar 05 15:43:03 2014 +0100
Fixed layout of AppTrustWarningPanel so buttons do not disappear under radioboxes.
diffstat:
ChangeLog | 18 ++++++++++
launcher/launchers.in | 2 +-
netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java | 13 +++---
netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java | 12 ++++++
tests/netx/unit/net/sourceforge/jnlp/security/AppTrustWarningPanelTest.java | 15 ++------
tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java | 9 +++++
6 files changed, 51 insertions(+), 18 deletions(-)
diffs (156 lines):
diff -r d8407ab3635c -r 907fe0c8a3fa ChangeLog
--- a/ChangeLog Tue Mar 04 11:10:51 2014 -0500
+++ b/ChangeLog Wed Mar 05 15:43:03 2014 +0100
@@ -1,3 +1,21 @@
+2014-03-05 Jiri Vanek <jvanek at 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 at redhat.com>
+
+ * tests/netx/unit/net/sourceforge/jnlp/security/AppTrustWarningPanelTest.java:
+ removed unused imports
+ * tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java:
+ added test for plain * in ClasspathMatcher.ClasspathMatchers.compile()
+
+2014-03-05 Matthias Klose <doko at ubuntu.com>
+
+ * launcher/launchers.in: Use bash as shebang.
+
2014-03-04 Andrew Azores <aazores at redhat.com>
* netx/net/sourceforge/jnlp/resources/Messages.properties:
diff -r d8407ab3635c -r 907fe0c8a3fa launcher/launchers.in
--- a/launcher/launchers.in Tue Mar 04 11:10:51 2014 -0500
+++ b/launcher/launchers.in Wed Mar 05 15:43:03 2014 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
JAVA=@JAVA@
LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@
diff -r d8407ab3635c -r 907fe0c8a3fa netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java
--- a/netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java Tue Mar 04 11:10:51 2014 -0500
+++ 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);
diff -r d8407ab3635c -r 907fe0c8a3fa netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java
--- a/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java Tue Mar 04 11:10:51 2014 -0500
+++ 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);
+ }
}
diff -r d8407ab3635c -r 907fe0c8a3fa tests/netx/unit/net/sourceforge/jnlp/security/AppTrustWarningPanelTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/security/AppTrustWarningPanelTest.java Tue Mar 04 11:10:51 2014 -0500
+++ b/tests/netx/unit/net/sourceforge/jnlp/security/AppTrustWarningPanelTest.java Wed Mar 05 15:43:03 2014 +0100
@@ -1,24 +1,17 @@
package net.sourceforge.jnlp.security;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.swing.JButton;
-
import net.sourceforge.jnlp.PluginBridge;
import net.sourceforge.jnlp.PluginParameters;
-import net.sourceforge.jnlp.security.SecurityDialogs.AccessType;
-import net.sourceforge.jnlp.security.SecurityDialogs.DialogType;
-import net.sourceforge.jnlp.tools.JarCertVerifier;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import org.junit.BeforeClass;
import org.junit.Test;
diff -r d8407ab3635c -r 907fe0c8a3fa tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java Tue Mar 04 11:10:51 2014 -0500
+++ b/tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java Wed Mar 05 15:43:03 2014 +0100
@@ -556,4 +556,13 @@
Assert.assertFalse(cps2.matches(new URL("http://bb.cz")));
}
+
+ @Test
+ public void testStar() throws MalformedURLException {
+ ClasspathMatchers cps1 = ClasspathMatcher.ClasspathMatchers.compile("*");
+ Assert.assertTrue(cps1.matches(new URL("http://whatever.anywher/something/at.some")));
+ Assert.assertTrue(cps1.matches(new URL("http://whatever.anywher/something/at")));
+ Assert.assertTrue(cps1.matches(new URL("http://whatever.anywher/")));
+ Assert.assertTrue(cps1.matches(new URL("http://whatever.anywher")));
+ }
}
More information about the distro-pkg-dev
mailing list