From 12ab51477e73d4056877948c254e1ce47f040a2a Mon Sep 17 00:00:00 2001 From: kunfei Date: Mon, 20 Mar 2023 20:45:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rhino/src/main/java/com/script/AbstractScriptEngine.java | 5 +++-- rhino/src/main/java/com/script/Bindings.java | 6 +++--- rhino/src/main/java/com/script/Compilable.java | 1 + rhino/src/main/java/com/script/Invocable.java | 1 + rhino/src/main/java/com/script/ScriptContext.java | 2 ++ rhino/src/main/java/com/script/ScriptEngine.java | 1 + rhino/src/main/java/com/script/ScriptException.java | 4 ++-- rhino/src/main/java/com/script/SimpleBindings.java | 3 +-- rhino/src/main/java/com/script/SimpleScriptContext.java | 3 +-- 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/rhino/src/main/java/com/script/AbstractScriptEngine.java b/rhino/src/main/java/com/script/AbstractScriptEngine.java index f71d92705..c810e5a0a 100644 --- a/rhino/src/main/java/com/script/AbstractScriptEngine.java +++ b/rhino/src/main/java/com/script/AbstractScriptEngine.java @@ -5,8 +5,9 @@ package com.script; import java.io.Reader; -public abstract class AbstractScriptEngine - implements ScriptEngine { +@SuppressWarnings("unused") +public abstract class AbstractScriptEngine implements ScriptEngine { + protected ScriptContext context = new SimpleScriptContext(); public AbstractScriptEngine() { diff --git a/rhino/src/main/java/com/script/Bindings.java b/rhino/src/main/java/com/script/Bindings.java index 2aa65a5be..983547a1a 100644 --- a/rhino/src/main/java/com/script/Bindings.java +++ b/rhino/src/main/java/com/script/Bindings.java @@ -5,8 +5,8 @@ package com.script; import java.util.Map; -public interface Bindings - extends Map { +@SuppressWarnings("UnnecessaryModifier") +public interface Bindings extends Map { @Override public boolean containsKey(Object var1); @@ -17,7 +17,7 @@ public interface Bindings public Object put(String var1, Object var2); @Override - public void putAll(Map var1); + public void putAll(Map var1); @Override public Object remove(Object var1); diff --git a/rhino/src/main/java/com/script/Compilable.java b/rhino/src/main/java/com/script/Compilable.java index ca15270eb..485ee0842 100644 --- a/rhino/src/main/java/com/script/Compilable.java +++ b/rhino/src/main/java/com/script/Compilable.java @@ -5,6 +5,7 @@ package com.script; import java.io.Reader; +@SuppressWarnings("UnnecessaryModifier") public interface Compilable { public CompiledScript compile(Reader var1) throws ScriptException; diff --git a/rhino/src/main/java/com/script/Invocable.java b/rhino/src/main/java/com/script/Invocable.java index 9e4084924..63113ac5c 100644 --- a/rhino/src/main/java/com/script/Invocable.java +++ b/rhino/src/main/java/com/script/Invocable.java @@ -3,6 +3,7 @@ */ package com.script; +@SuppressWarnings({"unused", "UnnecessaryModifier"}) public interface Invocable { public T getInterface(Class var1); diff --git a/rhino/src/main/java/com/script/ScriptContext.java b/rhino/src/main/java/com/script/ScriptContext.java index a3604f7e5..2cba3cad5 100644 --- a/rhino/src/main/java/com/script/ScriptContext.java +++ b/rhino/src/main/java/com/script/ScriptContext.java @@ -7,7 +7,9 @@ import java.io.Reader; import java.io.Writer; import java.util.List; +@SuppressWarnings({"unused", "UnnecessaryModifier"}) public interface ScriptContext { + public static final int ENGINE_SCOPE = 100; public static final int GLOBAL_SCOPE = 200; diff --git a/rhino/src/main/java/com/script/ScriptEngine.java b/rhino/src/main/java/com/script/ScriptEngine.java index d71328a50..809dc3ad6 100644 --- a/rhino/src/main/java/com/script/ScriptEngine.java +++ b/rhino/src/main/java/com/script/ScriptEngine.java @@ -5,6 +5,7 @@ package com.script; import java.io.Reader; +@SuppressWarnings({"unused", "UnnecessaryModifier"}) public interface ScriptEngine { public static final String FILENAME = "javax.script.filename"; diff --git a/rhino/src/main/java/com/script/ScriptException.java b/rhino/src/main/java/com/script/ScriptException.java index abd9b48a9..f8a558ed4 100644 --- a/rhino/src/main/java/com/script/ScriptException.java +++ b/rhino/src/main/java/com/script/ScriptException.java @@ -3,8 +3,8 @@ */ package com.script; -public class ScriptException - extends Exception { +@SuppressWarnings("unused") +public class ScriptException extends Exception { private int columnNumber; private String fileName; private int lineNumber; diff --git a/rhino/src/main/java/com/script/SimpleBindings.java b/rhino/src/main/java/com/script/SimpleBindings.java index 1c3c3fb48..1236b98c0 100644 --- a/rhino/src/main/java/com/script/SimpleBindings.java +++ b/rhino/src/main/java/com/script/SimpleBindings.java @@ -8,8 +8,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -public class SimpleBindings - implements Bindings { +public class SimpleBindings implements Bindings { private Map map; public SimpleBindings(Map m) { diff --git a/rhino/src/main/java/com/script/SimpleScriptContext.java b/rhino/src/main/java/com/script/SimpleScriptContext.java index 028da4be4..49343edc7 100644 --- a/rhino/src/main/java/com/script/SimpleScriptContext.java +++ b/rhino/src/main/java/com/script/SimpleScriptContext.java @@ -11,8 +11,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class SimpleScriptContext - implements ScriptContext { +public class SimpleScriptContext implements ScriptContext { private static List scopes = new ArrayList(2); protected Bindings engineScope = new SimpleBindings(); protected Writer errorWriter = new PrintWriter(System.err, true);