From 6e9157648062e24fa6a84bb0d06f32e5674c88bd Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Thu, 16 May 2013 14:52:48 +0530
Subject: [PATCH] 8009141: Avoid netscape.javascript.JSObject in nashorn code

Reviewed-by: lagergren, hannesw
---
 .../nashorn/api/scripting}/JSObject.java       | 18 ++----------------
 .../api/scripting/ScriptObjectMirror.java      |  1 -
 .../runtime/linker/JSObjectLinker.java         |  2 +-
 .../api/scripting/ScriptEngineTest.java        |  1 -
 4 files changed, 3 insertions(+), 19 deletions(-)
 rename nashorn/src/{netscape/javascript => jdk/nashorn/api/scripting}/JSObject.java (87%)

diff --git a/nashorn/src/netscape/javascript/JSObject.java b/nashorn/src/jdk/nashorn/api/scripting/JSObject.java
similarity index 87%
rename from nashorn/src/netscape/javascript/JSObject.java
rename to nashorn/src/jdk/nashorn/api/scripting/JSObject.java
index 23054c6321d..583e8f7a199 100644
--- a/nashorn/src/netscape/javascript/JSObject.java
+++ b/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
      *
diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
index 266ce87f48d..e53903d3c3f 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
+++ b/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
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
index df9c47ff623..edd75e4dafd 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
+++ b/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
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index d12c9057246..a6c015a1e54 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/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;