/hg/icedtea6: Add generic types to Hashtable in PluginAppletView...

[andrew at icedtea.classpath.org]

changeset d6930de9aba6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d6930de9aba6
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Dec 03 13:27:58 2010 +0000

	Add generic types to Hashtable in PluginAppletViewer to stop
	warnings in icedtea-web.

	2010-12-01 Andrew John Hughes <ahughes at redhat.com>

	 * patches/applet_hole.patch: Add generic types to
	Hashtable to stop warnings when building icedtea-web.


diffstat:

2 files changed, 76 insertions(+), 61 deletions(-)
ChangeLog                 |    6 ++
patches/applet_hole.patch |  131 ++++++++++++++++++++++++---------------------

diffs (155 lines):

diff -r b45cfed4da75 -r d6930de9aba6 ChangeLog
--- a/ChangeLog	Thu Dec 02 18:14:55 2010 +0100
+++ b/ChangeLog	Fri Dec 03 13:27:58 2010 +0000
@@ -1,3 +1,9 @@ 2010-12-02  Pavel Tisnovsky  <ptisnovs at r
+2010-12-01  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/applet_hole.patch:
+	Add generic types to Hashtable to stop warnings
+	when building icedtea-web.
+
 2010-12-02  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* test/jtreg/com/sun/javatest/regtest/CompileAction.java:
diff -r b45cfed4da75 -r d6930de9aba6 patches/applet_hole.patch
--- a/patches/applet_hole.patch	Thu Dec 02 18:14:55 2010 +0100
+++ b/patches/applet_hole.patch	Fri Dec 03 13:27:58 2010 +0000
@@ -1,64 +1,6 @@ diff -urN openjdk.orig/jdk/src/share/cla
-diff -urN openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java
---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	2008-01-12 15:53:45.000000000 -0500
-+++ openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	2008-02-04 11:51:20.000000000 -0500
-@@ -42,25 +42,25 @@
-  *
-  * @author      Arthur van Hoff
-  */
--class AppletViewerPanel extends AppletPanel {
-+public class AppletViewerPanel extends AppletPanel {
- 
-     /* Are we debugging? */
--    static boolean debug = false;
-+    protected static boolean debug = false;
- 
-     /**
-      * The document url.
-      */
--    URL documentURL;
-+    protected URL documentURL;
- 
-     /**
-      * The base url.
-      */
--    URL baseURL;
-+    protected URL baseURL;
- 
-     /**
-      * The attributes of the applet.
-      */
--    Hashtable atts;
-+    protected Hashtable atts;
- 
-     /*
-      * JDK 1.1 serialVersionUID
-@@ -70,7 +70,7 @@
-     /**
-      * Construct an applet viewer and start the applet.
-      */
--    AppletViewerPanel(URL documentURL, Hashtable atts) {
-+    protected AppletViewerPanel(URL documentURL, Hashtable atts) {
-         this.documentURL = documentURL;
-         this.atts = atts;
- 
-@@ -202,12 +202,12 @@
-         return (AppletContext)getParent();
-     }
- 
--    static void debug(String s) {
-+    protected static void debug(String s) {
-         if(debug)
-             System.err.println("AppletViewerPanel:::" + s);
-     }
- 
--    static void debug(String s, Throwable t) {
-+    protected static void debug(String s, Throwable t) {
-         if(debug) {
-             t.printStackTrace();
-             debug(s);
-diff -urN openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java
---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java	2008-03-26 04:58:12.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java	2008-04-07 21:55:56.000000000 -0400
+diff -r fbc7931ae89b src/share/classes/sun/applet/AppletPanel.java
+--- openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java	Fri Nov 12 12:08:44 2010 +0000
++++ openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java	Thu Dec 02 01:45:58 2010 +0000
 @@ -68,7 +68,7 @@
      /**
       * The applet (if loaded).
@@ -106,3 +48,70 @@ diff -urN openjdk.orig/jdk/src/share/cla
          if (status != APPLET_DISPOSE) {
              showAppletStatus("notdisposed");
              return;
+diff -r fbc7931ae89b src/share/classes/sun/applet/AppletViewerPanel.java
+--- openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	Fri Nov 12 12:08:44 2010 +0000
++++ openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java	Thu Dec 02 01:45:58 2010 +0000
+@@ -42,25 +42,25 @@
+  *
+  * @author      Arthur van Hoff
+  */
+-class AppletViewerPanel extends AppletPanel {
++public class AppletViewerPanel extends AppletPanel {
+ 
+     /* Are we debugging? */
+-    static boolean debug = false;
++    protected static boolean debug = false;
+ 
+     /**
+      * The document url.
+      */
+-    URL documentURL;
++    protected URL documentURL;
+ 
+     /**
+      * The base url.
+      */
+-    URL baseURL;
++    protected URL baseURL;
+ 
+     /**
+      * The attributes of the applet.
+      */
+-    Hashtable atts;
++    protected Hashtable<String,String> atts;
+ 
+     /*
+      * JDK 1.1 serialVersionUID
+@@ -70,7 +70,7 @@
+     /**
+      * Construct an applet viewer and start the applet.
+      */
+-    AppletViewerPanel(URL documentURL, Hashtable atts) {
++    protected AppletViewerPanel(URL documentURL, Hashtable<String,String> atts) {
+         this.documentURL = documentURL;
+         this.atts = atts;
+ 
+@@ -106,7 +106,7 @@
+      * Get an applet parameter.
+      */
+     public String getParameter(String name) {
+-        return (String)atts.get(name.toLowerCase());
++        return atts.get(name.toLowerCase());
+     }
+ 
+     /**
+@@ -202,12 +202,12 @@
+         return (AppletContext)getParent();
+     }
+ 
+-    static void debug(String s) {
++    protected static void debug(String s) {
+         if(debug)
+             System.err.println("AppletViewerPanel:::" + s);
+     }
+ 
+-    static void debug(String s, Throwable t) {
++    protected static void debug(String s, Throwable t) {
+         if(debug) {
+             t.printStackTrace();
+             debug(s);