8009141: Avoid netscape.javascript.JSObject in nashorn code

Reviewed-by: lagergren, hannesw
This commit is contained in:
Athijegannathan Sundararajan 2013-05-16 14:52:48 +05:30
parent 18bdc5fd42
commit 6e91576480
4 changed files with 3 additions and 19 deletions

View File

@ -23,26 +23,12 @@
* questions. * questions.
*/ */
package netscape.javascript; package jdk.nashorn.api.scripting;
import java.applet.Applet;
/** /**
* Stub for JSObject to get compilation going. * netscape.javascript.JSObject-like interface for nashorn script objects.
*/ */
public abstract class JSObject { public abstract class JSObject {
/**
* Get the window for an {@link Applet}. Not supported
* by Nashorn
*
* @param a applet
* @return the window instance
*/
public static JSObject getWindow(final Applet a) {
throw new UnsupportedOperationException("getWindow");
}
/** /**
* Call a JavaScript method * Call a JavaScript method
* *

View File

@ -42,7 +42,6 @@ import jdk.nashorn.internal.runtime.Context;
import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptFunction;
import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.ScriptObject;
import jdk.nashorn.internal.runtime.ScriptRuntime; import jdk.nashorn.internal.runtime.ScriptRuntime;
import netscape.javascript.JSObject;
/** /**
* Mirror object that wraps a given ScriptObject instance. User can * Mirror object that wraps a given ScriptObject instance. User can

View File

@ -38,7 +38,7 @@ import jdk.internal.dynalink.linker.LinkerServices;
import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker; import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
import jdk.internal.dynalink.support.CallSiteDescriptorFactory; import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
import jdk.nashorn.internal.runtime.JSType; import jdk.nashorn.internal.runtime.JSType;
import netscape.javascript.JSObject; import jdk.nashorn.api.scripting.JSObject;
/** /**
* A Dynalink linker to handle web browser built-in JS (DOM etc.) objects as well * A Dynalink linker to handle web browser built-in JS (DOM etc.) objects as well

View File

@ -47,7 +47,6 @@ import javax.script.ScriptEngineFactory;
import javax.script.ScriptEngineManager; import javax.script.ScriptEngineManager;
import javax.script.ScriptException; import javax.script.ScriptException;
import javax.script.SimpleScriptContext; import javax.script.SimpleScriptContext;
import netscape.javascript.JSObject;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;