# HG changeset patch # User sundar # Date 1420453976 -19800 # Node ID 0aeeae75e696d5f219574976f44690e818c15491 # Parent bfc24ae2b900187585079bb11e66e459d1e525fe 8068431: @since and @jdk.Exported are missing in jdk.nashorn.api.scripting classes and package-info.java files Reviewed-by: attila, lagergren diff -r bfc24ae2b900 -r 0aeeae75e696 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java Wed Jul 05 20:13:25 2017 +0200 +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/AbstractJSObject.java Mon Jan 05 16:02:56 2015 +0530 @@ -36,7 +36,10 @@ * treat objects of such classes just like nashorn script objects. Usual nashorn * operations like obj[i], obj.foo, obj.func(), delete obj.foo will be glued * to appropriate method call of this class. + * + * @since 1.8u40 */ +@jdk.Exported public abstract class AbstractJSObject implements JSObject { /** * Call this object as a JavaScript function. This is equivalent to diff -r bfc24ae2b900 -r 0aeeae75e696 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java Wed Jul 05 20:13:25 2017 +0200 +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ClassFilter.java Mon Jan 05 16:02:56 2015 +0530 @@ -28,7 +28,10 @@ * Class filter (optional) to be used by nashorn script engine. * jsr-223 program embedding nashorn script can set ClassFilter instance * to be used when an engine instance is created. + * + * @since 1.8u40 */ +@jdk.Exported public interface ClassFilter { /** * Should the Java class of the specified name be exposed to scripts? diff -r bfc24ae2b900 -r 0aeeae75e696 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java Wed Jul 05 20:13:25 2017 +0200 +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/JSObject.java Mon Jan 05 16:02:56 2015 +0530 @@ -33,7 +33,10 @@ * treat objects of such classes just like nashorn script objects. Usual nashorn * operations like obj[i], obj.foo, obj.func(), delete obj.foo will be glued * to appropriate method call of this interface. + * + * @since 1.8u40 */ +@jdk.Exported public interface JSObject { /** * Call this object as a JavaScript function. This is equivalent to diff -r bfc24ae2b900 -r 0aeeae75e696 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java Wed Jul 05 20:13:25 2017 +0200 +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornException.java Mon Jan 05 16:02:56 2015 +0530 @@ -41,7 +41,10 @@ * script object or Java access to script object properties via java.util.Map * interface. In these cases, user code will get an instance of this or * implementation defined subclass. + * + * @since 1.8u40 */ +@jdk.Exported @SuppressWarnings("serial") public abstract class NashornException extends RuntimeException { // script file name diff -r bfc24ae2b900 -r 0aeeae75e696 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java Wed Jul 05 20:13:25 2017 +0200 +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngine.java Mon Jan 05 16:02:56 2015 +0530 @@ -65,8 +65,10 @@ * {@link NashornScriptEngineFactory#getScriptEngine()}. Note that this engine implements the {@link Compilable} and * {@link Invocable} interfaces, allowing for efficient precompilation and repeated execution of scripts. * @see NashornScriptEngineFactory + * + * @since 1.8u40 */ - +@jdk.Exported public final class NashornScriptEngine extends AbstractScriptEngine implements Compilable, Invocable { /** * Key used to associate Nashorn global object mirror with arbitrary Bindings instance. diff -r bfc24ae2b900 -r 0aeeae75e696 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java Wed Jul 05 20:13:25 2017 +0200 +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java Mon Jan 05 16:02:56 2015 +0530 @@ -44,7 +44,10 @@ * * Programs executing in engines created using {@link #getScriptEngine(String[])} will have the passed arguments * accessible as a global variable named {@code "arguments"}. + * + * @since 1.8u40 */ +@jdk.Exported public final class NashornScriptEngineFactory implements ScriptEngineFactory { @Override public String getEngineName() { diff -r bfc24ae2b900 -r 0aeeae75e696 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java Wed Jul 05 20:13:25 2017 +0200 +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptObjectMirror.java Mon Jan 05 16:02:56 2015 +0530 @@ -54,7 +54,10 @@ /** * Mirror object that wraps a given Nashorn Script object. + * + * @since 1.8u40 */ +@jdk.Exported public final class ScriptObjectMirror extends AbstractJSObject implements Bindings { private static AccessControlContext getContextAccCtxt() { final Permissions perms = new Permissions(); diff -r bfc24ae2b900 -r 0aeeae75e696 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java Wed Jul 05 20:13:25 2017 +0200 +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/ScriptUtils.java Mon Jan 05 16:02:56 2015 +0530 @@ -36,7 +36,10 @@ /** * Utilities that are to be called from script code. + * + * @since 1.8u40 */ +@jdk.Exported public final class ScriptUtils { private ScriptUtils() {} diff -r bfc24ae2b900 -r 0aeeae75e696 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java Wed Jul 05 20:13:25 2017 +0200 +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/URLReader.java Mon Jan 05 16:02:56 2015 +0530 @@ -35,7 +35,10 @@ /** * A Reader that reads from a URL. Used to make sure that the reader * reads content from given URL and can be trusted to do so. + * + * @since 1.8u40 */ +@jdk.Exported public final class URLReader extends Reader { // underlying URL private final URL url; diff -r bfc24ae2b900 -r 0aeeae75e696 nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java Wed Jul 05 20:13:25 2017 +0200 +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/scripting/package-info.java Mon Jan 05 16:02:56 2015 +0530 @@ -35,5 +35,8 @@ * interfaces, allowing for efficient pre-compilation and repeated execution of scripts. In addition, * this package provides nashorn specific extension classes, interfaces and methods. See * {@link jdk.nashorn.api.scripting.NashornScriptEngineFactory} for further details. + * + * @since 1.8u40 */ +@jdk.Exported package jdk.nashorn.api.scripting;