8028050: Typo correction needed s/Classlaoder/Classloader/
Reviewed-by: pchelko, azvegint
diff --git a/jdk/src/share/classes/sun/applet/AppletPanel.java b/jdk/src/share/classes/sun/applet/AppletPanel.java
index ce9fa99..f5879ef 100644
--- a/jdk/src/share/classes/sun/applet/AppletPanel.java
+++ b/jdk/src/share/classes/sun/applet/AppletPanel.java
@@ -28,23 +28,16 @@
import java.applet.*;
import java.awt.*;
import java.awt.event.*;
-import java.awt.image.ColorModel;
-import java.awt.image.MemoryImageSource;
import java.io.*;
import java.lang.ref.WeakReference;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.net.InetAddress;
import java.net.JarURLConnection;
-import java.net.MalformedURLException;
import java.net.SocketPermission;
import java.net.URL;
-import java.net.UnknownHostException;
import java.security.*;
import java.util.*;
-import java.util.Collections;
import java.util.Locale;
-import java.util.WeakHashMap;
import sun.awt.AWTAccessor;
import sun.awt.AppContext;
import sun.awt.EmbeddedFrame;
@@ -148,7 +141,9 @@
abstract protected String getJarFiles();
abstract protected String getSerializedObject();
+ @Override
abstract public int getWidth();
+ @Override
abstract public int getHeight();
abstract public boolean hasInitialFocus();
@@ -184,6 +179,7 @@
handler = new Thread(appletGroup, this, "thread " + nm);
// set the context class loader for this thread
AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public Object run() {
handler.setContextClassLoader(loader);
return null;
@@ -236,6 +232,7 @@
/**
* Minimum size
*/
+ @Override
public Dimension minimumSize() {
return new Dimension(defaultAppletSize.width,
defaultAppletSize.height);
@@ -244,6 +241,7 @@
/**
* Preferred size
*/
+ @Override
public Dimension preferredSize() {
return new Dimension(currentAppletSize.width,
currentAppletSize.height);
@@ -368,6 +366,7 @@
*
*
*/
+ @Override
public void run() {
Thread curThread = Thread.currentThread();
@@ -450,6 +449,7 @@
try {
final AppletPanel p = this;
Runnable r = new Runnable() {
+ @Override
public void run() {
p.validate();
}
@@ -480,6 +480,7 @@
final AppletPanel p = this;
final Applet a = applet;
Runnable r = new Runnable() {
+ @Override
public void run() {
p.validate();
a.setVisible(true);
@@ -515,6 +516,7 @@
try {
final Applet a = applet;
Runnable r = new Runnable() {
+ @Override
public void run() {
a.setVisible(false);
}
@@ -574,6 +576,7 @@
try {
final Applet a = applet;
Runnable r = new Runnable() {
+ @Override
public void run() {
remove(a);
}
@@ -628,10 +631,13 @@
*/
private Component getMostRecentFocusOwnerForWindow(Window w) {
Method meth = (Method)AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public Object run() {
Method meth = null;
try {
- meth = KeyboardFocusManager.class.getDeclaredMethod("getMostRecentFocusOwner", new Class[] {Window.class});
+ meth = KeyboardFocusManager.class.getDeclaredMethod(
+ "getMostRecentFocusOwner",
+ new Class[]{Window.class});
meth.setAccessible(true);
} catch (Exception e) {
// Must never happen
@@ -880,6 +886,7 @@
/**
* Return true when the applet has been started.
*/
+ @Override
public boolean isActive() {
return status == APPLET_START;
}
@@ -889,6 +896,7 @@
/**
* Is called when the applet wants to be resized.
*/
+ @Override
public void appletResize(int width, int height) {
currentAppletSize.width = width;
currentAppletSize.height = height;
@@ -904,17 +912,20 @@
final AppletPanel ap = this;
if (appEvtQ != null){
appEvtQ.postEvent(new InvocationEvent(Toolkit.getDefaultToolkit(),
- new Runnable(){
- public void run(){
- if(ap != null)
- {
- ap.dispatchAppletEvent(APPLET_RESIZE, currentSize);
+ new Runnable() {
+ @Override
+ public void run() {
+ if (ap != null) {
+ ap.dispatchAppletEvent(
+ APPLET_RESIZE,
+ currentSize);
}
}
}));
}
}
+ @Override
public void setBounds(int x, int y, int width, int height) {
super.setBounds(x, y, width, height);
currentAppletSize.width = width;
@@ -966,7 +977,7 @@
public String getClassLoaderCacheKey()
{
/**
- * Fixed #4501142: Classlaoder sharing policy doesn't
+ * Fixed #4501142: Classloader sharing policy doesn't
* take "archive" into account. This will be overridden
* by Java Plug-in. [stanleyh]
*/
@@ -1012,6 +1023,7 @@
getAccessControlContext(codebase);
c = (AppletClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public Object run() {
AppletClassLoader ac = createClassLoader(codebase);
/* Should the creation of the classloader be
@@ -1055,6 +1067,7 @@
PermissionCollection perms = (PermissionCollection)
AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public Object run() {
Policy p = java.security.Policy.getPolicy();
if (p != null) {
diff --git a/jdk/src/share/classes/sun/applet/AppletViewer.java b/jdk/src/share/classes/sun/applet/AppletViewer.java
index 17daf38..26faef5 100644
--- a/jdk/src/share/classes/sun/applet/AppletViewer.java
+++ b/jdk/src/share/classes/sun/applet/AppletViewer.java
@@ -33,21 +33,17 @@
import javax.print.attribute.*;
import java.applet.*;
import java.net.URL;
-import java.net.MalformedURLException;
import java.net.SocketPermission;
import sun.misc.Ref;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import sun.awt.SunToolkit;
import sun.awt.AppContext;
-import java.lang.ref.WeakReference;
/**
* A frame to show the applet tag in.
*/
-class TextFrame extends Frame {
+final class TextFrame extends Frame {
/**
* Create the tag frame.
@@ -66,6 +62,7 @@
p.add(b);
class ActionEventListener implements ActionListener {
+ @Override
public void actionPerformed(ActionEvent evt) {
dispose();
}
@@ -78,6 +75,7 @@
WindowListener windowEventListener = new WindowAdapter() {
+ @Override
public void windowClosing(WindowEvent evt) {
dispose();
}
@@ -90,20 +88,22 @@
}
/**
- * Lets us construct one using unix-style one shot behaviors
+ * Lets us construct one using unix-style one shot behaviors.
*/
+final class StdAppletViewerFactory implements AppletViewerFactory {
-class StdAppletViewerFactory implements AppletViewerFactory
-{
+ @Override
public AppletViewer createAppletViewer(int x, int y,
URL doc, Hashtable atts) {
return new AppletViewer(x, y, doc, atts, System.out, this);
}
+ @Override
public MenuBar getBaseMenuBar() {
return new MenuBar();
}
+ @Override
public boolean isStandalone() {
return true;
}
@@ -116,8 +116,7 @@
* (The document named appletviewertags.html in the JDK's docs/tooldocs directory,
* once the JDK docs have been installed.)
*/
-public class AppletViewer extends Frame implements AppletContext,
- Printable {
+public class AppletViewer extends Frame implements AppletContext, Printable {
/**
* Some constants...
@@ -147,13 +146,14 @@
private final class UserActionListener implements ActionListener {
+ @Override
public void actionPerformed(ActionEvent evt) {
processUserAction(evt);
}
}
/**
- * Create the applet viewer
+ * Create the applet viewer.
*/
public AppletViewer(int x, int y, URL doc, Hashtable atts,
PrintStream statusMsgStream, AppletViewerFactory factory) {
@@ -201,14 +201,17 @@
WindowListener windowEventListener = new WindowAdapter() {
+ @Override
public void windowClosing(WindowEvent evt) {
appletClose();
}
+ @Override
public void windowIconified(WindowEvent evt) {
appletStop();
}
+ @Override
public void windowDeiconified(WindowEvent evt) {
appletStart();
}
@@ -223,6 +226,7 @@
this.frame = frame;
}
+ @Override
public void appletStateChanged(AppletEvent evt)
{
AppletPanel src = (AppletPanel)evt.getSource();
@@ -370,6 +374,7 @@
/**
* Get an audio clip.
*/
+ @Override
public AudioClip getAudioClip(URL url) {
checkConnect(url);
synchronized (audioClips) {
@@ -386,6 +391,7 @@
/**
* Get an image.
*/
+ @Override
public Image getImage(URL url) {
return getCachedImage(url);
}
@@ -421,6 +427,7 @@
/**
* Get an applet by name.
*/
+ @Override
public Applet getApplet(String name) {
AppletSecurity security = (AppletSecurity)System.getSecurityManager();
name = name.toLowerCase();
@@ -450,6 +457,7 @@
* Return an enumeration of all the accessible
* applets on this page.
*/
+ @Override
public Enumeration getApplets() {
AppletSecurity security = (AppletSecurity)System.getSecurityManager();
Vector v = new Vector();
@@ -473,31 +481,37 @@
/**
* Ignore.
*/
+ @Override
public void showDocument(URL url) {
}
/**
* Ignore.
*/
+ @Override
public void showDocument(URL url, String target) {
}
/**
* Show status.
*/
+ @Override
public void showStatus(String status) {
label.setText(status);
}
+ @Override
public void setStream(String key, InputStream stream)throws IOException{
// We do nothing.
}
+ @Override
public InputStream getStream(String key){
// We do nothing.
return null;
}
+ @Override
public Iterator getStreamKeys(){
// We do nothing.
return null;
@@ -611,7 +625,7 @@
panel.sendEvent(AppletPanel.APPLET_DISPOSE);
/**
- * Fixed #4501142: Classlaoder sharing policy doesn't
+ * Fixed #4501142: Classloader sharing policy doesn't
* take "archive" into account. This will be overridden
* by Java Plug-in. [stanleyh]
*/
@@ -640,6 +654,7 @@
void appletSave() {
AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
public Object run() {
// XXX: this privileged block should be made smaller
// by initializing a private static variable with "user.dir"
@@ -768,6 +783,7 @@
}
}
+ @Override
public int print(Graphics graphics, PageFormat pf, int pageIndex) {
if (pageIndex > 0) {
return Printable.NO_SUCH_PAGE;
@@ -832,6 +848,7 @@
new Thread(new Runnable()
{
+ @Override
public void run()
{
appletShutdown(p);
@@ -867,6 +884,7 @@
//
new Thread(new Runnable()
{
+ @Override
public void run()
{
for (Enumeration e = appletPanels.elements() ; e.hasMoreElements() ;) {
