109 lines
3.3 KiB
Diff
109 lines
3.3 KiB
Diff
|
diff --git jdk8/jdk/src/share/classes/sun/applet/AppletPanel.java jdk8/jdk/src/share/classes/sun/applet/AppletPanel.java
|
||
|
|
--- jdk8/jdk/src/share/classes/sun/applet/AppletPanel.java
|
||
|
|
+++ jdk8/jdk/src/share/classes/sun/applet/AppletPanel.java
|
||
|
|
@@ -68,7 +68,7 @@
|
||
|
|
/**
|
||
|
|
* The applet (if loaded).
|
||
|
|
*/
|
||
|
|
- Applet applet;
|
||
|
|
+ protected Applet applet;
|
||
|
|
|
||
|
|
/**
|
||
|
|
* Applet will allow initialization. Should be
|
||
|
|
@@ -162,7 +162,8 @@
|
||
|
|
* Creates a thread to run the applet. This method is called
|
||
|
|
* 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.
|
||
|
|
String nm = "applet-" + getCode();
|
||
|
|
@@ -306,7 +307,7 @@
|
||
|
|
/**
|
||
|
|
* Get an event from the queue.
|
||
|
|
*/
|
||
|
|
- synchronized AppletEvent getNextEvent() throws InterruptedException {
|
||
|
|
+ protected synchronized AppletEvent getNextEvent() throws InterruptedException {
|
||
|
|
while (queue == null || queue.isEmpty()) {
|
||
|
|
wait();
|
||
|
|
}
|
||
|
|
@@ -692,7 +693,8 @@
|
||
|
|
* applet event processing so that it can be gracefully interrupted from
|
||
|
|
* things like HotJava.
|
||
|
|
*/
|
||
|
|
- private void runLoader() {
|
||
|
|
+ //Overridden by NetxPanel.
|
||
|
|
+ protected void runLoader() {
|
||
|
|
if (status != APPLET_DISPOSE) {
|
||
|
|
showAppletStatus("notdisposed");
|
||
|
|
return;
|
||
|
|
diff --git jdk8/jdk/src/share/classes/sun/applet/AppletViewerPanel.java jdk8/jdk/src/share/classes/sun/applet/AppletViewerPanel.java
|
||
|
|
--- jdk8/jdk/src/share/classes/sun/applet/AppletViewerPanel.java
|
||
|
|
+++ jdk8/jdk/src/share/classes/sun/applet/AppletViewerPanel.java
|
||
|
|
@@ -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);
|