Mercurial > hg > openjdk > jdk9 > nashorn
changeset 1924:3adfb547e3e4 jdk-9+179
Merge
author | asaha |
---|---|
date | Thu, 13 Jul 2017 21:35:19 -0700 |
parents | b2fa60781004 (diff) 1e6fad0e8950 (current diff) |
children | bece58f76216 |
files | |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Feb 08 11:57:41 2017 +0100 +++ b/.hgtags Thu Jul 13 21:35:19 2017 -0700 @@ -409,3 +409,6 @@ fa8e4de50e821eed876388c84f7129a6739268be jdk-9+173 7d4006eaa088848c4fa2ac4aef0ba9982f80752a jdk-9+174 734b3209b6edeb57e482c97793ae9c066af72871 jdk-9+175 +3c6fbdf6e785aaf18d35ce9c6684369952fd22ec jdk-9+176 +aa7404e062b95f679018f25eaaf933dcf0cf3f2b jdk-9+177 +7497ad85759ff010f44344b553223d1647fb6eba jdk-9+178
--- a/src/jdk.dynalink/share/classes/module-info.java Wed Feb 08 11:57:41 2017 +0100 +++ b/src/jdk.dynalink/share/classes/module-info.java Thu Jul 13 21:35:19 2017 -0700 @@ -32,8 +32,8 @@ * useful for implementing programming languages where at least some expressions * have dynamic types (that is, types that can not be decided statically), and * the operations on dynamic types are expressed as - * {@link java.lang.invoke.CallSite call sites}. These call sites will be - * linked to appropriate target {@link java.lang.invoke.MethodHandle method handles} + * {@linkplain java.lang.invoke.CallSite call sites}. These call sites will be + * linked to appropriate target {@linkplain java.lang.invoke.MethodHandle method handles} * at run time based on actual types of the values the expressions evaluated to. * These can change between invocations, necessitating relinking the call site * multiple times to accommodate new types; Dynalink handles all that and more. @@ -205,7 +205,7 @@ * on how it links the various operations. * <h2>Cross-language interoperability</h2> * A {@code DynamicLinkerFactory} can be configured with a - * {@link jdk.dynalink.DynamicLinkerFactory#setClassLoader(ClassLoader) class + * {@linkplain jdk.dynalink.DynamicLinkerFactory#setClassLoader(ClassLoader) class * loader}. It will try to instantiate all * {@link jdk.dynalink.linker.GuardingDynamicLinkerExporter} classes visible to * that class loader and compose the linkers they provide into the