/hg/icedtea-web: Removed all references to deprecated sun.misc.Ref
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Mon Oct 13 14:05:40 UTC 2014
changeset df05d1de5af4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=df05d1de5af4
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Oct 13 16:05:27 2014 +0200
Removed all references to deprecated sun.misc.Ref
diffstat:
ChangeLog | 9 +++++++++
NEWS | 1 +
configure.ac | 2 --
netx/net/sourceforge/jnlp/config/PathsAndFiles.java | 2 +-
netx/net/sourceforge/jnlp/resources/Messages.properties | 2 +-
netx/net/sourceforge/jnlp/util/ui/NonEditableTableModel.java | 4 ++--
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 3 +--
7 files changed, 15 insertions(+), 8 deletions(-)
diffs (111 lines):
diff -r c6af2f50a95e -r df05d1de5af4 ChangeLog
--- a/ChangeLog Thu Oct 09 18:42:42 2014 +0200
+++ b/ChangeLog Mon Oct 13 16:05:27 2014 +0200
@@ -1,3 +1,12 @@
+2014-10-13 Fridrich Strba <fridrich.strba at suse.com>
+
+ Removed all references to deprecated sun.misc.Ref
+ * configure.ac: removed check for a sun.misc.Ref
+ * netx/net/sourceforge/jnlp/util/ui/NonEditableTableModel.java: all occurrences
+ of Vector<?> replaced by Vector. JDK9 compliant style.
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: (getCachedImageRef)
+ type of return value changed from Ref to AppletImageRef. Adapted imports.
+
2014-10-09 Jiri Vanek <jvanek at redhat.com>
Empty "" codebase now behaves as "." codebase
diff -r c6af2f50a95e -r df05d1de5af4 NEWS
--- a/NEWS Thu Oct 09 18:42:42 2014 +0200
+++ b/NEWS Mon Oct 13 16:05:27 2014 +0200
@@ -24,6 +24,7 @@
- RH1091563: [abrt] icedtea-web-1.5-2.fc20: Uncaught exception java.lang.ClassCastException in method sun.applet.PluginAppletViewer$8.run()
- Dropped support for long unmaintained -basedir argument
- Returned support for -jnlp argument
+ - RH1095311, PR574 - References class sun.misc.Ref removed in OpenJDK 9 - fixed, and so buildable on JDK9
* Plugin
- PR1743 - Intermittant deadlock in PluginRequestProcessor
- RH1121549: coverity defects
diff -r c6af2f50a95e -r df05d1de5af4 configure.ac
--- a/configure.ac Thu Oct 09 18:42:42 2014 +0200
+++ b/configure.ac Mon Oct 13 16:05:27 2014 +0200
@@ -64,7 +64,6 @@
dnl IT570 - NetX depends on sun.applet.AppletViewPanel
dnl IT571 - NetX depends on com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager.java
dnl IT573 - Plugin depends on sun.awt,X11.XEmbeddedFrame.java
-dnl IT574 - Plugin depends on sun.misc.Ref
dnl IT575 - Plugin depends on com.sun/jndi.toolkit.url.UrlUtil
dnl IT576 - Plugin depends on sun.applet.AppletImageRef
dnl IT578 - Remove need for patching AppletPanel for Plugin/Webstart
@@ -83,7 +82,6 @@
IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE, [sun.net.www.protocol.jar.URLJarFile])
IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK, [sun.net.www.protocol.jar.URLJarFileCallBack])
IT_CHECK_FOR_CLASS(SUN_AWT_X11_XEMBEDDEDFRAME, [sun.awt.X11.XEmbeddedFrame])
-IT_CHECK_FOR_CLASS(SUN_MISC_REF, [sun.misc.Ref])
IT_CHECK_FOR_CLASS(COM_SUN_JNDI_TOOLKIT_URL_URLUTIL, [com.sun.jndi.toolkit.url.UrlUtil])
IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
IT_CHECK_FOR_SUN_APPLET_ACCESSIBILITY
diff -r c6af2f50a95e -r df05d1de5af4 netx/net/sourceforge/jnlp/config/PathsAndFiles.java
--- a/netx/net/sourceforge/jnlp/config/PathsAndFiles.java Thu Oct 09 18:42:42 2014 +0200
+++ b/netx/net/sourceforge/jnlp/config/PathsAndFiles.java Mon Oct 13 16:05:27 2014 +0200
@@ -137,7 +137,7 @@
}
};
- public static final InfrastructureFileDescriptor USER_DEPLOYMENT_FILE = new ItwConfigFileDescriptor(DEPLOYMENT_PROPERTIES, "Users main deployment properties file.", Target.JAVAWS, Target.ITWEB_SETTINGS);
+ public static final InfrastructureFileDescriptor USER_DEPLOYMENT_FILE = new ItwConfigFileDescriptor(DEPLOYMENT_PROPERTIES, "FILEuserdp", Target.JAVAWS, Target.ITWEB_SETTINGS);
private static enum Target {
JAVAWS, PLUGIN, ITWEB_SETTINGS, POLICY_EDITOR;
diff -r c6af2f50a95e -r df05d1de5af4 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Thu Oct 09 18:42:42 2014 +0200
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Oct 13 16:05:27 2014 +0200
@@ -989,7 +989,7 @@
FILEusercerts=Contains various users stored certificates.
FILEjavacerts=Contains various system java-wide stored certificates.
FILEjavadp=java-global deployment properties file. May be affected by {0}.
-FILEuserdp=main deployment properties file.
+FILEuserdp=Users main deployment properties file.
APPEXTSECappletSecurityLevelExtraHighId=Disable running of all Java applets
APPEXTSECappletSecurityLevelVeryHighId=Very High Security
diff -r c6af2f50a95e -r df05d1de5af4 netx/net/sourceforge/jnlp/util/ui/NonEditableTableModel.java
--- a/netx/net/sourceforge/jnlp/util/ui/NonEditableTableModel.java Thu Oct 09 18:42:42 2014 +0200
+++ b/netx/net/sourceforge/jnlp/util/ui/NonEditableTableModel.java Mon Oct 13 16:05:27 2014 +0200
@@ -94,7 +94,7 @@
* @param rowCount the number of rows the table holds
* @see DefaultTableModel#DefaultTableModel(Vector,int)
*/
- public NonEditableTableModel(final Vector<?> columnNames, final int rowCount) {
+ public NonEditableTableModel(final Vector columnNames, final int rowCount) {
super(columnNames, rowCount);
}
@@ -106,7 +106,7 @@
* @param columnNames {@code vector} containing the names of the new columns
* @see DefaultTableModel#DefaultTableModel(Vector,Vector)
*/
- public NonEditableTableModel(final Vector<?> data, final Vector<?> columnNames) {
+ public NonEditableTableModel(final Vector data, final Vector columnNames) {
super(data, columnNames);
}
diff -r c6af2f50a95e -r df05d1de5af4 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Oct 09 18:42:42 2014 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Oct 13 16:05:27 2014 +0200
@@ -115,7 +115,6 @@
import sun.awt.AppContext;
import sun.awt.SunToolkit;
import sun.awt.X11.XEmbeddedFrame;
-import sun.misc.Ref;
import com.sun.jndi.toolkit.url.UrlUtil;
import java.net.HttpURLConnection;
@@ -819,7 +818,7 @@
/**
* Get an image ref.
*/
- private synchronized Ref getCachedImageRef(URL url) {
+ private synchronized AppletImageRef getCachedImageRef(URL url) {
PluginDebug.debug("getCachedImageRef() searching for ", url);
try {
More information about the distro-pkg-dev
mailing list