8009141: Avoid netscape.javascript.JSObject in nashorn code

Reviewed-by: lagergren, hannesw

nashorn/src/netscape/javascript/JSObject.java → nashorn/src/jdk/nashorn/api/scripting/JSObject.java

@@ -23,26 +23,12 @@
  * questions.
  */
 
-package netscape.javascript;
-
-import java.applet.Applet;
+package jdk.nashorn.api.scripting;
 
 /**
- * Stub for JSObject to get compilation going.
+ * netscape.javascript.JSObject-like interface for nashorn script objects.
  */
 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
      *

nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java

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

nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java

@@ -38,7 +38,7 @@ import jdk.internal.dynalink.linker.LinkerServices;
 import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
 import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
 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

nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java

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