diff --git a/java/cli/com/cloudius/cli/main/RhinoCLI.java b/java/cli/com/cloudius/cli/main/RhinoCLI.java index 480015eb983d00fedf4fa9c19673e746df10ef45..a98e4ab8ffc03e0bb5ce6dad107e6d0e1cc7db29 100644 --- a/java/cli/com/cloudius/cli/main/RhinoCLI.java +++ b/java/cli/com/cloudius/cli/main/RhinoCLI.java @@ -2,8 +2,6 @@ package com.cloudius.cli.main; import java.io.*; -import com.cloudius.cli.util.ELFLoader; - import sun.org.mozilla.javascript.*; import sun.org.mozilla.javascript.tools.shell.*; @@ -24,7 +22,6 @@ public class RhinoCLI { global.init(_cx); _scope = ScriptableObject.getTopLevelScope(global); - ScriptableObject.defineClass(_scope, ELFLoader.class); FileReader cli_js = new FileReader("/console/cli.js"); _cx.evaluateReader(_scope, cli_js, "cli.js", 1, null); diff --git a/java/cli/com/cloudius/cli/util/ELFLoader.java b/java/cli/com/cloudius/cli/util/ELFLoader.java index 81ab4359ea778a3247e1732009a7cf04ed9a4f22..b3bdf90780956d52b70834ae9d917254205cbc0d 100644 --- a/java/cli/com/cloudius/cli/util/ELFLoader.java +++ b/java/cli/com/cloudius/cli/util/ELFLoader.java @@ -3,18 +3,12 @@ package com.cloudius.cli.util; import java.io.IOException; import sun.org.mozilla.javascript.NativeArray; -import sun.org.mozilla.javascript.ScriptableObject; -import sun.org.mozilla.javascript.annotations.JSFunction; import com.cloudius.util.Exec; import com.cloudius.cli.main.RhinoCLI; -public class ELFLoader extends ScriptableObject { +public class ELFLoader { - // Identifies the scriptable object - private static final long serialVersionUID = 87664098764510039L; - - @JSFunction public boolean run() { NativeArray js_argv = (NativeArray)RhinoCLI._scope.get("_global_argv", @@ -33,10 +27,4 @@ public class ELFLoader extends ScriptableObject { return false; } } - - @Override - public String getClassName() { - return "ELFLoader"; - } - }