/hg/release/icedtea-web-1.7: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Mon Oct 1 17:19:26 UTC 2018
changeset 5adcd54e9d3b in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=5adcd54e9d3b
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Oct 01 19:08:34 2018 +0200
Added eternal java version detection
* acinclude.m4: used sophisticated head-cut to determine single number major java version
* plugin/icedteanp/IcedTeaNPPlugin.cc: similar
* launcher/launchers.in: same
changeset 2cf2e3479d57 in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=2cf2e3479d57
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Oct 01 19:16:32 2018 +0200
Fixed EDT hanging
changeset 2cce11acb592 in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=2cce11acb592
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Oct 01 19:18:51 2018 +0200
Support creating cache files with restricted access on windows
* netx/net/sourceforge/jnlp/util/FileUtils.java: set proper ACLs for cache files and directories
* tests/netx/unit/net/sourceforge/jnlp/util/FileUtilsTest.java: added testCreateRestrictedFile test that checks ACLs for cache file
diffstat:
.hgignore | 2 +-
AUTHORS | 1 +
ChangeLog | 51 ++
acinclude.m4 | 12 +-
launcher/launchers.in | 10 +-
netx/net/sourceforge/jnlp/GuiLaunchHandler.java | 46 +-
netx/net/sourceforge/jnlp/JNLPSplashScreen.java | 5 +-
netx/net/sourceforge/jnlp/Launcher.java | 7 +-
netx/net/sourceforge/jnlp/about/AboutDialog.java | 7 +-
netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 73 ++-
netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java | 3 +
netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java | 3 +
netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java | 5 +-
netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 3 +-
netx/net/sourceforge/jnlp/runtime/Boot.java | 10 +-
netx/net/sourceforge/jnlp/runtime/HtmlBoot.java | 8 +-
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 2 -
netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 5 +-
netx/net/sourceforge/jnlp/security/SecurityDialog.java | 25 +-
netx/net/sourceforge/jnlp/security/SecurityDialogs.java | 6 +-
netx/net/sourceforge/jnlp/security/dialogs/ViwableDialog.java | 39 +-
netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java | 15 +-
netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java | 16 +-
netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java | 6 +-
netx/net/sourceforge/jnlp/util/FileUtils.java | 85 ++-
netx/net/sourceforge/jnlp/util/logging/JavaConsole.java | 27 +-
netx/net/sourceforge/swing/SwingUtils.java | 223 ++++++++++
netx/net/sourceforge/swing/ThreadCheckingRepaintManager.java | 120 +++++
plugin/icedteanp/IcedTeaNPPlugin.cc | 14 +-
tests/netx/unit/net/sourceforge/jnlp/util/FileUtilsTest.java | 23 +
30 files changed, 683 insertions(+), 169 deletions(-)
diffs (truncated from 1556 to 500 lines):
diff -r caad90b359d8 -r 2cce11acb592 .hgignore
--- a/.hgignore Mon Sep 10 17:42:38 2018 +0200
+++ b/.hgignore Mon Oct 01 19:18:51 2018 +0200
@@ -14,4 +14,4 @@
netx-dist-tests-whitelist
rust-launcher/target
rust-launcher/Cargo.lock
-
+rust-launcher/.idea
diff -r caad90b359d8 -r 2cce11acb592 AUTHORS
--- a/AUTHORS Mon Sep 10 17:42:38 2018 +0200
+++ b/AUTHORS Mon Oct 01 19:18:51 2018 +0200
@@ -4,6 +4,7 @@
Lillian Angel <langel at redhat.com>
Andrew Azores <aazores at redhat.com>
Deepak Bhole <dbhole at redhat.com>
+Laurent Bourgès <bourges.laurent at gmail.com>
Adam Buchta <adbuch7 at gmail.com>
Ricardo MartÃn Camarero <rickyepoderi at yahoo.es>
Marcin Cieslak <marcin.cieslak at gmail.com>
diff -r caad90b359d8 -r 2cce11acb592 ChangeLog
--- a/ChangeLog Mon Sep 10 17:42:38 2018 +0200
+++ b/ChangeLog Mon Oct 01 19:18:51 2018 +0200
@@ -1,3 +1,48 @@
+2018-10-01 Laurent Bourgès <bourges.laurent at gmail.com>
+
+ Fixed EDT hanging
+ * AUTHORS: added Laurent
+ * netx/net/sourceforge/jnlp/GuiLaunchHandler.java: invokeLater and invokeAndWait moved from SwingUtilities to the local wrapper SwingUtils.
+ Simplified splashscreen loading
+ * netx/net/sourceforge/jnlp/JNLPSplashScreen.java: called super and added name to the dialog
+ * netx/net/sourceforge/jnlp/Launcher.java: added log entry for main class loading. Highlighted usage of SwingUtilities on top SwingUtils
+ for this particular space
+ * netx/net/sourceforge/jnlp/about/AboutDialog.java: added name. InvokeLater and invokeAndWait moved from SwingUtilities to the
+ local wrapper SwingUtils.
+ * netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java: reworked to work in SwingUtils.invokeAndWait. Added name.
+ * netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java: added name
+ * netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java: added name
+ * netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java: added top level setup for enabling SwingUtils debugging abilities
+ added log entry for main class loading. Highlighted usage of SwingUtilities on top SwingUtils for this particular space
+ * netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java: instead of invokeAndWait, used SwingUtils.callOnAppContext
+ * netx/net/sourceforge/jnlp/runtime/Boot.java: added top level setup for enabling SwingUtils debugging abilities
+ CertificateViwer moved to invokeAndWait. added log entry for main class loading. Highlighted usage of SwingUtilities instead
+ of SwingUtils for this particular case
+ * netx/net/sourceforge/jnlp/runtime/HtmlBoot.java: invokeLater and invokeAndWait moved from SwingUtilities to the local wrapper SwingUtils.
+ * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: removed import of import javax.swing.JWindow
+ * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: direct call to JWindow().getOwner(), moved to SwingUtils.getOrCreateWindowOwner.
+ Its existence doubtful
+ * netx/net/sourceforge/jnlp/security/SecurityDialog.java: installPanel moved to invokeAndWait
+ * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: used SwingUtils instead of SwingUtilities, added name
+ * netx/net/sourceforge/jnlp/security/dialogs/ViwableDialog.java: swing ops moved to invokeAndWait
+ * netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java: calling Swingutils.setup, still all the same
+ * netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java: still the same
+ * netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java: same - name, SwingUtils x SwingUtilities, and proper usage of invokes
+ * netx/net/sourceforge/jnlp/util/FileUtils.java: SwingUtils x SwingUtilities
+ * netx/net/sourceforge/jnlp/util/logging/JavaConsole.java: observable.notifyObservers moved to invokeLater and
+ and invoked only if observable.hasChanged
+ * netx/net/sourceforge/swing/SwingUtils.java: new class. Wrapper around most commonly used SwingUtilities calls. Add debugging bridge
+ property of icedtea-web.edt.debug set to true, can enable it on runtime.
+ * netx/net/sourceforge/swing/ThreadCheckingRepaintManager.java: Based on http://weblogs.java.net/blog/alexfromsun/archive/2006/02/debugging_swing.html
+ debugging repaint manager
+
+2018-10-01 Fridrich Strba <fridrich.strba at suse.com>
+
+ Added eternal java version detection
+ * acinclude.m4: used sophisticated head-cut to determine single number major java version
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: similar
+ * launcher/launchers.in: same
+
2018-09-05 Jiri Vanek <jvanek at redhat.com>
* launcher/launchers.in: inverted logic to detect modular jdk.
@@ -112,6 +157,12 @@
* NEWS: set date and added content for 1.7.1
* configure.ac: (AC_INIT) set to use 1.7.1
+2017-11-08 Alex Kashchenko <akashche at redhat.com>
+
+ Support creating cache files with restricted access on windows
+ * netx/net/sourceforge/jnlp/util/FileUtils.java: set proper ACLs for cache files and directories
+ * tests/netx/unit/net/sourceforge/jnlp/util/FileUtilsTest.java: added testCreateRestrictedFile test that checks ACLs for cache file
+
2017-15-12 Jiri Vanek <jvanek at redhat.com>
Tomáš Votava <tomcacolca at gmail.com>
diff -r caad90b359d8 -r 2cce11acb592 acinclude.m4
--- a/acinclude.m4 Mon Sep 10 17:42:38 2018 +0200
+++ b/acinclude.m4 Mon Oct 01 19:18:51 2018 +0200
@@ -795,10 +795,16 @@
[
AC_REQUIRE([IT_FIND_JAVA])
AC_MSG_CHECKING([JDK version])
- JAVA_VERSION=`$JAVA -version 2>&1`
+ JAVA_VERSION=`$JAVA -version 2>&1 | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f1`
+ if test "${JAVA_VERSION}" -eq "1"; then
+ JAVA_VERSION=`$JAVA -version 2>&1 | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f2`
+ fi
AC_MSG_RESULT($JAVA_VERSION)
- HAVE_JAVA8=`if echo $JAVA_VERSION | grep -q -e 1.8.0 ; then echo yes ; fi`
- HAVE_JAVA9=`if echo $JAVA_VERSION | grep -q -e 1.9.0 -e \"9 -e "build 9" ; then echo yes ; fi `
+ if test "${JAVA_VERSION}" -eq "8"; then
+ HAVE_JAVA8="yes"
+ elif test "$JAVA_VERSION" -ge "9"; then
+ HAVE_JAVA9="yes"
+ fi
if test -z "$HAVE_JAVA8" -a -z "$HAVE_JAVA9"; then
AC_MSG_ERROR([JDK8 or newer is required, detected was: $JAVA_VERSION])
fi
diff -r caad90b359d8 -r 2cce11acb592 launcher/launchers.in
--- a/launcher/launchers.in Mon Sep 10 17:42:38 2018 +0200
+++ b/launcher/launchers.in Mon Oct 01 19:18:51 2018 +0200
@@ -37,9 +37,13 @@
LAUNCHER_BOOTCLASSPATH="$LAUNCHER_BOOTCLASSPATH:@JRE@/$NASHORN"
fi;
-MODULAR_JDK="YES"
-if ${JAVA} -version 2>&1 | grep -q "version \"1.8.0" ; then
- MODULAR_JDK="NO"
+MODULAR_JDK="NO"
+version=`${JAVA} -version 2>&1 | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f1`
+if [ $version -eq "1" ]; then
+ version=`${JAVA} -version 2>&1 | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f2`
+fi
+if [ $version -ge "9" ]; then
+ MODULAR_JDK="YES"
fi
JAVA_ARGS=( )
diff -r caad90b359d8 -r 2cce11acb592 netx/net/sourceforge/jnlp/GuiLaunchHandler.java
--- a/netx/net/sourceforge/jnlp/GuiLaunchHandler.java Mon Sep 10 17:42:38 2018 +0200
+++ b/netx/net/sourceforge/jnlp/GuiLaunchHandler.java Mon Oct 01 19:18:51 2018 +0200
@@ -37,10 +37,8 @@
package net.sourceforge.jnlp;
-import java.lang.reflect.InvocationTargetException;
import java.net.URL;
-
-import javax.swing.SwingUtilities;
+import net.sourceforge.swing.SwingUtils;
import net.sourceforge.jnlp.cache.ResourceTracker;
import net.sourceforge.jnlp.cache.UpdatePolicy;
@@ -70,7 +68,7 @@
@Override
public void launchError(final LaunchException exception) {
BasicExceptionDialog.willBeShown();
- SwingUtilities.invokeLater(new Runnable() {
+ SwingUtils.invokeLater(new Runnable() {
@Override
public void run() {
closeSplashScreen();
@@ -94,7 +92,7 @@
@Override
public void launchStarting(ApplicationInstance application) {
- SwingUtilities.invokeLater(new Runnable() {
+ SwingUtils.invokeLater(new Runnable() {
@Override
public void run() {
closeSplashScreen();
@@ -117,39 +115,17 @@
resourceTracker.addResource(splashImageURL, file.getFileVersion(), null, policy);
}
synchronized (mutex) {
- try {
- SwingUtilities.invokeAndWait(new Runnable() {
+ SwingUtils.invokeAndWait(new Runnable() {
- @Override
- public void run() {
- splashScreen = new JNLPSplashScreen(resourceTracker, file);
- }
- });
- } catch (InterruptedException ie) {
- // Wait till splash screen is created
- while (splashScreen == null);
- } catch (InvocationTargetException ite) {
- OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ite);
- }
- try {
- SwingUtilities.invokeAndWait(new Runnable() {
-
- @Override
- public void run() {
- splashScreen.setSplashImageURL(splashImageURL);
- }
- });
- } catch (InterruptedException ie) {
- // Wait till splash screen is created
- while (!splashScreen.isSplashImageLoaded());
- } catch (InvocationTargetException ite) {
- OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ite);
- }
-
-
+ @Override
+ public void run() {
+ splashScreen = new JNLPSplashScreen(resourceTracker, file);
+ splashScreen.setSplashImageURL(splashImageURL);
+ }
+ });
}
- SwingUtilities.invokeLater(new Runnable() {
+ SwingUtils.invokeLater(new Runnable() {
@Override
public void run() {
diff -r caad90b359d8 -r 2cce11acb592 netx/net/sourceforge/jnlp/JNLPSplashScreen.java
--- a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Mon Sep 10 17:42:38 2018 +0200
+++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Mon Oct 01 19:18:51 2018 +0200
@@ -47,6 +47,7 @@
import java.net.URL;
import javax.imageio.ImageIO;
import javax.swing.JDialog;
+import net.sourceforge.swing.SwingUtils;
import net.sourceforge.jnlp.cache.ResourceTracker;
import net.sourceforge.jnlp.splashscreen.SplashPanel;
import net.sourceforge.jnlp.splashscreen.SplashUtils;
@@ -70,7 +71,9 @@
private SplashPanel splash;
public JNLPSplashScreen(ResourceTracker resourceTracker, final JNLPFile file) {
-
+ super();
+ this.setName("JNLPSplashScreen");
+ SwingUtils.info(this);
setIconImages(ImageResources.INSTANCE.getApplicationImages());
// If the JNLP file does not contain any icon images, the splash image
diff -r caad90b359d8 -r 2cce11acb592 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Mon Sep 10 17:42:38 2018 +0200
+++ b/netx/net/sourceforge/jnlp/Launcher.java Mon Oct 01 19:18:51 2018 +0200
@@ -40,11 +40,11 @@
import net.sourceforge.jnlp.services.InstanceExistsException;
import net.sourceforge.jnlp.services.ServiceUtil;
-import javax.swing.SwingUtilities;
import javax.swing.text.html.parser.ParserDelegator;
import net.sourceforge.jnlp.splashscreen.SplashUtils;
import net.sourceforge.jnlp.util.StreamUtils;
import net.sourceforge.jnlp.util.logging.OutputController;
+import net.sourceforge.swing.SwingUtils;
import sun.awt.SunToolkit;
@@ -549,12 +549,15 @@
R("LCantDetermineMainClassInfo")));
}
+ OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "Starting application [" + mainName + "] ...");
+
Class<?> mainClass = app.getClassLoader().loadClass(mainName);
Method main = mainClass.getMethod("main", new Class<?>[] { String[].class });
String args[] = file.getApplication().getArguments();
- SwingUtilities.invokeAndWait(new Runnable() {
+ // create EDT within application context:
+ SwingUtils.callOnAppContext(new Runnable() {
// dummy method to force Event Dispatch Thread creation
@Override
public void run() {
diff -r caad90b359d8 -r 2cce11acb592 netx/net/sourceforge/jnlp/about/AboutDialog.java
--- a/netx/net/sourceforge/jnlp/about/AboutDialog.java Mon Sep 10 17:42:38 2018 +0200
+++ b/netx/net/sourceforge/jnlp/about/AboutDialog.java Mon Oct 01 19:18:51 2018 +0200
@@ -53,13 +53,13 @@
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
import javax.swing.border.EmptyBorder;
import net.sourceforge.jnlp.util.ScreenFinder;
import net.sourceforge.jnlp.util.docprovider.TextsProvider;
import net.sourceforge.jnlp.util.docprovider.formatters.formatters.HtmlFormatter;
import net.sourceforge.jnlp.util.logging.OutputController;
+import net.sourceforge.swing.SwingUtils;
public final class AboutDialog extends JPanel implements Runnable, ActionListener {
@@ -95,10 +95,11 @@
super(new GridBagLayout());
this.app = app;
frame = new JDialog((Frame) null, R("AboutDialogueTabAbout") + " IcedTea-Web", modal);
+ frame.setName("AboutDialog");
+ SwingUtils.info(frame);
frame.setContentPane(this);
frame.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-
aboutButton = new JButton( R("AboutDialogueTabAbout"));
aboutButton.addActionListener(this);
@@ -267,7 +268,7 @@
}
public static void display(boolean modal, String app, ShowPage showPage) {
- SwingUtilities.invokeLater(new AboutDialog(modal, app, showPage));
+ SwingUtils.invokeLater(new AboutDialog(modal, app, showPage));
}
}
diff -r caad90b359d8 -r 2cce11acb592 netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java
--- a/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java Mon Sep 10 17:42:38 2018 +0200
+++ b/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java Mon Oct 01 19:18:51 2018 +0200
@@ -26,6 +26,7 @@
import javax.swing.*;
import javax.swing.Timer;
import javax.jnlp.*;
+import net.sourceforge.swing.SwingUtils;
import net.sourceforge.jnlp.runtime.*;
import net.sourceforge.jnlp.util.ImageResources;
@@ -106,39 +107,48 @@
* @return donload service listener attached to this app. instance
*/
@Override
- public DownloadServiceListener getListener(ApplicationInstance app, String downloadName, URL resources[]) {
- DownloadPanel result = new DownloadPanel(downloadName);
+ public DownloadServiceListener getListener(ApplicationInstance app, final String downloadName, final URL resources[]) {
+ final FutureResult<DownloadPanel> result = new FutureResult<DownloadPanel>() {
+ @Override
+ public void run() {
+ DownloadPanel result = new DownloadPanel(downloadName);
+
+ synchronized (dialogMutex) {
+ if (dialog == null) {
+ dialog = createDownloadIndicatorWindow(true);
+ }
- synchronized (dialogMutex) {
- if (dialog == null) {
- dialog = createDownloadIndicatorWindow(true);
- }
+ if (resources != null) {
+ for (URL url : resources) {
+ result.addProgressPanel(url, null);
+ }
+ }
- if (resources != null) {
- for (URL url : resources) {
- result.addProgressPanel(url, null);
-
+ dialog.getContentPane().add(result, vertical);
+ dialog.pack();
+ placeFrameToLowerRight();
+
+ result.addComponentListener(new ComponentAdapter() {
+ @Override
+ public void componentResized(ComponentEvent e) {
+ placeFrameToLowerRight();
+ }
+ });
+
+ dialog.setVisible(true);
+
+ setRef(result);
}
}
-
- dialog.getContentPane().add(result, vertical);
- dialog.pack();
- placeFrameToLowerRight();
- result.addComponentListener(new ComponentAdapter() {
- @Override
- public void componentResized(ComponentEvent e) {
- placeFrameToLowerRight();
- }
- });
-
- dialog.setVisible(true);
-
- return result;
- }
+ };
+ SwingUtils.invokeAndWait(result);
+ return result.getRef();
}
public static JDialog createDownloadIndicatorWindow(boolean undecorated) throws HeadlessException {
JDialog f = new JDialog((JFrame)null, downloading + "...");
+ f.setName("DownloadIndicatorDialog");
+ SwingUtils.info(f);
f.setUndecorated(undecorated);
f.setIconImages(ImageResources.INSTANCE.getApplicationImages());
f.getContentPane().setLayout(new GridBagLayout());
@@ -328,7 +338,7 @@
}
};
- SwingUtilities.invokeLater(r);
+ SwingUtils.invokeLater(r);
}
/**
@@ -474,4 +484,15 @@
}
};
+ static abstract class FutureResult<V> implements Runnable {
+ private V ref = null;
+
+ public V getRef() {
+ return ref;
+ }
+
+ public void setRef(V ref) {
+ this.ref = ref;
+ }
+ }
}
diff -r caad90b359d8 -r 2cce11acb592 netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java
--- a/netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java Mon Sep 10 17:42:38 2018 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java Mon Oct 01 19:18:51 2018 +0200
@@ -32,6 +32,7 @@
import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.util.ImageResources;
import net.sourceforge.jnlp.util.ScreenFinder;
+import net.sourceforge.swing.SwingUtils;
/**
* This dialog provides a means for user to edit more of the proxy settings.
@@ -55,6 +56,8 @@
*/
public AdvancedProxySettingsDialog(DeploymentConfiguration config) {
super((Frame) null, dialogTitle, true); // Don't need a parent.
+ this.setName("AdvancedProxySettingsDialog");
+ SwingUtils.info(this);
setIconImages(ImageResources.INSTANCE.getApplicationImages());
this.config = config;
diff -r caad90b359d8 -r 2cce11acb592 netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java
--- a/netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java Mon Sep 10 17:42:38 2018 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java Mon Oct 01 19:18:51 2018 +0200
@@ -34,6 +34,7 @@
import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.util.ImageResources;
import net.sourceforge.jnlp.util.ScreenFinder;
+import net.sourceforge.swing.SwingUtils;
/**
* This class will provide a visual way of viewing cache.
@@ -55,6 +56,8 @@
*/
public CacheViewer(DeploymentConfiguration config) {
super((Frame) null, dialogTitle, true); // Don't need a parent.
+ this.setName("CacheViewer");
+ SwingUtils.info(this);
this.config = config;
if (config == null) {
throw new IllegalArgumentException("config: " + config);
diff -r caad90b359d8 -r 2cce11acb592 netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Mon Sep 10 17:42:38 2018 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Mon Oct 01 19:18:51 2018 +0200
@@ -45,7 +45,6 @@
import javax.swing.JPanel;
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;
@@ -59,6 +58,7 @@
import net.sourceforge.jnlp.security.viewer.CertificatePane;
import net.sourceforge.jnlp.util.ImageResources;
import net.sourceforge.jnlp.util.logging.OutputController;
+import net.sourceforge.swing.SwingUtils;
/**
* This is the control panel for Java. It provides a GUI for modifying the
@@ -418,8 +418,7 @@
// ignore; not a big deal
}
-
- SwingUtilities.invokeLater(new Runnable() {
+ SwingUtils.invokeLater(new Runnable() {
@Override
public void run() {
final ControlPanel editor = new ControlPanel(config);
diff -r caad90b359d8 -r 2cce11acb592 netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java
--- a/netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java Mon Sep 10 17:42:38 2018 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java Mon Oct 01 19:18:51 2018 +0200
@@ -30,6 +30,7 @@
import net.sourceforge.jnlp.*;
import net.sourceforge.jnlp.splashscreen.SplashController;
import net.sourceforge.jnlp.util.*;
+import net.sourceforge.swing.SwingUtils;
/**
* The applet environment including stub, context, and frame. The
@@ -188,7 +189,7 @@
}
try {
- SwingUtilities.invokeAndWait(new Runnable() {
+ SwingUtils.callOnAppContext(new Runnable() {
More information about the distro-pkg-dev
mailing list