# HG changeset patch
# User jjg
# Date 1276214996 25200
# Node ID c5a4ce47e780ae0b70e95b3ee9d80320e88d3b7a
# Parent  1908176fd6e3e7f01552e77239b76f1cebcf7854
6960407: Potential rebranding issues in openjdk/langtools repository sources
Reviewed-by: darcy

diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/make/Makefile
--- a/langtools/make/Makefile	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/make/Makefile	Thu Jun 10 17:09:56 2010 -0700
@@ -26,9 +26,9 @@
 # Makefile for langtools: wrapper around Ant build.xml file
 
 #
-# On Solaris, the 'make' utility from Sun will not work with these makefiles.
-#    This little rule is only understood by Sun's make, and is harmless
-#    when seen by the GNU make tool. If using Sun's make, this causes the
+# On Solaris, the standard 'make' utility will not work with these makefiles.
+#    This little rule is only understood by Solaris make, and is harmless
+#    when seen by the GNU make tool. If using Solaris make, this causes the
 #    make command to fail.
 #
 SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
@@ -202,7 +202,7 @@
 
 #-------------------------------------------------------------------
 #
-# Targets for Sun's internal JPRT build system
+# Targets for Oracle's internal JPRT build system
 
 CD = cd
 ZIP = zip
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/make/Makefile-classic
--- a/langtools/make/Makefile-classic	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/make/Makefile-classic	Thu Jun 10 17:09:56 2010 -0700
@@ -28,9 +28,9 @@
 #
 
 #
-# On Solaris, the 'make' utility from Sun will not work with these makefiles.
-#    This little rule is only understood by Sun's make, and is harmless
-#    when seen by the GNU make tool. If using Sun's make, this causes the
+# On Solaris, the standard 'make' utility will not work with these makefiles.
+#    This little rule is only understood by Solaris make, and is harmless
+#    when seen by the GNU make tool. If using Solaris make, this causes the
 #    make command to fail.
 #
 SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/source/tree/Tree.java
--- a/langtools/src/share/classes/com/sun/source/tree/Tree.java	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/source/tree/Tree.java	Thu Jun 10 17:09:56 2010 -0700
@@ -30,7 +30,7 @@
  *
  * <p><b>WARNING:</b> This interface and its sub-interfaces are
  * subject to change as the Java&trade; programming language evolves.
- * These interfaces are implemented by Sun's Java compiler (javac)
+ * These interfaces are implemented by the JDK Java compiler (javac)
  * and should not be implemented either directly or indirectly by
  * other applications.
  *
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/source/util/JavacTask.java
--- a/langtools/src/share/classes/com/sun/source/util/JavacTask.java	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/source/util/JavacTask.java	Thu Jun 10 17:09:56 2010 -0700
@@ -36,7 +36,7 @@
 import javax.tools.JavaFileObject;
 
 /**
- * Provides access to functionality specific to the Sun Java Compiler, javac.
+ * Provides access to functionality specific to the JDK Java Compiler, javac.
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/source/util/TaskEvent.java
--- a/langtools/src/share/classes/com/sun/source/util/TaskEvent.java	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/source/util/TaskEvent.java	Thu Jun 10 17:09:56 2010 -0700
@@ -30,7 +30,7 @@
 import javax.tools.JavaFileObject;
 
 /**
- * Provides details about work that has been done by the Sun Java Compiler, javac.
+ * Provides details about work that has been done by the JDK Java Compiler, javac.
  *
  * @author Jonathan Gibbons
  * @since 1.6
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/source/util/TaskListener.java
--- a/langtools/src/share/classes/com/sun/source/util/TaskListener.java	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/source/util/TaskListener.java	Thu Jun 10 17:09:56 2010 -0700
@@ -27,7 +27,7 @@
 
 
 /**
- * Provides a listener to monitor the activity of the Sun Java Compiler, javac.
+ * Provides a listener to monitor the activity of the JDK Java Compiler, javac.
  *
  * @author Jonathan Gibbons
  * @since 1.6
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/tools/doclets/formats/html/package.html
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/package.html	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/package.html	Thu Jun 10 17:09:56 2010 -0700
@@ -28,8 +28,7 @@
 <title>com.sun.tools.doclets.formats.html package</title>
 </head>
 <body bgcolor="white">
-        This is the default doclet provided by doclet provided by 
-        Sun<font size="-2"><sup>TM</sup></font> that produces Javadoc's 
+        This is the default doclet provided with JDK that produces Javadoc's 
         default HTML-formatted API output.  For more documentation
         on this doclet, please refer to the link below.
         
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java	Thu Jun 10 17:09:56 2010 -0700
@@ -54,7 +54,7 @@
 import com.sun.tools.javac.main.JavaCompiler;
 
 /**
- * Provides access to functionality specific to the Sun Java Compiler, javac.
+ * Provides access to functionality specific to the JDK Java Compiler, javac.
  *
  * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/tools/javac/code/Flags.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java	Thu Jun 10 17:09:56 2010 -0700
@@ -226,7 +226,7 @@
     public static final long HYPOTHETICAL   = 1L<<37;
 
     /**
-     * Flag that marks a Sun proprietary class.
+     * Flag that marks an internal proprietary class.
      */
     public static final long PROPRIETARY = 1L<<38;
 
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/tools/javac/code/Lint.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java	Thu Jun 10 17:09:56 2010 -0700
@@ -196,7 +196,7 @@
         RAW("rawtypes"),
 
         /**
-         * Warn about Sun proprietary API that may be removed in a future release.
+         * Warn about proprietary API that may be removed in a future release.
          */
         SUNAPI("sunapi", true),
 
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java	Thu Jun 10 17:09:56 2010 -0700
@@ -469,7 +469,7 @@
         synthesizeBoxTypeIfMissing(floatType);
         synthesizeBoxTypeIfMissing(voidType);
 
-        // Enter a synthetic class that is used to mark Sun
+        // Enter a synthetic class that is used to mark internal
         // proprietary classes in ct.sym.  This class does not have a
         // class file.
         ClassType proprietaryType = (ClassType)enterClass("sun.Proprietary+Annotation");
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Jun 10 17:09:56 2010 -0700
@@ -166,7 +166,7 @@
     boolean useBeforeDeclarationWarning;
 
     /**
-     * Switch: allow lint infrastructure to control Sun proprietary
+     * Switch: allow lint infrastructure to control proprietary
      * API warnings.
      */
     boolean enableSunApiLintControl;
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Jun 10 17:09:56 2010 -0700
@@ -157,7 +157,7 @@
      */
     private MandatoryWarningHandler unsafeVarargsHandler;
 
-    /** A handler for messages about using Sun proprietary API.
+    /** A handler for messages about using proprietary API.
      */
     private MandatoryWarningHandler sunApiHandler;
 
@@ -198,7 +198,7 @@
             unsafeVarargsHandler.report(pos, "varargs.non.reifiable.type", elemType);
     }
 
-    /** Warn about using Sun proprietary API.
+    /** Warn about using proprietary API.
      *  @param pos        Position to be used for error reporting.
      *  @param msg        A string describing the problem.
      */
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Jun 10 17:09:56 2010 -0700
@@ -608,17 +608,17 @@
     Some input files additionally declares unsafe vararg methods.
 
 compiler.note.sunapi.filename=\
-    {0} uses Sun proprietary API that may be removed in a future release.
+    {0} uses internal proprietary API that may be removed in a future release.
 compiler.note.sunapi.plural=\
-    Some input files use Sun proprietary API that may be removed in a future release.
+    Some input files use internal proprietary API that may be removed in a future release.
 # The following string may appear after one of the above sunapi messages.
 compiler.note.sunapi.recompile=\
     Recompile with -Xlint:sunapi for details.
 
 compiler.note.sunapi.filename.additional=\
-    {0} uses additional Sun proprietary API that may be removed in a future release.
+    {0} uses additional internal proprietary API that may be removed in a future release.
 compiler.note.sunapi.plural.additional=\
-    Some input files additionally use Sun proprietary API that may be removed in a future release.
+    Some input files additionally use internal proprietary API that may be removed in a future release.
 
 # Notes related to annotation processing
 
@@ -701,7 +701,7 @@
     [deprecation] {0} in {1} has been deprecated
 
 compiler.warn.sun.proprietary=\
-    {0} is Sun proprietary API and may be removed in a future release
+    {0} is internal proprietary API and may be removed in a future release
 
 compiler.warn.illegal.char.for.encoding=\
     unmappable character for encoding {0}
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
--- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties	Thu Jun 10 17:09:56 2010 -0700
@@ -65,7 +65,7 @@
 main.fatal.error=fatal error
 main.fatal.exception=fatal exception
 main.out.of.memory=java.lang.OutOfMemoryError: Please increase memory.\n\
-For example, on the Sun Classic or HotSpot VMs, add the option -J-Xmx\n\
+For example, on the JDK Classic or HotSpot VMs, add the option -J-Xmx\n\
 such as -J-Xmx32m.
 main.done_in=[done in {0} ms]
 main.doclet_method_must_be_static=In doclet class {0}, method {1} must be static.
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties
--- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties	Thu Jun 10 17:09:56 2010 -0700
@@ -65,7 +65,7 @@
 main.fatal.error=\u81f4\u547d\u9519\u8bef
 main.fatal.exception=\u81f4\u547d\u5f02\u5e38
 main.out.of.memory=java.lang.OutOfMemoryError\uff1a\u8bf7\u589e\u52a0\u5185\u5b58\u3002\n\
-\u4f8b\u5982\uff0c\u5bf9\u4e8e Sun Classic \u6216 HotSpot VM\uff0c\u8bf7\u6dfb\u52a0\u9009\u9879 -J-Xmx\uff0c\n\
+\u4f8b\u5982\uff0c\u5bf9\u4e8e JDK Classic \u6216 HotSpot VM\uff0c\u8bf7\u6dfb\u52a0\u9009\u9879 -J-Xmx\uff0c\n\
 \u5982 -J-Xmx32m\u3002
 main.done_in=[\u5728{0} \u6beb\u79d2\u5185\u5b8c\u6210]
 main.doclet_method_must_be_static=\u5728 doclet \u7c7b {0} \u4e2d\uff0c\u65b9\u6cd5 {1} \u5fc5\u987b\u4e3a\u9759\u6001\u3002
diff -r 1908176fd6e3 -r c5a4ce47e780 langtools/src/share/classes/javax/tools/JavaFileManager.java
--- a/langtools/src/share/classes/javax/tools/JavaFileManager.java	Thu Jun 10 16:08:01 2010 -0700
+++ b/langtools/src/share/classes/javax/tools/JavaFileManager.java	Thu Jun 10 17:09:56 2010 -0700
@@ -256,7 +256,7 @@
      *
      * <p>Optionally, this file manager might consider the sibling as
      * a hint for where to place the output.  The exact semantics of
-     * this hint is unspecified.  Sun's compiler, javac, for
+     * this hint is unspecified.  The JDK compiler, javac, for
      * example, will place class files in the same directories as
      * originating source files unless a class file output directory
      * is provided.  To facilitate this behavior, javac might provide
@@ -338,7 +338,7 @@
      *
      * <p>Optionally, this file manager might consider the sibling as
      * a hint for where to place the output.  The exact semantics of
-     * this hint is unspecified.  Sun's compiler, javac, for
+     * this hint is unspecified.  The JDK compiler, javac, for
      * example, will place class files in the same directories as
      * originating source files unless a class file output directory
      * is provided.  To facilitate this behavior, javac might provide