changeset 88:2a66a69ffe48

6944312: Potential rebranding issues in openjdk/langtools repository sources Reviewed-by: darcy
author jjg
date Thu, 10 Jun 2010 15:48:04 -0700
parents f9ba1d6e09bd
children e568336564b8
files src/share/classes/com/sun/tools/apt/comp/Apt.java src/share/classes/com/sun/tools/apt/main/CommandLine.java src/share/classes/com/sun/tools/apt/main/JavaCompiler.java src/share/classes/com/sun/tools/apt/main/Main.java src/share/classes/com/sun/tools/apt/util/Bark.java src/share/classes/com/sun/tools/javac/Launcher.java src/share/classes/com/sun/tools/javac/Server.java src/share/classes/com/sun/tools/javac/api/JavacScope.java src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java src/share/classes/com/sun/tools/javac/api/JavacTool.java src/share/classes/com/sun/tools/javac/api/JavacTrees.java src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java src/share/classes/com/sun/tools/javac/code/Attribute.java src/share/classes/com/sun/tools/javac/code/Flags.java src/share/classes/com/sun/tools/javac/code/Kinds.java src/share/classes/com/sun/tools/javac/code/Lint.java src/share/classes/com/sun/tools/javac/code/Scope.java src/share/classes/com/sun/tools/javac/code/Source.java src/share/classes/com/sun/tools/javac/code/Symbol.java src/share/classes/com/sun/tools/javac/code/Symtab.java src/share/classes/com/sun/tools/javac/code/Type.java src/share/classes/com/sun/tools/javac/code/TypeTags.java src/share/classes/com/sun/tools/javac/code/Types.java src/share/classes/com/sun/tools/javac/comp/Annotate.java src/share/classes/com/sun/tools/javac/comp/Attr.java src/share/classes/com/sun/tools/javac/comp/AttrContext.java src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java src/share/classes/com/sun/tools/javac/comp/Check.java src/share/classes/com/sun/tools/javac/comp/ConstFold.java src/share/classes/com/sun/tools/javac/comp/Enter.java src/share/classes/com/sun/tools/javac/comp/Env.java src/share/classes/com/sun/tools/javac/comp/Flow.java src/share/classes/com/sun/tools/javac/comp/Infer.java src/share/classes/com/sun/tools/javac/comp/Lower.java src/share/classes/com/sun/tools/javac/comp/MemberEnter.java src/share/classes/com/sun/tools/javac/comp/Resolve.java src/share/classes/com/sun/tools/javac/comp/Todo.java src/share/classes/com/sun/tools/javac/comp/TransTypes.java src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java src/share/classes/com/sun/tools/javac/jvm/CRTable.java src/share/classes/com/sun/tools/javac/jvm/ClassFile.java src/share/classes/com/sun/tools/javac/jvm/ClassReader.java src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java src/share/classes/com/sun/tools/javac/jvm/Code.java src/share/classes/com/sun/tools/javac/jvm/Gen.java src/share/classes/com/sun/tools/javac/jvm/Items.java src/share/classes/com/sun/tools/javac/jvm/Pool.java src/share/classes/com/sun/tools/javac/jvm/Target.java src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java src/share/classes/com/sun/tools/javac/main/CommandLine.java src/share/classes/com/sun/tools/javac/main/JavaCompiler.java src/share/classes/com/sun/tools/javac/main/JavacOption.java src/share/classes/com/sun/tools/javac/main/Main.java src/share/classes/com/sun/tools/javac/main/OptionName.java src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java src/share/classes/com/sun/tools/javac/model/JavacElements.java src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java src/share/classes/com/sun/tools/javac/model/JavacTypes.java src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java src/share/classes/com/sun/tools/javac/parser/EndPosParser.java src/share/classes/com/sun/tools/javac/parser/Keywords.java src/share/classes/com/sun/tools/javac/parser/Lexer.java src/share/classes/com/sun/tools/javac/parser/Parser.java src/share/classes/com/sun/tools/javac/parser/Scanner.java src/share/classes/com/sun/tools/javac/parser/Token.java src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java src/share/classes/com/sun/tools/javac/processing/JavacFiler.java src/share/classes/com/sun/tools/javac/processing/JavacMessager.java src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java src/share/classes/com/sun/tools/javac/tree/JCTree.java src/share/classes/com/sun/tools/javac/tree/Pretty.java src/share/classes/com/sun/tools/javac/tree/TreeCopier.java src/share/classes/com/sun/tools/javac/tree/TreeInfo.java src/share/classes/com/sun/tools/javac/tree/TreeMaker.java src/share/classes/com/sun/tools/javac/tree/TreeScanner.java src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java src/share/classes/com/sun/tools/javac/util/Abort.java src/share/classes/com/sun/tools/javac/util/Bits.java src/share/classes/com/sun/tools/javac/util/ByteBuffer.java src/share/classes/com/sun/tools/javac/util/ClientCodeException.java src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java src/share/classes/com/sun/tools/javac/util/Constants.java src/share/classes/com/sun/tools/javac/util/Context.java src/share/classes/com/sun/tools/javac/util/Convert.java src/share/classes/com/sun/tools/javac/util/FatalError.java src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java src/share/classes/com/sun/tools/javac/util/List.java src/share/classes/com/sun/tools/javac/util/ListBuffer.java src/share/classes/com/sun/tools/javac/util/Log.java src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java src/share/classes/com/sun/tools/javac/util/Messages.java src/share/classes/com/sun/tools/javac/util/Name.java src/share/classes/com/sun/tools/javac/util/Old199.java src/share/classes/com/sun/tools/javac/util/Options.java src/share/classes/com/sun/tools/javac/util/Pair.java src/share/classes/com/sun/tools/javac/util/Paths.java src/share/classes/com/sun/tools/javac/util/Position.java src/share/classes/com/sun/tools/javac/util/PropagatedException.java test/tools/javac/api/evalexpr/ByteArrayClassLoader.java test/tools/javac/api/evalexpr/CompileFromString.java test/tools/javac/api/evalexpr/MemoryFileManager.java test/tools/javac/cast/6548436/T6548436d.java test/tools/javac/enum/T6724345.java
diffstat 111 files changed, 195 insertions(+), 195 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/apt/comp/Apt.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/apt/comp/Apt.java	Thu Jun 10 15:48:04 2010 -0700
@@ -60,7 +60,7 @@
 /**
  * Apt compiler phase.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.
+ *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own
  *  risk.  This code and its internal interfaces are subject to change
  *  or deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/apt/main/CommandLine.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/apt/main/CommandLine.java	Thu Jun 10 15:48:04 2010 -0700
@@ -35,8 +35,8 @@
 /**
  * Various utility methods for processing Java tool command line arguments.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java	Thu Jun 10 15:48:04 2010 -0700
@@ -51,7 +51,7 @@
 import com.sun.tools.javac.parser.DocCommentScanner;
 
 /**
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.
+ *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own
  *  risk.  This code and its internal interfaces are subject to change
  *  or deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/apt/main/Main.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/apt/main/Main.java	Thu Jun 10 15:48:04 2010 -0700
@@ -59,7 +59,7 @@
 /** This class provides a commandline interface to the apt build-time
  *  tool.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.
+ *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own
  *  risk.  This code and its internal interfaces are subject to change
  *  or deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/apt/util/Bark.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/apt/util/Bark.java	Thu Jun 10 15:48:04 2010 -0700
@@ -34,8 +34,8 @@
 
 /** A subtype of Log for use in APT.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/Launcher.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/Launcher.java	Thu Jun 10 15:48:04 2010 -0700
@@ -41,7 +41,7 @@
  * of a <em>project</em>).  Simply ensure that this class is added to
  * the project and make it the main class of the project.</p>
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/Server.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/Server.java	Thu Jun 10 15:48:04 2010 -0700
@@ -39,7 +39,7 @@
  * Java Compiler Server.  Can be used to speed up a set of (small)
  * compilation tasks by caching jar files between compilations.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/api/JavacScope.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/api/JavacScope.java	Thu Jun 10 15:48:04 2010 -0700
@@ -65,7 +65,7 @@
 /**
  * Provides an implementation of Scope.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java	Thu Jun 10 15:48:04 2010 -0700
@@ -55,7 +55,7 @@
 /**
  * Provides access to functionality specific to the Sun Java Compiler, javac.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
@@ -495,7 +495,7 @@
     }
 
     /**
-     * For internal use by Sun Microsystems only.  This method will be
+     * For internal use only.  This method will be
      * removed without warning.
      */
     public Context getContext() {
@@ -503,7 +503,7 @@
     }
 
     /**
-     * For internal use by Sun Microsystems only.  This method will be
+     * For internal use only.  This method will be
      * removed without warning.
      */
     public void updateContext(Context newContext) {
@@ -511,7 +511,7 @@
     }
 
     /**
-     * For internal use by Sun Microsystems only.  This method will be
+     * For internal use only.  This method will be
      * removed without warning.
      */
     public Type parseType(String expr, TypeElement scope) {
--- a/src/share/classes/com/sun/tools/javac/api/JavacTool.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/api/JavacTool.java	Thu Jun 10 15:48:04 2010 -0700
@@ -57,7 +57,7 @@
 /**
  * TODO: describe com.sun.tools.javac.api.Tool
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/api/JavacTrees.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/api/JavacTrees.java	Thu Jun 10 15:48:04 2010 -0700
@@ -68,7 +68,7 @@
 /**
  * Provides an implementation of Trees.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java	Thu Jun 10 15:48:04 2010 -0700
@@ -43,7 +43,7 @@
  * <p>This class might be moved to {@link javax.tools} in a future
  * release.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/code/Attribute.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Attribute.java	Thu Jun 10 15:48:04 2010 -0700
@@ -39,8 +39,8 @@
 
 /** An annotation value.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Flags.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Flags.java	Thu Jun 10 15:48:04 2010 -0700
@@ -32,8 +32,8 @@
 
 /** Access flags and other modifiers for Java classes and members.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Kinds.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Kinds.java	Thu Jun 10 15:48:04 2010 -0700
@@ -30,8 +30,8 @@
  *  different subclasses of Symbol. Symbol kinds are organized so they can be
  *  or'ed to sets.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Lint.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Lint.java	Thu Jun 10 15:48:04 2010 -0700
@@ -39,8 +39,8 @@
 /**
  * A class for handling -Xlint suboptions and @SuppresssWarnings.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Scope.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Scope.java	Thu Jun 10 15:48:04 2010 -0700
@@ -34,8 +34,8 @@
  *  as hash tables. Scopes can be nested; the next field of a scope points
  *  to its next outer scope. Nested scopes can share their hash tables.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Source.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Source.java	Thu Jun 10 15:48:04 2010 -0700
@@ -33,8 +33,8 @@
 
 /** The source language version accepted.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Symbol.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java	Thu Jun 10 15:48:04 2010 -0700
@@ -53,8 +53,8 @@
  *  types, packages. Each subclass is represented as a static inner class
  *  inside Symbol.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Symtab.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Symtab.java	Thu Jun 10 15:48:04 2010 -0700
@@ -42,8 +42,8 @@
  *  fields. This makes it possible to work in multiple concurrent
  *  projects, which might use different class files for library classes.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Type.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Type.java	Thu Jun 10 15:48:04 2010 -0700
@@ -59,8 +59,8 @@
  *  the error type (tag: ERROR, class: ErrorType).
  *  </pre>
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  *
--- a/src/share/classes/com/sun/tools/javac/code/TypeTags.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/TypeTags.java	Thu Jun 10 15:48:04 2010 -0700
@@ -29,8 +29,8 @@
 /** An interface for type tag values, which distinguish between different
  *  sorts of types.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Types.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Jun 10 15:48:04 2010 -0700
@@ -58,7 +58,7 @@
  * <dd>A second list of types should be named ss.</dd>
  * </dl>
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/comp/Annotate.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Annotate.java	Thu Jun 10 15:48:04 2010 -0700
@@ -35,8 +35,8 @@
  *  which is processed at the top level of any set of recursive calls
  *  requesting it be processed.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Jun 10 15:48:04 2010 -0700
@@ -59,8 +59,8 @@
  *  @see ConstFold
  *  @see Infer
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/AttrContext.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/AttrContext.java	Thu Jun 10 15:48:04 2010 -0700
@@ -31,8 +31,8 @@
 /** Contains information specific to the attribute and enter
  *  passes, to be used in place of the generic field in environments.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java	Thu Jun 10 15:48:04 2010 -0700
@@ -30,8 +30,8 @@
 
 /** {@code Env<A>} specialized as {@code Env<AttrContext>}
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Jun 10 15:48:04 2010 -0700
@@ -47,8 +47,8 @@
 
 /** Type checking helper class for the attribution phase.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/ConstFold.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/ConstFold.java	Thu Jun 10 15:48:04 2010 -0700
@@ -37,8 +37,8 @@
 /** Helper class for constant folding, used by the attribution phase.
  *  This class is marked strictfp as mandated by JLS 15.4.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Enter.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Enter.java	Thu Jun 10 15:48:04 2010 -0700
@@ -84,8 +84,8 @@
  *                                              (only for toplevel classes)
  *  </pre>
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Env.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Env.java	Thu Jun 10 15:48:04 2010 -0700
@@ -37,8 +37,8 @@
  *  a generic component, represented as a type parameter, to carry further
  *  information specific to individual passes.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Flow.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java	Thu Jun 10 15:48:04 2010 -0700
@@ -168,8 +168,8 @@
  *  allow unqualified forms only, parentheses optional, and phase out
  *  support for assigning to a final field via this.x.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Jun 10 15:48:04 2010 -0700
@@ -36,8 +36,8 @@
 
 /** Helper class for type parameter inference, used by the attribution phase.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Lower.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java	Thu Jun 10 15:48:04 2010 -0700
@@ -48,8 +48,8 @@
 /** This pass translates away some syntactic sugar: inner classes,
  *  class literals, assertions, foreach loops, etc.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Thu Jun 10 15:48:04 2010 -0700
@@ -48,8 +48,8 @@
  *  by entering their members into the class scope using
  *  MemberEnter.complete().  See Enter for an overview.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Jun 10 15:48:04 2010 -0700
@@ -42,8 +42,8 @@
 
 /** Helper class for name resolution, used mostly by the attribution phase.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Todo.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Todo.java	Thu Jun 10 15:48:04 2010 -0700
@@ -29,8 +29,8 @@
 
 /** A queue of all as yet unattributed classes.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Thu Jun 10 15:48:04 2010 -0700
@@ -41,8 +41,8 @@
 
 /** This pass translates Generic Java to conventional Java.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java	Thu Jun 10 15:48:04 2010 -0700
@@ -29,8 +29,8 @@
 /** Bytecode instruction codes, as well as typecodes used as
  *  instruction modifiers.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java	Thu Jun 10 15:48:04 2010 -0700
@@ -28,8 +28,8 @@
 
 /** The CharacterRangeTable flags indicating type of an entry.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/CRTable.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/CRTable.java	Thu Jun 10 15:48:04 2010 -0700
@@ -36,8 +36,8 @@
  *  and the hashtable for mapping trees or lists of trees to their
  *  ending positions.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java	Thu Jun 10 15:48:04 2010 -0700
@@ -58,8 +58,8 @@
  *  as routines to convert between internal ``.'' and external ``/''
  *  separators in class names.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b> */
 public class ClassFile {
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Thu Jun 10 15:48:04 2010 -0700
@@ -58,8 +58,8 @@
  *  for all other definitions in the classfile. Top-level Classes themselves
  *  appear as members of the scopes of PackageSymbols.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Thu Jun 10 15:48:04 2010 -0700
@@ -50,8 +50,8 @@
 /** This class provides operations to map an internal symbol table graph
  *  rooted in a ClassSymbol into a classfile.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/Code.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/Code.java	Thu Jun 10 15:48:04 2010 -0700
@@ -39,8 +39,8 @@
  *  methods in a classfile. The class also provides some utility operations to
  *  generate bytecode instructions.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Thu Jun 10 15:48:04 2010 -0700
@@ -47,8 +47,8 @@
 
 /** This pass maps flat Java (i.e. without inner classes) to bytecodes.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/Items.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/Items.java	Thu Jun 10 15:48:04 2010 -0700
@@ -45,8 +45,8 @@
  *  special values this or super, etc. Individual items are represented as
  *  inner classes in class Items.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/Pool.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/Pool.java	Thu Jun 10 15:48:04 2010 -0700
@@ -33,8 +33,8 @@
 
 /** An internal structure that corresponds to the constant pool of a classfile.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/Target.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/Target.java	Thu Jun 10 15:48:04 2010 -0700
@@ -33,8 +33,8 @@
 
 /** The classfile version target.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java	Thu Jun 10 15:48:04 2010 -0700
@@ -31,8 +31,8 @@
 /** These pseudo-types appear in the generated verifier tables to
  *  indicate objects that have been allocated but not yet constructed.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/main/CommandLine.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/main/CommandLine.java	Thu Jun 10 15:48:04 2010 -0700
@@ -35,8 +35,8 @@
 /**
  * Various utility methods for processing Java tool command line arguments.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Thu Jun 10 15:48:04 2010 -0700
@@ -69,8 +69,8 @@
  *  construct a new compiler, and to run a new compiler on a set of source
  *  files.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/main/JavacOption.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/main/JavacOption.java	Thu Jun 10 15:48:04 2010 -0700
@@ -32,7 +32,7 @@
 /**
  * TODO: describe com.sun.tools.javac.main.JavacOption
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/main/Main.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/main/Main.java	Thu Jun 10 15:48:04 2010 -0700
@@ -43,8 +43,8 @@
 
 /** This class provides a commandline interface to the GJC compiler.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/main/OptionName.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/main/OptionName.java	Thu Jun 10 15:48:04 2010 -0700
@@ -29,7 +29,7 @@
 /**
  * TODO: describe com.sun.tools.javac.main.OptionName
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java	Thu Jun 10 15:48:04 2010 -0700
@@ -49,7 +49,7 @@
 /**
  * TODO: describe com.sun.tools.javac.main.RecognizedOptions
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java	Thu Jun 10 15:48:04 2010 -0700
@@ -48,7 +48,7 @@
  * <p> The "dynamic proxy return form" of an annotation element value is
  * the form used by sun.reflect.annotation.AnnotationInvocationHandler.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.  If
+ * <p><b>This is NOT part of any supported API.
  * you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java	Thu Jun 10 15:48:04 2010 -0700
@@ -39,7 +39,7 @@
  * filtering out unwanted elements such as synthetic ones.
  * This view is most efficiently accessed through its iterator() method.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.  If
+ * <p><b>This is NOT part of any supported API.
  * you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/model/JavacElements.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/model/JavacElements.java	Thu Jun 10 15:48:04 2010 -0700
@@ -54,7 +54,7 @@
 /**
  * Utility methods for operating on program elements.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java	Thu Jun 10 15:48:04 2010 -0700
@@ -31,7 +31,7 @@
 /**
  * Implementation of model API SourcePosition based on javac internal state.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/model/JavacTypes.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/model/JavacTypes.java	Thu Jun 10 15:48:04 2010 -0700
@@ -37,7 +37,7 @@
 /**
  * Utility methods for operating on types.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java	Thu Jun 10 15:48:04 2010 -0700
@@ -36,8 +36,8 @@
  *  translating Unicode escape sequences and by stripping the
  *  leading whitespace and starts from each line of the comment.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/parser/EndPosParser.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/parser/EndPosParser.java	Thu Jun 10 15:48:04 2010 -0700
@@ -38,7 +38,7 @@
  * This class is similar to Parser except that it stores ending
  * positions for the tree nodes.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/parser/Keywords.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/parser/Keywords.java	Thu Jun 10 15:48:04 2010 -0700
@@ -34,7 +34,7 @@
 /**
  * Map from Name to Token and Token to String.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/parser/Lexer.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/parser/Lexer.java	Thu Jun 10 15:48:04 2010 -0700
@@ -32,7 +32,7 @@
  * The lexical analyzer maps an input stream consisting of ASCII
  * characters and Unicode escapes into a token sequence.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/parser/Parser.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/parser/Parser.java	Thu Jun 10 15:48:04 2010 -0700
@@ -43,8 +43,8 @@
  *  operator precedence scheme is used for parsing binary operation
  *  expressions.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Thu Jun 10 15:48:04 2010 -0700
@@ -42,8 +42,8 @@
 /** The lexical analyzer maps an input stream consisting of
  *  ASCII characters and Unicode escapes into a token sequence.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/parser/Token.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/parser/Token.java	Thu Jun 10 15:48:04 2010 -0700
@@ -29,8 +29,8 @@
 /** An interface that defines codes for Java source tokens
  *  returned from lexical analysis.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java	Thu Jun 10 15:48:04 2010 -0700
@@ -29,7 +29,7 @@
 /**
  * Error thrown for problems encountered during annotation processing.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java	Thu Jun 10 15:48:04 2010 -0700
@@ -91,7 +91,7 @@
  * class path can alter the behavior of the tool and any final
  * compile.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java	Thu Jun 10 15:48:04 2010 -0700
@@ -40,7 +40,7 @@
 /**
  * An implementation of the Messager built on top of log.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Thu Jun 10 15:48:04 2010 -0700
@@ -73,7 +73,7 @@
  * Objects of this class hold and manage the state needed to support
  * annotation processing.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
@@ -1427,7 +1427,7 @@
     }
 
     /**
-     * For internal use by Sun Microsystems only.  This method will be
+     * For internal use only.  This method will be
      * removed without warning.
      */
     public Context getContext() {
--- a/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java	Thu Jun 10 15:48:04 2010 -0700
@@ -39,7 +39,7 @@
 /**
  * Object providing state about a prior round of annotation processing.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java	Thu Jun 10 15:48:04 2010 -0700
@@ -43,7 +43,7 @@
  * -Xprint option; the included visitor class is used to implement
  * Elements.printElements.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java	Thu Jun 10 15:48:04 2010 -0700
@@ -41,7 +41,7 @@
  * Utility class to determine if a service can be found on the
  * path that might be used to create a class loader.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java	Thu Jun 10 15:48:04 2010 -0700
@@ -79,7 +79,7 @@
  * <dd>Specifies the destination directory.</dd>
  * </dl>
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Thu Jun 10 15:48:04 2010 -0700
@@ -69,7 +69,7 @@
  * <p>To avoid ambiguities with the Tree API in com.sun.source all sub
  * classes should, by convention, start with JC (javac).
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/tree/Pretty.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/tree/Pretty.java	Thu Jun 10 15:48:04 2010 -0700
@@ -39,8 +39,8 @@
 
 /** Prints out a tree as an indented Java source program.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java	Thu Jun 10 15:48:04 2010 -0700
@@ -36,8 +36,8 @@
  * Creates a copy of a tree, using a given TreeMaker.
  * Names, literal values, etc are shared with the original.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Thu Jun 10 15:48:04 2010 -0700
@@ -39,8 +39,8 @@
 
 /** Utility class containing inspector methods for trees.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java	Thu Jun 10 15:48:04 2010 -0700
@@ -39,8 +39,8 @@
 
 /** Factory class for trees.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java	Thu Jun 10 15:48:04 2010 -0700
@@ -36,8 +36,8 @@
  *  do some interesting work. The scanner class itself takes care of all
  *  navigational aspects.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java	Thu Jun 10 15:48:04 2010 -0700
@@ -37,8 +37,8 @@
  *  do some interesting work. The translator class itself takes care of all
  *  navigational aspects.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Abort.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Abort.java	Thu Jun 10 15:48:04 2010 -0700
@@ -28,8 +28,8 @@
 /** Throwing an instance of
  *  this class causes (silent) termination of the main compiler method.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Bits.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Bits.java	Thu Jun 10 15:48:04 2010 -0700
@@ -27,8 +27,8 @@
 
 /** A class for extensible, mutable bit sets.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java	Thu Jun 10 15:48:04 2010 -0700
@@ -31,8 +31,8 @@
  *  appended. There are also methods to append names to byte buffers
  *  and to convert byte buffers to names.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/ClientCodeException.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/ClientCodeException.java	Thu Jun 10 15:48:04 2010 -0700
@@ -29,8 +29,8 @@
  * An exception used for propogating exceptions found in client code
  * invoked from javac.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java	Thu Jun 10 15:48:04 2010 -0700
@@ -40,8 +40,8 @@
  * fragile. Caveat emptor.
  * @throws Error if the internal data structures are not as expected.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Constants.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Constants.java	Thu Jun 10 15:48:04 2010 -0700
@@ -32,7 +32,7 @@
 /**
  * Utilities for operating on constant values.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.  If
+ * <p><b>This is NOT part of any supported API.
  * you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/util/Context.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Context.java	Thu Jun 10 15:48:04 2010 -0700
@@ -92,8 +92,8 @@
  *     NewPhase.preRegister(context);
  * </pre>
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Convert.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Convert.java	Thu Jun 10 15:48:04 2010 -0700
@@ -28,8 +28,8 @@
 /** Utility class for static conversion methods between numbers
  *  and strings in various formats.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/FatalError.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/FatalError.java	Thu Jun 10 15:48:04 2010 -0700
@@ -29,8 +29,8 @@
  *  of the main compiler method.  It is used when some non-recoverable
  *  error has been detected in the compiler environment at runtime.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Thu Jun 10 15:48:04 2010 -0700
@@ -42,8 +42,8 @@
 
 /** An abstraction of a diagnostic message generated by the compiler.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java	Thu Jun 10 15:48:04 2010 -0700
@@ -28,8 +28,8 @@
 /** An interface containing layout character constants used in Java
  *  programs.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/List.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/List.java	Thu Jun 10 15:48:04 2010 -0700
@@ -43,8 +43,8 @@
  *  <p>Lists are always trailed by a sentinel element, whose head and tail
  *  are both null.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/ListBuffer.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/ListBuffer.java	Thu Jun 10 15:48:04 2010 -0700
@@ -32,8 +32,8 @@
 /** A class for constructing lists by appending elements. Modelled after
  *  java.lang.StringBuffer.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Log.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Log.java	Thu Jun 10 15:48:04 2010 -0700
@@ -42,8 +42,8 @@
 /** A class for error logs. Reports errors and warnings, and
  *  keeps track of error numbers and positions.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java	Thu Jun 10 15:48:04 2010 -0700
@@ -43,8 +43,8 @@
  * made on any API to generate a warning at all. In consequence, this handler only
  * gets to handle those warnings that JLS says must be generated.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Messages.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Messages.java	Thu Jun 10 15:48:04 2010 -0700
@@ -32,8 +32,8 @@
 /**
  *  Support for localized messages.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Name.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Name.java	Thu Jun 10 15:48:04 2010 -0700
@@ -35,8 +35,8 @@
  *  if their indices are equal. Utf8 representation is used
  *  for storing names internally.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Old199.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Old199.java	Thu Jun 10 15:48:04 2010 -0700
@@ -37,7 +37,7 @@
  * Provides an easy migration to JSR 199 v3.3.  The class is
  * deprecated as we should remove it as soon as possible.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/util/Options.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Options.java	Thu Jun 10 15:48:04 2010 -0700
@@ -32,8 +32,8 @@
  *  If an option has an argument, the option name is mapped to the argument.
  *  If a set option has no argument, it is mapped to itself.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Pair.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Pair.java	Thu Jun 10 15:48:04 2010 -0700
@@ -27,8 +27,8 @@
 
 /** A generic class for pairs.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Paths.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Paths.java	Thu Jun 10 15:48:04 2010 -0700
@@ -59,8 +59,8 @@
  *  into a boot class path, user class path, and source path (in
  *  Collection<String> form).
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Position.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/Position.java	Thu Jun 10 15:48:04 2010 -0700
@@ -36,8 +36,8 @@
  *  expansion is optional and no Unicode excape translation is considered.
  *  The first character is at location (1,1).
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/PropagatedException.java	Wed May 26 20:22:00 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/util/PropagatedException.java	Thu Jun 10 15:48:04 2010 -0700
@@ -28,7 +28,7 @@
 /**
  * Used to propagate exceptions through to the user.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/test/tools/javac/api/evalexpr/ByteArrayClassLoader.java	Wed May 26 20:22:00 2010 -0700
+++ b/test/tools/javac/api/evalexpr/ByteArrayClassLoader.java	Thu Jun 10 15:48:04 2010 -0700
@@ -28,7 +28,7 @@
 /**
  * A class loader which loads classes from byte arrays.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/test/tools/javac/api/evalexpr/CompileFromString.java	Wed May 26 20:22:00 2010 -0700
+++ b/test/tools/javac/api/evalexpr/CompileFromString.java	Thu Jun 10 15:48:04 2010 -0700
@@ -32,7 +32,7 @@
 /**
  * JSR 199 Demo application: compile from a String.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/test/tools/javac/api/evalexpr/MemoryFileManager.java	Wed May 26 20:22:00 2010 -0700
+++ b/test/tools/javac/api/evalexpr/MemoryFileManager.java	Thu Jun 10 15:48:04 2010 -0700
@@ -43,7 +43,7 @@
  * This file manager delegates to another file manager
  * to lookup classes on boot class path.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/test/tools/javac/cast/6548436/T6548436d.java	Wed May 26 20:22:00 2010 -0700
+++ b/test/tools/javac/cast/6548436/T6548436d.java	Thu Jun 10 15:48:04 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -16,9 +16,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 /*
@@ -37,4 +37,4 @@
     static void test(Base<? extends Double> je) {
         Object o = (Base<Integer>)je;
     }
-}
\ No newline at end of file
+}
--- a/test/tools/javac/enum/T6724345.java	Wed May 26 20:22:00 2010 -0700
+++ b/test/tools/javac/enum/T6724345.java	Thu Jun 10 15:48:04 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -16,9 +16,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 /*
@@ -48,4 +48,4 @@
     enum E implements I {
         V {public void i() {}};
     }
-}
\ No newline at end of file
+}