Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/make/build.xml	Mon Jan 07 14:41:16 2013 -0400
     1.2 +++ b/make/build.xml	Tue Jan 08 08:51:00 2013 +0530
     1.3 @@ -63,7 +63,7 @@
     1.4  
     1.5    <!-- do it only if ASM is not available -->
     1.6    <target name="compile-asm" depends="prepare" unless="asm.available">
     1.7 -    <javac srcdir="${asm.src.dir}"
     1.8 +    <javac srcdir="${jdk.asm.src.dir}"
     1.9             destdir="${build.classes.dir}"
    1.10             excludes="**/optimizer/* **/xml/* **/attrs/*"
    1.11             source="${javac.source}"
    1.12 @@ -142,15 +142,20 @@
    1.13      </jar>
    1.14    </target>
    1.15  
    1.16 -  <target name="javadoc" depends="compile-asm">
    1.17 -    <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="src/overview.html" windowtitle="${nashorn.product.name} ${nashorn.version}">
    1.18 +  <target name="javadoc" depends="prepare">
    1.19 +    <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="src/overview.html" windowtitle="${nashorn.product.name} ${nashorn.version}" additionalparam="-quiet" failonerror="true">
    1.20        <classpath>
    1.21          <pathelement location="${build.classes.dir}"/>
    1.22          <pathelement location="${dynalink.jar}"/>
    1.23        </classpath>
    1.24        <fileset dir="${src.dir}" includes="**/*.java"/>
    1.25 -      <link href="http://docs.oracle.com/javase/7/docs/api"/>
    1.26 -      <link href="http://szegedi.github.com/dynalink/0.4/javadoc"/>
    1.27 +      <fileset dir="${jdk.asm.src.dir}" includes="**/*.java"/>
    1.28 +      <link href="http://docs.oracle.com/javase/7/docs/api/"/>
    1.29 +      <link href="http://szegedi.github.com/dynalink/0.4/javadoc/"/>
    1.30 +      <!-- The following tags are used only in ASM sources - just ignore these -->
    1.31 +      <tag name="label" description="label tag in ASM sources" enabled="false"/>
    1.32 +      <tag name="linked" description="linked tag in ASM sources" enabled="false"/>
    1.33 +      <tag name="associates" description="associates tag in ASM sources" enabled="false"/>
    1.34      </javadoc>
    1.35    </target>
    1.36  

     2.1 --- a/make/project.properties	Mon Jan 07 14:41:16 2013 -0400
     2.2 +++ b/make/project.properties	Tue Jan 08 08:51:00 2013 +0530
     2.3 @@ -23,6 +23,9 @@
     2.4  
     2.5  application.title=nashorn
     2.6  
     2.7 +# location of JDK embedded ASM sources
     2.8 +jdk.asm.src.dir=../jdk/src/share/classes/jdk/internal
     2.9 +
    2.10  # source and target levels
    2.11  build.compiler=modern
    2.12  javac.source=1.7
    2.13 @@ -58,10 +61,6 @@
    2.14  dist.jar=${dist.dir}/nashorn.jar
    2.15  dist.javadoc.dir=${dist.dir}/javadoc
    2.16  
    2.17 -# directory where asm project lives
    2.18 -asm.dir=../asm
    2.19 -asm.src.dir=${asm.dir}/src
    2.20 -
    2.21  # jars refererred
    2.22  file.reference.testng.jar=test/lib/testng.jar
    2.23  

     3.1 --- a/src/jdk/nashorn/internal/codegen/MethodEmitter.java	Mon Jan 07 14:41:16 2013 -0400
     3.2 +++ b/src/jdk/nashorn/internal/codegen/MethodEmitter.java	Tue Jan 08 08:51:00 2013 +0530
     3.3 @@ -155,7 +155,7 @@
     3.4  
     3.5      /**
     3.6       * Constructor - internal use from ClassEmitter only
     3.7 -     * @see ClassEmitter.method
     3.8 +     * @see ClassEmitter#method
     3.9       *
    3.10       * @param classEmitter the class emitter weaving the class this method is in
    3.11       * @param method       a method visitor
    3.12 @@ -166,7 +166,7 @@
    3.13  
    3.14      /**
    3.15       * Constructor - internal use from ClassEmitter only
    3.16 -     * @see ClassEmitter.method
    3.17 +     * @see ClassEmitter#method
    3.18       *
    3.19       * @param classEmitter the class emitter weaving the class this method is in
    3.20       * @param method       a method visitor

     4.1 --- a/src/jdk/nashorn/internal/runtime/ECMAErrors.java	Mon Jan 07 14:41:16 2013 -0400
     4.2 +++ b/src/jdk/nashorn/internal/runtime/ECMAErrors.java	Tue Jan 08 08:51:00 2013 +0530
     4.3 @@ -38,13 +38,16 @@
     4.4      private static final String MESSAGES_RESOURCE = "jdk.nashorn.internal.runtime.resources.Messages";
     4.5  
     4.6      // Without do privileged, under security manager messages can not be loaded.
     4.7 -    private static final ResourceBundle MESSAGES_BUNDLE = AccessController.doPrivileged(
     4.8 +    private static final ResourceBundle MESSAGES_BUNDLE;
     4.9 +    static {
    4.10 +        MESSAGES_BUNDLE = AccessController.doPrivileged(
    4.11          new PrivilegedAction<ResourceBundle>() {
    4.12              @Override
    4.13              public ResourceBundle run() {
    4.14                  return ResourceBundle.getBundle(MESSAGES_RESOURCE, Locale.getDefault());
    4.15              }
    4.16          });
    4.17 +    }
    4.18  
    4.19      private ECMAErrors() {
    4.20      }

     5.1 --- a/src/jdk/nashorn/internal/runtime/PropertyMap.java	Mon Jan 07 14:41:16 2013 -0400
     5.2 +++ b/src/jdk/nashorn/internal/runtime/PropertyMap.java	Tue Jan 08 08:51:00 2013 +0530
     5.3 @@ -417,8 +417,8 @@
     5.4      /**
     5.5       * Prevents properties in map from being modified.
     5.6       *
     5.7 -     * @return New map with {@link NOT_EXTENSIBLE} flag set and properties with
     5.8 -     * {@link Property.NOT_CONFIGURABLE} set.
     5.9 +     * @return New map with {@link #NOT_EXTENSIBLE} flag set and properties with
    5.10 +     * {@link Property#NOT_CONFIGURABLE} set.
    5.11       */
    5.12      PropertyMap seal() {
    5.13          PropertyHashMap newProperties = EMPTY_MAP;
    5.14 @@ -437,7 +437,7 @@
    5.15       * Prevents properties in map from being modified or written to.
    5.16       *
    5.17       * @return New map with {@link #NOT_EXTENSIBLE} flag set and properties with
    5.18 -     * {@link Property.NOT_CONFIGURABLE} and {@link Property.NOT_WRITABLE} set.
    5.19 +     * {@link Property#NOT_CONFIGURABLE} and {@link Property#NOT_WRITABLE} set.
    5.20       */
    5.21      PropertyMap freeze() {
    5.22          PropertyHashMap newProperties = EMPTY_MAP;