# HG changeset patch
# User sundar
# Date 1357615260 -19800
# Node ID de44634fa4ecd1f0890be753af078a06c542b425
# Parent 60de45bf54b0940efb1e35378a5a09c460950d1c
8005782: get rid of javadoc errors, warnings in nashorn build
Reviewed-by: lagergren
diff -r 60de45bf54b0 -r de44634fa4ec nashorn/make/build.xml
--- a/nashorn/make/build.xml Mon Jan 07 14:41:16 2013 -0400
+++ b/nashorn/make/build.xml Tue Jan 08 08:51:00 2013 +0530
@@ -63,7 +63,7 @@
-
-
-
+
+
-
-
+
+
+
+
+
+
+
diff -r 60de45bf54b0 -r de44634fa4ec nashorn/make/project.properties
--- a/nashorn/make/project.properties Mon Jan 07 14:41:16 2013 -0400
+++ b/nashorn/make/project.properties Tue Jan 08 08:51:00 2013 +0530
@@ -23,6 +23,9 @@
application.title=nashorn
+# location of JDK embedded ASM sources
+jdk.asm.src.dir=../jdk/src/share/classes/jdk/internal
+
# source and target levels
build.compiler=modern
javac.source=1.7
@@ -58,10 +61,6 @@
dist.jar=${dist.dir}/nashorn.jar
dist.javadoc.dir=${dist.dir}/javadoc
-# directory where asm project lives
-asm.dir=../asm
-asm.src.dir=${asm.dir}/src
-
# jars refererred
file.reference.testng.jar=test/lib/testng.jar
diff -r 60de45bf54b0 -r de44634fa4ec nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java Mon Jan 07 14:41:16 2013 -0400
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java Tue Jan 08 08:51:00 2013 +0530
@@ -155,7 +155,7 @@
/**
* Constructor - internal use from ClassEmitter only
- * @see ClassEmitter.method
+ * @see ClassEmitter#method
*
* @param classEmitter the class emitter weaving the class this method is in
* @param method a method visitor
@@ -166,7 +166,7 @@
/**
* Constructor - internal use from ClassEmitter only
- * @see ClassEmitter.method
+ * @see ClassEmitter#method
*
* @param classEmitter the class emitter weaving the class this method is in
* @param method a method visitor
diff -r 60de45bf54b0 -r de44634fa4ec nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java Mon Jan 07 14:41:16 2013 -0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java Tue Jan 08 08:51:00 2013 +0530
@@ -38,13 +38,16 @@
private static final String MESSAGES_RESOURCE = "jdk.nashorn.internal.runtime.resources.Messages";
// Without do privileged, under security manager messages can not be loaded.
- private static final ResourceBundle MESSAGES_BUNDLE = AccessController.doPrivileged(
+ private static final ResourceBundle MESSAGES_BUNDLE;
+ static {
+ MESSAGES_BUNDLE = AccessController.doPrivileged(
new PrivilegedAction() {
@Override
public ResourceBundle run() {
return ResourceBundle.getBundle(MESSAGES_RESOURCE, Locale.getDefault());
}
});
+ }
private ECMAErrors() {
}
diff -r 60de45bf54b0 -r de44634fa4ec nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java Mon Jan 07 14:41:16 2013 -0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java Tue Jan 08 08:51:00 2013 +0530
@@ -417,8 +417,8 @@
/**
* Prevents properties in map from being modified.
*
- * @return New map with {@link NOT_EXTENSIBLE} flag set and properties with
- * {@link Property.NOT_CONFIGURABLE} set.
+ * @return New map with {@link #NOT_EXTENSIBLE} flag set and properties with
+ * {@link Property#NOT_CONFIGURABLE} set.
*/
PropertyMap seal() {
PropertyHashMap newProperties = EMPTY_MAP;
@@ -437,7 +437,7 @@
* Prevents properties in map from being modified or written to.
*
* @return New map with {@link #NOT_EXTENSIBLE} flag set and properties with
- * {@link Property.NOT_CONFIGURABLE} and {@link Property.NOT_WRITABLE} set.
+ * {@link Property#NOT_CONFIGURABLE} and {@link Property#NOT_WRITABLE} set.
*/
PropertyMap freeze() {
PropertyHashMap newProperties = EMPTY_MAP;