/hg/icedtea-web: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Jul 17 10:00:44 PDT 2013
changeset a90d4ce50b6f in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a90d4ce50b6f
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Jul 17 17:57:04 2013 +0200
added some missing de and pl strings
changeset f98dbaf9939d in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f98dbaf9939d
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Jul 17 18:13:27 2013 +0200
about dialogue now available from itw-settings
changeset fc1923f295cf in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fc1923f295cf
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Jul 17 18:59:39 2013 +0200
About dialogue made accessible from plugin
diffstat:
ChangeLog | 37 ++++++++++
netx/net/sourceforge/jnlp/about/AboutDialog.java | 16 ++-
netx/net/sourceforge/jnlp/about/HTMLPanel.java | 8 +-
netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java | 28 +++++++-
netx/net/sourceforge/jnlp/resources/Messages.properties | 4 +-
netx/net/sourceforge/jnlp/resources/Messages_cs.properties | 1 -
netx/net/sourceforge/jnlp/resources/Messages_de.properties | 7 +
netx/net/sourceforge/jnlp/resources/Messages_pl.properties | 7 +
netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java | 14 +++
netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java | 37 +++++++++-
netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java | 24 +++++-
tests/netx/unit/net/sourceforge/jnlp/splashscreen/SplashScreenTest.java | 9 +-
12 files changed, 173 insertions(+), 19 deletions(-)
diffs (459 lines):
diff -r f18dea419aec -r fc1923f295cf ChangeLog
--- a/ChangeLog Fri Jul 12 15:47:04 2013 -0400
+++ b/ChangeLog Wed Jul 17 18:59:39 2013 +0200
@@ -1,3 +1,40 @@
+2013-07-13 Jiri Vanek <jvanek at redhat.com>
+
+ About dialogue made accessible from plugin
+ * netx/net/sourceforge/jnlp/about/AboutDialog.java: (frame) re-declared
+ to be Dialogue instead of JFrame and allowed to be modal if necessary.
+ Caption internationalized.
+ * netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java:
+ Added listener for upper right caption to show AboutDialog
+ * netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java:
+ (drawBase) if enough space, adding about "button"
+ * netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java:
+ added about button
+ * tests/netx/unit/net/sourceforge/jnlp/splashscreen/SplashScreenTest.java:
+ minor modifications related to this change
+
+2013-07-17 Jiri Vanek <jvanek at redhat.com>
+
+ about dialogue now available from itw-settings
+ * netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java:
+ added button to launch about dialogue
+ * netx/net/sourceforge/jnlp/resources/Messages.propertie: (CPAboutInfo)
+ Adapted to be more accurate to select-able JVM
+
+2013-07-17 Jiri Vanek <jvanek at redhat.com>
+ Jacob Wisor <gitne at excite.co.jp>
+
+ added some missing de and pl strings
+ * netx/net/sourceforge/jnlp/resources/Messages.properties:
+ fixed about dialogue comment
+ * netx/net/sourceforge/jnlp/resources/Messages_cs.properties:
+ removed keystore comment
+ * netx/net/sourceforge/jnlp/resources/Messages_de.properties:
+ * netx/net/sourceforge/jnlp/resources/Messages_pl.properties:
+ added AboutDialogueTabAbout AboutDialogueTabAuthors
+ AboutDialogueTabChangelog AboutDialogueTabNews AboutDialogueTabGPLv2
+ localizations
+
2013-07-11 Andrew Azores <aazores at redhat.com>
* NEWS: added entry regarding new About Dialogue
diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/about/AboutDialog.java
--- a/netx/net/sourceforge/jnlp/about/AboutDialog.java Fri Jul 12 15:47:04 2013 -0400
+++ b/netx/net/sourceforge/jnlp/about/AboutDialog.java Wed Jul 17 18:59:39 2013 +0200
@@ -40,6 +40,7 @@
import static net.sourceforge.jnlp.runtime.Translator.R;
import java.awt.Dimension;
+import java.awt.Frame;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
@@ -48,7 +49,7 @@
import java.net.URL;
import javax.swing.JButton;
-import javax.swing.JFrame;
+import javax.swing.JDialog;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
@@ -64,17 +65,17 @@
private static final String copying_url = "/net/sourceforge/jnlp/resources/COPYING.html";
private static final String news_url = "/net/sourceforge/jnlp/resources/NEWS.html";
- private JFrame frame;
+ private JDialog frame;
private JPanel contentPane;
private HTMLPanel aboutPanel, authorsPanel, newsPanel, changelogPanel, copyingPanel;
private JButton aboutButton, authorsButton, newsButton, changelogButton, copyingButton;
- public AboutDialog() throws IOException {
+ public AboutDialog(boolean modal) throws IOException {
super(new GridBagLayout());
- frame = new JFrame("About IcedTea-Web");
+ frame = new JDialog((Frame)null, R("AboutDialogueTabAbout") + " IcedTea-Web", modal);
frame.setContentPane(this);
- frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+ frame.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
URL res_about = getClass().getResource(about_url);
URL res_authors = getClass().getResource(authors_url);
@@ -186,7 +187,10 @@
}
public static void display() throws IOException {
- SwingUtilities.invokeLater(new AboutDialog());
+ display(false);
+ }
+ public static void display(boolean modal) throws IOException {
+ SwingUtilities.invokeLater(new AboutDialog(modal));
}
}
diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/about/HTMLPanel.java
--- a/netx/net/sourceforge/jnlp/about/HTMLPanel.java Fri Jul 12 15:47:04 2013 -0400
+++ b/netx/net/sourceforge/jnlp/about/HTMLPanel.java Wed Jul 17 18:59:39 2013 +0200
@@ -56,7 +56,13 @@
public HTMLPanel(URL url, String identifier) throws IOException {
super(new BorderLayout());
id = identifier;
- JEditorPane pane = new JEditorPane(url);
+ JEditorPane pane = new JEditorPane();
+ try{
+ pane = new JEditorPane(url);
+ } catch(Exception ex){
+ //no need to have invalid url fatal
+ ex.printStackTrace();
+ }
pane.setContentType("text/html");
pane.setEditable(false);
pane.addHyperlinkListener(new UrlHyperlinkListener());
diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java Fri Jul 12 15:47:04 2013 -0400
+++ b/netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java Wed Jul 17 18:59:39 2013 +0200
@@ -22,9 +22,14 @@
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
import javax.swing.Box;
+import javax.swing.JButton;
import javax.swing.JLabel;
+import net.sourceforge.jnlp.about.AboutDialog;
import net.sourceforge.jnlp.runtime.Translator;
@@ -43,7 +48,17 @@
JLabel logo = new JLabel();
JLabel aboutLabel = new JLabel("<html>" + Translator.R("CPAboutInfo") + "</html>");
-
+ JButton aboutButton = new JButton(Translator.R("AboutDialogueTabAbout"));
+ aboutButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ try {
+ AboutDialog.display();
+ } catch (IOException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ });
c.fill = GridBagConstraints.BOTH;
c.gridy = 0;
c.gridx = 0;
@@ -53,11 +68,20 @@
c.gridx = 1;
c.weightx = 1;
add(aboutLabel, c);
-
+ c.fill = GridBagConstraints.NONE;
+ c.weighty = 0;
+ c.weightx = 0;
+ c.gridy++;
+ c.gridx=1;
+ add(aboutButton, c);
/* Keep all the elements at the top of the panel (Extra padding) */
+ c.fill = GridBagConstraints.BOTH;
Component filler = Box.createRigidArea(new Dimension(1, 1));
c.weighty = 1;
c.gridy++;
add(filler, c);
+
+
+
}
}
diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Jul 12 15:47:04 2013 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Wed Jul 17 18:59:39 2013 +0200
@@ -33,7 +33,7 @@
Value=Value
Version=Version
-#about dialogue
+# about dialogue
AboutDialogueTabAbout=About
AboutDialogueTabAuthors=Authors
AboutDialogueTabChangelog=Changelog
@@ -383,7 +383,7 @@
CPTabJVMSettings=JVM Settings
# Control Panel - AboutPanel
-CPAboutInfo=This is the control panel for setting deployments.properties.<br/>Not all options will take effect until implemented.<br/>The use of multiple JREs is currently unsupported.<br/>
+CPAboutInfo=This is the control panel for setting deployments.properties.<br/>Not all options will take effect until implemented.<br/>The use of multiple JREs is currently limited to OpenJDK.<br/>
# Control Panel - AdvancedProxySettings
APSDialogTitle=Network Settings
diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/resources/Messages_cs.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Fri Jul 12 15:47:04 2013 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Wed Jul 17 18:59:39 2013 +0200
@@ -278,7 +278,6 @@
CVUser=U\u017eivatel
CVSystem=Syst\u00e9m
-#KeyStores: see KeyStores.java
KS=\u00dalo\u017ei\u0161t\u011b kl\u00ed\u010d\u016f
KSCerts=D\u016fv\u011bryhodn\u00e9 certifik\u00e1ty
KSJsseCerts=D\u016fv\u011bryhodn\u00e9 certifik\u00e1ty JSSE
diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/resources/Messages_de.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages_de.properties Fri Jul 12 15:47:04 2013 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages_de.properties Wed Jul 17 18:59:39 2013 +0200
@@ -33,6 +33,13 @@
Value=Wert
Version=Version
+# about dialogue
+AboutDialogueTabAbout=\u00dcber
+AboutDialogueTabAuthors=Autoren
+AboutDialogueTabChangelog=\u00c4nderungsprotokoll
+AboutDialogueTabNews=Neuigkeiten
+AboutDialogueTabGPLv2=GPLv2
+
# LS - Severity
LSMinor=Gering
LSFatal=Fatal
diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/resources/Messages_pl.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages_pl.properties Fri Jul 12 15:47:04 2013 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages_pl.properties Wed Jul 17 18:59:39 2013 +0200
@@ -33,6 +33,13 @@
Value=Warto\u015b\u0107
Version=Wersja
+# about dialogue
+AboutDialogueTabAbout=O
+AboutDialogueTabAuthors=Autorzy
+AboutDialogueTabChangelog=Dziennik zmian
+AboutDialogueTabNews=Nowo\u015bci
+AboutDialogueTabGPLv2=GPLv2
+
# LS - Severity
LSMinor=Mniejszy
LSFatal=Fatalny
diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java
--- a/netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java Fri Jul 12 15:47:04 2013 -0400
+++ b/netx/net/sourceforge/jnlp/splashscreen/impls/DefaultSplashScreens2012Commons.java Wed Jul 17 18:59:39 2013 +0200
@@ -42,6 +42,7 @@
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.Observable;
+import net.sourceforge.jnlp.about.AboutDialog;
import net.sourceforge.jnlp.splashscreen.impls.defaultsplashscreen2012.BasePainter;
import net.sourceforge.jnlp.splashscreen.parts.BasicComponentSplashScreen;
@@ -63,6 +64,19 @@
parent.repaint();
}
});
+ parent.addMouseListener(new MouseAdapter() {
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ if (e.getY() < painter.getAboutOfset().y && e.getX() > (painter.getAboutOfset().x)) {
+ try {
+ AboutDialog.display();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+ });
// Add a new listener for resizes
parent.addComponentListener(new ComponentAdapter() {
// Re-adjust variables based on size
diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java
--- a/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java Fri Jul 12 15:47:04 2013 -0400
+++ b/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java Wed Jul 17 18:59:39 2013 +0200
@@ -36,13 +36,16 @@
exception statement from your version. */
package net.sourceforge.jnlp.splashscreen.impls.defaultsplashscreen2012;
+import java.awt.BasicStroke;
import net.sourceforge.jnlp.splashscreen.impls.*;
import java.awt.Color;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Graphics2D;
+import java.awt.Point;
import java.awt.RenderingHints;
+import java.awt.Stroke;
import java.awt.Toolkit;
import java.awt.font.TextAttribute;
import java.awt.image.BufferedImage;
@@ -54,6 +57,7 @@
import java.util.Observer;
import javax.swing.SwingUtilities;
+import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.splashscreen.SplashUtils.SplashReason;
import net.sourceforge.jnlp.splashscreen.parts.BasicComponentSplashScreen;
import net.sourceforge.jnlp.splashscreen.parts.InfoItem;
@@ -115,6 +119,14 @@
protected TextWithWaterLevel twl;
protected TextWithWaterLevel oldTwl;
protected boolean canWave = true;
+ private Point aboutOfset = new Point();
+
+ private final static float dash1[] = {10.0f};
+ private final static BasicStroke dashed =
+ new BasicStroke(1.0f,
+ BasicStroke.CAP_BUTT,
+ BasicStroke.JOIN_MITER,
+ 10.0f, dash1, 0.0f);
protected void paintNiceTexts(Graphics2D g2d) {
//the only animated stuff
@@ -510,11 +522,22 @@
g2d.setColor(plainTextColor);
FontMetrics fm = g2d.getFontMetrics();
if (version != null) {
- String niceVersion=stripCommitFromVersion(version);
+ String aboutPrefix = Translator.R("AboutDialogueTabAbout") + ": ";
+ int aboutPrefixWidth = fm.stringWidth(aboutPrefix);
+ String niceVersion = stripCommitFromVersion(version);
int y = master.getSplashWidth() - fm.stringWidth(niceVersion + " ");
if (y < 0) {
y = 0;
}
+ if (y > aboutPrefixWidth) {
+ niceVersion = aboutPrefix + niceVersion;
+ y -= aboutPrefixWidth;
+ }
+ aboutOfset = new Point(y, fm.getHeight());
+ Stroke backup = g2d.getStroke();
+ g2d.setStroke(dashed);
+ g2d.drawRect(aboutOfset.x-1,1, master.getSplashWidth()-aboutOfset.x-1, aboutOfset.y+1);
+ g2d.setStroke(backup);
g2d.drawString(niceVersion, y, fm.getHeight());
}
return fm;
@@ -550,4 +573,16 @@
ex.printStackTrace();
}
}
+
+ public BasicComponentSplashScreen getMaster() {
+ return master;
+ }
+
+ public Point getAboutOfset() {
+ return aboutOfset;
+ }
+
+
+
+
}
diff -r f18dea419aec -r fc1923f295cf netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java
--- a/netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java Fri Jul 12 15:47:04 2013 -0400
+++ b/netx/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialog.java Wed Jul 17 18:59:39 2013 +0200
@@ -63,6 +63,7 @@
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
import net.sourceforge.jnlp.LaunchException;
+import net.sourceforge.jnlp.about.AboutDialog;
import net.sourceforge.jnlp.runtime.Translator;
public class JEditorPaneBasedExceptionDialog extends JDialog implements HyperlinkListener {
@@ -71,6 +72,7 @@
private JButton closeButton;
private JButton closeAndCopyButton;
private JButton homeButton;
+ private JButton aboutButton;
private JEditorPane htmlErrorAndHelpPanel;
private JLabel exceptionLabel;
private JLabel iconLabel;
@@ -138,6 +140,7 @@
htmlPaneScroller = new JScrollPane();
htmlErrorAndHelpPanel = new JEditorPane();
homeButton = new JButton();
+ aboutButton = new JButton();
setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
@@ -162,9 +165,9 @@
GroupLayout jPanel2Layout = new GroupLayout(topPanel);
topPanel.setLayout(jPanel2Layout);
jPanel2Layout.setHorizontalGroup(
- jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(jPanel2Layout.createSequentialGroup().addContainerGap().addComponent(closeButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 314, Short.MAX_VALUE).addComponent(closeAndCopyButton).addContainerGap()));
+ jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(jPanel2Layout.createSequentialGroup().addContainerGap().addComponent(closeButton).addContainerGap().addComponent(aboutButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 314, Short.MAX_VALUE).addComponent(closeAndCopyButton).addContainerGap()));
jPanel2Layout.setVerticalGroup(
- jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup().addContainerGap(24, Short.MAX_VALUE).addGroup(jPanel2Layout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(closeButton).addComponent(closeAndCopyButton)).addContainerGap()));
+ jPanel2Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup().addContainerGap(24, Short.MAX_VALUE).addGroup(jPanel2Layout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(closeButton).addComponent(aboutButton).addComponent(closeAndCopyButton)).addContainerGap()));
exceptionLabel.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
exceptionLabel.setHorizontalAlignment(SwingConstants.CENTER);
@@ -186,13 +189,28 @@
}
});
+
+ aboutButton.setText(Translator.R("AboutDialogueTabAbout"));
+ aboutButton.addActionListener(new java.awt.event.ActionListener() {
+
+ @Override
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ try{
+ AboutDialog.display(true);
+ }catch(Exception ex){
+ ex.printStackTrace();
+ JOptionPane.showConfirmDialog(JEditorPaneBasedExceptionDialog.this, ex);
+ }
+ }
+ });
+
GroupLayout jPanel1Layout = new GroupLayout(mainPanel);
mainPanel.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
jPanel1Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(jPanel1Layout.createSequentialGroup().addContainerGap().addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, 71, GroupLayout.PREFERRED_SIZE).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED).addComponent(exceptionLabel, GroupLayout.DEFAULT_SIZE, 503, Short.MAX_VALUE).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(homeButton, GroupLayout.PREFERRED_SIZE, 101, GroupLayout.PREFERRED_SIZE).addContainerGap()).addComponent(bottomPanel, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 723, Short.MAX_VALUE));
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(jPanel1Layout.createSequentialGroup().addContainerGap().addGroup(jPanel1Layout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(iconLabel, GroupLayout.PREFERRED_SIZE, 70, GroupLayout.PREFERRED_SIZE).addGroup(jPanel1Layout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(exceptionLabel, GroupLayout.PREFERRED_SIZE, 70, GroupLayout.PREFERRED_SIZE).addComponent(homeButton, GroupLayout.PREFERRED_SIZE, 64, GroupLayout.PREFERRED_SIZE))).addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED).addComponent(bottomPanel, GroupLayout.DEFAULT_SIZE, 158, Short.MAX_VALUE)));
-
+
GroupLayout layout = new GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
diff -r f18dea419aec -r fc1923f295cf tests/netx/unit/net/sourceforge/jnlp/splashscreen/SplashScreenTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/splashscreen/SplashScreenTest.java Fri Jul 12 15:47:04 2013 -0400
+++ b/tests/netx/unit/net/sourceforge/jnlp/splashscreen/SplashScreenTest.java Wed Jul 17 18:59:39 2013 +0200
@@ -74,8 +74,8 @@
ie.setvendor("IcedTea-Web team");
ie.addDescription("Testing null description");
ie.addDescription("tsting twoline des ...break\ncription of kind short", InfoItem.descriptionKindShort);
- //panel.setInformationElement(ie);
- //panel.setVersion("1.2-re45fdg");
+ panel.setInformationElement(ie);
+ panel.setVersion("1.2-re45fdg");
setLayout(new BorderLayout());
getContentPane().add(panel.getSplashComponent(), BorderLayout.CENTER);
@@ -159,7 +159,7 @@
panel.startAnimation();
try {
- Thread.sleep(5000);
+ Thread.sleep(10000);
} catch (Exception e) {
}
//not needed
@@ -169,7 +169,10 @@
app.remove(panel.getSplashComponent());
r.setPercentage(panel.getPercentage());
r.adjustForSize();
+ r.setLoadingException(new RuntimeException(":)"));
panel = r;
+ panel.setVersion("1.2-re45fdg");
+
app.add(panel.getSplashComponent());
app.validateTree();
//app.pack();
More information about the distro-pkg-dev
mailing list