# HG changeset patch
# User Jiri Vanek <jvanek@redhat.com>
# Date 1413209127 -7200
# Node ID 94e33db5ad021c9a6cf439e67d081609538b5d38
# Parent  a0d25551282d8939774bf7bb27ca148f15b4de8d
Removed all references to deprecated sun.misc.Ref

diff -r a0d25551282d -r 94e33db5ad02 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@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@redhat.com>
 
 	Empty "" codebase now behaves as "." codebase
diff -r a0d25551282d -r 94e33db5ad02 NEWS
--- a/NEWS	Thu Oct 09 18:42:42 2014 +0200
+++ b/NEWS	Mon Oct 13 16:05:27 2014 +0200
@@ -9,6 +9,8 @@
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
 New in release 1.5.2 (YYYY-MM-DD):
+* NetX
+  - RH1095311, PR574 -  References class sun.misc.Ref removed in OpenJDK 9 - fixed, and so buildable on JDK9
 
 New in release 1.5.1 (2014-08-13):
 * Massively improved offline abilities.
diff -r a0d25551282d -r 94e33db5ad02 configure.ac
--- a/configure.ac	Thu Oct 09 18:42:42 2014 +0200
+++ b/configure.ac	Mon Oct 13 16:05:27 2014 +0200
@@ -62,7 +62,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
@@ -81,7 +80,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 a0d25551282d -r 94e33db5ad02 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 a0d25551282d -r 94e33db5ad02 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 net.sourceforge.jnlp.runtime.JNLPRuntime;
@@ -815,7 +814,7 @@
     /**
      * Get an image ref.
      */
-    private synchronized Ref getCachedImageRef(URL url) {
+    private synchronized AppletImageRef getCachedImageRef(URL url) {
         PluginDebug.debug("getCachedImageRef() searching for ", url);
 
         try {