Changeset 355

Timestamp:

Apr 26, 2012, 1:56:31 PM (13 years ago)

Author:

dmik

Message:

jdk: Apply applet_hole patch need for IcedTea-Web.

See #15 for details.

Location:

trunk/openjdk/jdk/src/share/classes/sun/applet

Files:

• AppletPanel.java (modified) (5 diffs)
• AppletViewerPanel.java (modified) (4 diffs)

trunk/openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java

@@ -69 +69 @@
      * The applet (if loaded).
      */
-    Applet applet;
+    protected Applet applet;
 
     /**
@@ -118 +118 @@
      * The thread for the applet.
      */
-    Thread handler;
+    protected Thread handler;
 
 
@@ -163 +163 @@
      * each time an applet is loaded and reloaded.
      */
-    synchronized void createAppletThread() {
+        //Overridden by NetxPanel.
+    protected synchronized void createAppletThread() {
         // Create a thread group for the applet, and start a new
         // thread to load the applet.
@@ -307 +308 @@
      * Get an event from the queue.
      */
-    synchronized AppletEvent getNextEvent() throws InterruptedException {
+    protected synchronized AppletEvent getNextEvent() throws InterruptedException {
         while (queue == null || queue.isEmpty()) {
             wait();
@@ -696 +697 @@
      * things like HotJava.
      */
-    private void runLoader() {
+        //Overridden by NetxPanel.
+    protected void runLoader() {
         if (status != APPLET_DISPOSE) {
             showAppletStatus("notdisposed");

trunk/openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java

@@ -43 +43 @@
  * @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;
 
     /*
@@ -71 +71 @@
      * 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;
@@ -107 +107 @@
      */
     public String getParameter(String name) {
-        return (String)atts.get(name.toLowerCase());
+        return atts.get(name.toLowerCase());
     }
 
@@ -203 +203 @@
     }
 
-    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();