Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/make/Makefile	Thu Jun 10 16:08:01 2010 -0700
     1.2 +++ b/make/Makefile	Thu Jun 10 17:09:56 2010 -0700
     1.3 @@ -26,9 +26,9 @@
     1.4  # Makefile for langtools: wrapper around Ant build.xml file
     1.5  
     1.6  #
     1.7 -# On Solaris, the 'make' utility from Sun will not work with these makefiles.
     1.8 -#    This little rule is only understood by Sun's make, and is harmless
     1.9 -#    when seen by the GNU make tool. If using Sun's make, this causes the
    1.10 +# On Solaris, the standard 'make' utility will not work with these makefiles.
    1.11 +#    This little rule is only understood by Solaris make, and is harmless
    1.12 +#    when seen by the GNU make tool. If using Solaris make, this causes the
    1.13  #    make command to fail.
    1.14  #
    1.15  SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
    1.16 @@ -202,7 +202,7 @@
    1.17  
    1.18  #-------------------------------------------------------------------
    1.19  #
    1.20 -# Targets for Sun's internal JPRT build system
    1.21 +# Targets for Oracle's internal JPRT build system
    1.22  
    1.23  CD = cd
    1.24  ZIP = zip

     2.1 --- a/make/Makefile-classic	Thu Jun 10 16:08:01 2010 -0700
     2.2 +++ b/make/Makefile-classic	Thu Jun 10 17:09:56 2010 -0700
     2.3 @@ -28,9 +28,9 @@
     2.4  #
     2.5  
     2.6  #
     2.7 -# On Solaris, the 'make' utility from Sun will not work with these makefiles.
     2.8 -#    This little rule is only understood by Sun's make, and is harmless
     2.9 -#    when seen by the GNU make tool. If using Sun's make, this causes the
    2.10 +# On Solaris, the standard 'make' utility will not work with these makefiles.
    2.11 +#    This little rule is only understood by Solaris make, and is harmless
    2.12 +#    when seen by the GNU make tool. If using Solaris make, this causes the
    2.13  #    make command to fail.
    2.14  #
    2.15  SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33

     3.1 --- a/src/share/classes/com/sun/source/tree/Tree.java	Thu Jun 10 16:08:01 2010 -0700
     3.2 +++ b/src/share/classes/com/sun/source/tree/Tree.java	Thu Jun 10 17:09:56 2010 -0700
     3.3 @@ -30,7 +30,7 @@
     3.4   *
     3.5   * <p><b>WARNING:</b> This interface and its sub-interfaces are
     3.6   * subject to change as the Java&trade; programming language evolves.
     3.7 - * These interfaces are implemented by Sun's Java compiler (javac)
     3.8 + * These interfaces are implemented by the JDK Java compiler (javac)
     3.9   * and should not be implemented either directly or indirectly by
    3.10   * other applications.
    3.11   *

     4.1 --- a/src/share/classes/com/sun/source/util/JavacTask.java	Thu Jun 10 16:08:01 2010 -0700
     4.2 +++ b/src/share/classes/com/sun/source/util/JavacTask.java	Thu Jun 10 17:09:56 2010 -0700
     4.3 @@ -36,7 +36,7 @@
     4.4  import javax.tools.JavaFileObject;
     4.5  
     4.6  /**
     4.7 - * Provides access to functionality specific to the Sun Java Compiler, javac.
     4.8 + * Provides access to functionality specific to the JDK Java Compiler, javac.
     4.9   *
    4.10   * @author Peter von der Ahé
    4.11   * @author Jonathan Gibbons

     5.1 --- a/src/share/classes/com/sun/source/util/TaskEvent.java	Thu Jun 10 16:08:01 2010 -0700
     5.2 +++ b/src/share/classes/com/sun/source/util/TaskEvent.java	Thu Jun 10 17:09:56 2010 -0700
     5.3 @@ -30,7 +30,7 @@
     5.4  import javax.tools.JavaFileObject;
     5.5  
     5.6  /**
     5.7 - * Provides details about work that has been done by the Sun Java Compiler, javac.
     5.8 + * Provides details about work that has been done by the JDK Java Compiler, javac.
     5.9   *
    5.10   * @author Jonathan Gibbons
    5.11   * @since 1.6

     6.1 --- a/src/share/classes/com/sun/source/util/TaskListener.java	Thu Jun 10 16:08:01 2010 -0700
     6.2 +++ b/src/share/classes/com/sun/source/util/TaskListener.java	Thu Jun 10 17:09:56 2010 -0700
     6.3 @@ -27,7 +27,7 @@
     6.4  
     6.5  
     6.6  /**
     6.7 - * Provides a listener to monitor the activity of the Sun Java Compiler, javac.
     6.8 + * Provides a listener to monitor the activity of the JDK Java Compiler, javac.
     6.9   *
    6.10   * @author Jonathan Gibbons
    6.11   * @since 1.6

     7.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/package.html	Thu Jun 10 16:08:01 2010 -0700
     7.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/package.html	Thu Jun 10 17:09:56 2010 -0700
     7.3 @@ -28,8 +28,7 @@
     7.4  <title>com.sun.tools.doclets.formats.html package</title>
     7.5  </head>
     7.6  <body bgcolor="white">
     7.7 -        This is the default doclet provided by doclet provided by 
     7.8 -        Sun<font size="-2"><sup>TM</sup></font> that produces Javadoc's 
     7.9 +        This is the default doclet provided with JDK that produces Javadoc's 
    7.10          default HTML-formatted API output.  For more documentation
    7.11          on this doclet, please refer to the link below.
    7.12          

     8.1 --- a/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java	Thu Jun 10 16:08:01 2010 -0700
     8.2 +++ b/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java	Thu Jun 10 17:09:56 2010 -0700
     8.3 @@ -54,7 +54,7 @@
     8.4  import com.sun.tools.javac.main.JavaCompiler;
     8.5  
     8.6  /**
     8.7 - * Provides access to functionality specific to the Sun Java Compiler, javac.
     8.8 + * Provides access to functionality specific to the JDK Java Compiler, javac.
     8.9   *
    8.10   * <p><b>This is NOT part of any supported API.
    8.11   * If you write code that depends on this, you do so at your own

     9.1 --- a/src/share/classes/com/sun/tools/javac/code/Flags.java	Thu Jun 10 16:08:01 2010 -0700
     9.2 +++ b/src/share/classes/com/sun/tools/javac/code/Flags.java	Thu Jun 10 17:09:56 2010 -0700
     9.3 @@ -226,7 +226,7 @@
     9.4      public static final long HYPOTHETICAL   = 1L<<37;
     9.5  
     9.6      /**
     9.7 -     * Flag that marks a Sun proprietary class.
     9.8 +     * Flag that marks an internal proprietary class.
     9.9       */
    9.10      public static final long PROPRIETARY = 1L<<38;
    9.11  

    10.1 --- a/src/share/classes/com/sun/tools/javac/code/Lint.java	Thu Jun 10 16:08:01 2010 -0700
    10.2 +++ b/src/share/classes/com/sun/tools/javac/code/Lint.java	Thu Jun 10 17:09:56 2010 -0700
    10.3 @@ -196,7 +196,7 @@
    10.4          RAW("rawtypes"),
    10.5  
    10.6          /**
    10.7 -         * Warn about Sun proprietary API that may be removed in a future release.
    10.8 +         * Warn about proprietary API that may be removed in a future release.
    10.9           */
   10.10          SUNAPI("sunapi", true),
   10.11  

    11.1 --- a/src/share/classes/com/sun/tools/javac/code/Symtab.java	Thu Jun 10 16:08:01 2010 -0700
    11.2 +++ b/src/share/classes/com/sun/tools/javac/code/Symtab.java	Thu Jun 10 17:09:56 2010 -0700
    11.3 @@ -469,7 +469,7 @@
    11.4          synthesizeBoxTypeIfMissing(floatType);
    11.5          synthesizeBoxTypeIfMissing(voidType);
    11.6  
    11.7 -        // Enter a synthetic class that is used to mark Sun
    11.8 +        // Enter a synthetic class that is used to mark internal
    11.9          // proprietary classes in ct.sym.  This class does not have a
   11.10          // class file.
   11.11          ClassType proprietaryType = (ClassType)enterClass("sun.Proprietary+Annotation");

    12.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Jun 10 16:08:01 2010 -0700
    12.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Jun 10 17:09:56 2010 -0700
    12.3 @@ -166,7 +166,7 @@
    12.4      boolean useBeforeDeclarationWarning;
    12.5  
    12.6      /**
    12.7 -     * Switch: allow lint infrastructure to control Sun proprietary
    12.8 +     * Switch: allow lint infrastructure to control proprietary
    12.9       * API warnings.
   12.10       */
   12.11      boolean enableSunApiLintControl;

    13.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Jun 10 16:08:01 2010 -0700
    13.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Jun 10 17:09:56 2010 -0700
    13.3 @@ -157,7 +157,7 @@
    13.4       */
    13.5      private MandatoryWarningHandler unsafeVarargsHandler;
    13.6  
    13.7 -    /** A handler for messages about using Sun proprietary API.
    13.8 +    /** A handler for messages about using proprietary API.
    13.9       */
   13.10      private MandatoryWarningHandler sunApiHandler;
   13.11  
   13.12 @@ -198,7 +198,7 @@
   13.13              unsafeVarargsHandler.report(pos, "varargs.non.reifiable.type", elemType);
   13.14      }
   13.15  
   13.16 -    /** Warn about using Sun proprietary API.
   13.17 +    /** Warn about using proprietary API.
   13.18       *  @param pos        Position to be used for error reporting.
   13.19       *  @param msg        A string describing the problem.
   13.20       */

    14.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Jun 10 16:08:01 2010 -0700
    14.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Jun 10 17:09:56 2010 -0700
    14.3 @@ -608,17 +608,17 @@
    14.4      Some input files additionally declares unsafe vararg methods.
    14.5  
    14.6  compiler.note.sunapi.filename=\
    14.7 -    {0} uses Sun proprietary API that may be removed in a future release.
    14.8 +    {0} uses internal proprietary API that may be removed in a future release.
    14.9  compiler.note.sunapi.plural=\
   14.10 -    Some input files use Sun proprietary API that may be removed in a future release.
   14.11 +    Some input files use internal proprietary API that may be removed in a future release.
   14.12  # The following string may appear after one of the above sunapi messages.
   14.13  compiler.note.sunapi.recompile=\
   14.14      Recompile with -Xlint:sunapi for details.
   14.15  
   14.16  compiler.note.sunapi.filename.additional=\
   14.17 -    {0} uses additional Sun proprietary API that may be removed in a future release.
   14.18 +    {0} uses additional internal proprietary API that may be removed in a future release.
   14.19  compiler.note.sunapi.plural.additional=\
   14.20 -    Some input files additionally use Sun proprietary API that may be removed in a future release.
   14.21 +    Some input files additionally use internal proprietary API that may be removed in a future release.
   14.22  
   14.23  # Notes related to annotation processing
   14.24  
   14.25 @@ -701,7 +701,7 @@
   14.26      [deprecation] {0} in {1} has been deprecated
   14.27  
   14.28  compiler.warn.sun.proprietary=\
   14.29 -    {0} is Sun proprietary API and may be removed in a future release
   14.30 +    {0} is internal proprietary API and may be removed in a future release
   14.31  
   14.32  compiler.warn.illegal.char.for.encoding=\
   14.33      unmappable character for encoding {0}

    15.1 --- a/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties	Thu Jun 10 16:08:01 2010 -0700
    15.2 +++ b/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties	Thu Jun 10 17:09:56 2010 -0700
    15.3 @@ -65,7 +65,7 @@
    15.4  main.fatal.error=fatal error
    15.5  main.fatal.exception=fatal exception
    15.6  main.out.of.memory=java.lang.OutOfMemoryError: Please increase memory.\n\
    15.7 -For example, on the Sun Classic or HotSpot VMs, add the option -J-Xmx\n\
    15.8 +For example, on the JDK Classic or HotSpot VMs, add the option -J-Xmx\n\
    15.9  such as -J-Xmx32m.
   15.10  main.done_in=[done in {0} ms]
   15.11  main.doclet_method_must_be_static=In doclet class {0}, method {1} must be static.

    16.1 --- a/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties	Thu Jun 10 16:08:01 2010 -0700
    16.2 +++ b/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties	Thu Jun 10 17:09:56 2010 -0700
    16.3 @@ -65,7 +65,7 @@
    16.4  main.fatal.error=\u81f4\u547d\u9519\u8bef
    16.5  main.fatal.exception=\u81f4\u547d\u5f02\u5e38
    16.6  main.out.of.memory=java.lang.OutOfMemoryError\uff1a\u8bf7\u589e\u52a0\u5185\u5b58\u3002\n\
    16.7 -\u4f8b\u5982\uff0c\u5bf9\u4e8e Sun Classic \u6216 HotSpot VM\uff0c\u8bf7\u6dfb\u52a0\u9009\u9879 -J-Xmx\uff0c\n\
    16.8 +\u4f8b\u5982\uff0c\u5bf9\u4e8e JDK Classic \u6216 HotSpot VM\uff0c\u8bf7\u6dfb\u52a0\u9009\u9879 -J-Xmx\uff0c\n\
    16.9  \u5982 -J-Xmx32m\u3002
   16.10  main.done_in=[\u5728{0} \u6beb\u79d2\u5185\u5b8c\u6210]
   16.11  main.doclet_method_must_be_static=\u5728 doclet \u7c7b {0} \u4e2d\uff0c\u65b9\u6cd5 {1} \u5fc5\u987b\u4e3a\u9759\u6001\u3002

    17.1 --- a/src/share/classes/javax/tools/JavaFileManager.java	Thu Jun 10 16:08:01 2010 -0700
    17.2 +++ b/src/share/classes/javax/tools/JavaFileManager.java	Thu Jun 10 17:09:56 2010 -0700
    17.3 @@ -256,7 +256,7 @@
    17.4       *
    17.5       * <p>Optionally, this file manager might consider the sibling as
    17.6       * a hint for where to place the output.  The exact semantics of
    17.7 -     * this hint is unspecified.  Sun's compiler, javac, for
    17.8 +     * this hint is unspecified.  The JDK compiler, javac, for
    17.9       * example, will place class files in the same directories as
   17.10       * originating source files unless a class file output directory
   17.11       * is provided.  To facilitate this behavior, javac might provide
   17.12 @@ -338,7 +338,7 @@
   17.13       *
   17.14       * <p>Optionally, this file manager might consider the sibling as
   17.15       * a hint for where to place the output.  The exact semantics of
   17.16 -     * this hint is unspecified.  Sun's compiler, javac, for
   17.17 +     * this hint is unspecified.  The JDK compiler, javac, for
   17.18       * example, will place class files in the same directories as
   17.19       * originating source files unless a class file output directory
   17.20       * is provided.  To facilitate this behavior, javac might provide