8145342: Some copyright notices are inconsistently and ill formatted

Summary: Adjusted formatting of copyright notices. Reviewed-by: darcy, alundblad

8145342: Some copyright notices are inconsistently and ill formatted
Summary: Adjusted formatting of copyright notices. Reviewed-by: darcy, alundblad
45f0cfeb · vasya · 97cc4576 · 45f0cfeb · 45f0cfeb · 45f0cfeb
223 changed file
--- a/langtools/make/tools/propertiesparser/parser/Message.java
+++ b/langtools/make/tools/propertiesparser/parser/Message.java
@@ -20,6 +20,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package propertiesparser.parser;

 import java.util.ArrayList;

--- a/langtools/make/tools/propertiesparser/parser/MessageFile.java
+++ b/langtools/make/tools/propertiesparser/parser/MessageFile.java
@@ -20,6 +20,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package propertiesparser.parser;

 import java.io.*;

--- a/langtools/make/tools/propertiesparser/parser/MessageInfo.java
+++ b/langtools/make/tools/propertiesparser/parser/MessageInfo.java
@@ -20,6 +20,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package propertiesparser.parser;

 import propertiesparser.parser.MessageType.CompoundType;

--- a/langtools/make/tools/propertiesparser/parser/MessageLine.java
+++ b/langtools/make/tools/propertiesparser/parser/MessageLine.java
@@ -20,6 +20,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package propertiesparser.parser;

 import java.util.regex.Pattern;

--- a/langtools/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
+++ b/langtools/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package javax.tools;

 import java.io.Writer;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ErroneousTree.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ErroneousTree.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.source.doctree;

 import javax.tools.Diagnostic;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.source.doctree;

 import java.util.List;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.source.doctree;

 import java.util.List;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePathScanner.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePathScanner.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.source.util;

 import com.sun.source.doctree.DocTree;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.source.util;

 import java.util.ServiceLoader;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package com.sun.tools.javac.api;

 import java.io.File;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.api;

 import java.util.Locale;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.code;

 import java.lang.annotation.Annotation;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeMetadata.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeMetadata.java
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights
- * reserved.  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE
- * HEADER.
+ * Copyright (c) 2014, 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
 * under the terms of the GNU General Public License version 2 only, as

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.comp;

 import com.sun.tools.javac.tree.*;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JRTIndex.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JRTIndex.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.file;

 import java.io.IOException;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.file;

 import java.io.File;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.jvm;

 import com.sun.tools.javac.util.Context;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.main;

 import java.io.File;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Parser.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Parser.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package com.sun.tools.javac.parser;

 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/JDKPlatformProvider.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/JDKPlatformProvider.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.platform;

 import java.io.IOException;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformDescription.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformDescription.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.platform;

 import java.io.Closeable;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformProvider.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformProvider.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.platform;

 /** A collection of platform descriptions that can be selected using {@code -release name}

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformUtils.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformUtils.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.platform;

 import com.sun.tools.javac.main.Arguments;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/sym/Profiles.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/sym/Profiles.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.sym;

 import java.io.BufferedInputStream;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.tree;

 import com.sun.source.doctree.ErroneousTree;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.util;

 import java.nio.file.Path;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.util;

 import java.util.Set;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Iterators.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Iterators.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.util;

 import java.util.Iterator;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.util;

 import java.util.Collection;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javac.util;

 import java.nio.file.Path;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/LLNI.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/LLNI.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package com.sun.tools.javah;

 import java.io.OutputStream;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Mangle.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Mangle.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package com.sun.tools.javah;

 import javax.lang.model.element.ExecutableElement;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/TypeSignature.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/TypeSignature.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package com.sun.tools.javah;

 import java.util.*;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package com.sun.tools.javah;

 import java.io.PrintWriter;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/PubApiExtractor.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/PubApiExtractor.java
 /*
- * Copyright (c) 2012-2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, 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

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/PortFileInaccessibleException.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/PortFileInaccessibleException.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.client;

 import java.io.IOException;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/FileObjectWithLocation.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/FileObjectWithLocation.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.comp;

 import javax.tools.FileObject;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaFileObjectWithLocation.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaFileObjectWithLocation.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.comp;

 import javax.tools.ForwardingJavaFileObject;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PathAndPackageVerifier.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PathAndPackageVerifier.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.comp;

 import java.nio.file.Path;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PooledSjavac.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PooledSjavac.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.comp;

 import java.io.Writer;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacImpl.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacImpl.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.comp;

 import java.io.IOException;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.comp;

 import java.io.*;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ArrayTypeDesc.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ArrayTypeDesc.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.pubapi;

 import java.io.Serializable;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PrimitiveTypeDesc.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PrimitiveTypeDesc.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.pubapi;

 import java.io.Serializable;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApi.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApi.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.pubapi;



--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubMethod.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubMethod.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.pubapi;

 import java.io.Serializable;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubType.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubType.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.pubapi;

 import java.io.Serializable;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubVar.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubVar.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.pubapi;

 import java.io.Serializable;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ReferenceTypeDesc.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ReferenceTypeDesc.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.pubapi;

 import java.io.Serializable;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeDesc.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeDesc.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.pubapi;

 import java.io.Serializable;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeVarTypeDesc.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeVarTypeDesc.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.pubapi;

 import java.io.Serializable;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/IdleResetSjavac.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/IdleResetSjavac.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.server;

 import java.io.Writer;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFileMonitor.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFileMonitor.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.server;

 import java.io.IOException;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/RequestHandler.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/RequestHandler.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.server;

 import static com.sun.tools.sjavac.server.SjavacServer.LINE_TYPE_RC;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Sjavac.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Sjavac.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.server;

 import java.io.Writer;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.server;

 import java.io.FileNotFoundException;

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Terminable.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Terminable.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.sjavac.server;

 /**

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractProfileIndexWriter.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractProfileIndexWriter.java
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.doclets.formats.html;

 import java.io.*;

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package com.sun.tools.doclets.formats.html;

 import com.sun.javadoc.*;

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package com.sun.tools.doclets.internal.toolkit;

 import java.io.*;

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package com.sun.tools.doclets.internal.toolkit;

 import java.io.*;

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfilePackageSummaryWriter.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfilePackageSummaryWriter.java
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfileSummaryWriter.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfileSummaryWriter.java
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.doclets.internal.toolkit.builders;

 import java.io.*;

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.doclets.internal.toolkit.taglets;

 import java.util.Map;

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/IndexTaglet.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/IndexTaglet.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.doclets.internal.toolkit.taglets;

 import java.util.Map;

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.doclets.internal.toolkit.taglets;

 import java.util.Map;

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.doclets.internal.toolkit.util;

 import java.text.MessageFormat;

--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.doclets.internal.toolkit.util;
 import com.sun.javadoc.*;


--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/api/JavadocTaskImpl.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/api/JavadocTaskImpl.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javadoc.api;

 import com.sun.tools.javac.util.ClientCodeException;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java
-
 /*
 * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,6 +23,7 @@
 * questions.
 */

+
 package com.sun.tools.classfile;

 import java.io.ByteArrayOutputStream;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/CompilationID_attribute.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/CompilationID_attribute.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.classfile;

 import java.io.IOException;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPoolException.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPoolException.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package com.sun.tools.classfile;

 /*

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.classfile;

 import java.util.Deque;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Descriptor.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Descriptor.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package com.sun.tools.classfile;

 import java.io.IOException;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/DescriptorException.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/DescriptorException.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package com.sun.tools.classfile;

 /*

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java
-
 /*
 * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,6 +23,7 @@
 * questions.
 */

+
 package com.sun.tools.classfile;

 import java.io.IOException;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceID_attribute.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceID_attribute.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.classfile;

 import java.io.IOException;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.javap;

 import com.sun.tools.classfile.Attribute;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.jdeps;

 import java.io.PrintStream;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.jdeps;

 import com.sun.tools.classfile.ClassFile;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.jdeps;

 import com.sun.tools.classfile.ClassFile;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.jdeps;

 import com.sun.tools.classfile.AccessFlags;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.jdeps;

 import java.util.Collections;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModulesXmlReader.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModulesXmlReader.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.jdeps;

 import java.io.IOException;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/PlatformClassPath.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/PlatformClassPath.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.jdeps;

 import com.sun.tools.classfile.ClassFile;

--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Profile.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Profile.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package com.sun.tools.jdeps;

 import java.io.IOException;

--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/remote/RemoteCodes.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/remote/RemoteCodes.java
@@ -23,7 +23,6 @@
 * questions.
 */

-
 package jdk.internal.jshell.remote;

 import java.util.regex.Pattern;

--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/EditingHistory.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/EditingHistory.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package jdk.internal.jshell.tool;

 import java.util.ArrayList;

--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/StopDetectingInputStream.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/StopDetectingInputStream.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package jdk.internal.jshell.tool;

 import java.io.IOException;

--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package jdk.jshell;

 import java.util.Collection;

--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ErroneousSnippet.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/ErroneousSnippet.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package jdk.jshell;

 import jdk.jshell.Key.ErroneousKey;

--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package jdk.jshell;

 import java.util.ArrayList;

--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package jdk.jshell;

 import jdk.jshell.Key.ExpressionKey;

--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ImportSnippet.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/ImportSnippet.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package jdk.jshell;

 import jdk.jshell.Key.ImportKey;

--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/JDIEventHandler.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/JDIEventHandler.java
 /*
- * Copyright (c) 1998, 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, 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

--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java
@@ -22,6 +22,7 @@
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+
 package jdk.jshell;

 import java.util.Set;

--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/MethodSnippet.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/MethodSnippet.java
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/OuterWrap.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/OuterWrap.java
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/PersistentSnippet.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/PersistentSnippet.java
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplParserFactory.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/ReplParserFactory.java
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/StatementSnippet.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/StatementSnippet.java
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/TypeDeclSnippet.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/TypeDeclSnippet.java
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Util.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Util.java
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/VarSnippet.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/VarSnippet.java
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Wrap.java
--- a/langtools/test/com/sun/javadoc/T6735320/SerialFieldTest.java
+++ b/langtools/test/com/sun/javadoc/T6735320/SerialFieldTest.java
--- a/langtools/test/com/sun/javadoc/testCmndLineClass/C5.java
+++ b/langtools/test/com/sun/javadoc/testCmndLineClass/C5.java
--- a/langtools/test/com/sun/javadoc/testEncoding/EncodeTest.java
+++ b/langtools/test/com/sun/javadoc/testEncoding/EncodeTest.java
--- a/langtools/test/com/sun/javadoc/testJavaFX/pkg1/C.java
+++ b/langtools/test/com/sun/javadoc/testJavaFX/pkg1/C.java
--- a/langtools/test/com/sun/javadoc/testJavaFX/pkg1/D.java
+++ b/langtools/test/com/sun/javadoc/testJavaFX/pkg1/D.java
--- a/langtools/test/com/sun/javadoc/testJavaFX/pkg2/Test.java
+++ b/langtools/test/com/sun/javadoc/testJavaFX/pkg2/Test.java
--- a/langtools/test/com/sun/javadoc/testLegacyTaglet/C.java
+++ b/langtools/test/com/sun/javadoc/testLegacyTaglet/C.java
--- a/langtools/test/com/sun/javadoc/testOrdering/pkg1/A.java
+++ b/langtools/test/com/sun/javadoc/testOrdering/pkg1/A.java
--- a/langtools/test/com/sun/javadoc/testOrdering/pkg1/B.java
+++ b/langtools/test/com/sun/javadoc/testOrdering/pkg1/B.java
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/a/A.java
+++ b/langtools/test/com/sun/javadoc/testOrdering/src-2/a/A.java
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/a/something.java
+++ b/langtools/test/com/sun/javadoc/testOrdering/src-2/a/something.java
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/b/B.java
+++ b/langtools/test/com/sun/javadoc/testOrdering/src-2/b/B.java
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/b/something.java
+++ b/langtools/test/com/sun/javadoc/testOrdering/src-2/b/something.java
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/e/something.java
+++ b/langtools/test/com/sun/javadoc/testOrdering/src-2/e/something.java
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/something/J.java
+++ b/langtools/test/com/sun/javadoc/testOrdering/src-2/something/J.java
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/something/package-info.java
+++ b/langtools/test/com/sun/javadoc/testOrdering/src-2/something/package-info.java
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/something/something.java
+++ b/langtools/test/com/sun/javadoc/testOrdering/src-2/something/something.java
--- a/langtools/test/com/sun/javadoc/testSearch/pkgfx/C.java
+++ b/langtools/test/com/sun/javadoc/testSearch/pkgfx/C.java
--- a/langtools/test/com/sun/javadoc/testSinceTag/pkg1/C1.java
+++ b/langtools/test/com/sun/javadoc/testSinceTag/pkg1/C1.java
--- a/langtools/test/com/sun/javadoc/testThrowsInheritence/C.java
+++ b/langtools/test/com/sun/javadoc/testThrowsInheritence/C.java
--- a/langtools/test/com/sun/javadoc/testThrowsInheritence/I.java
+++ b/langtools/test/com/sun/javadoc/testThrowsInheritence/I.java
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Varargs.java
+++ b/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Varargs.java
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/AnAbstract.java
+++ b/langtools/test/com/sun/javadoc/testUseOption/pkg1/AnAbstract.java
--- a/langtools/test/lib/combo/tools/javac/combo/Diagnostics.java
+++ b/langtools/test/lib/combo/tools/javac/combo/Diagnostics.java
--- a/langtools/test/lib/combo/tools/javac/combo/JavacTemplateTestBase.java
+++ b/langtools/test/lib/combo/tools/javac/combo/JavacTemplateTestBase.java
--- a/langtools/test/lib/combo/tools/javac/combo/Template.java
+++ b/langtools/test/lib/combo/tools/javac/combo/Template.java
--- a/langtools/test/lib/combo/tools/javac/combo/TemplateTest.java
+++ b/langtools/test/lib/combo/tools/javac/combo/TemplateTest.java
--- a/langtools/test/tools/doclint/tidy/util/Main.java
+++ b/langtools/test/tools/doclint/tidy/util/Main.java
--- a/langtools/test/tools/javac/6199662/TreeInfo.java
+++ b/langtools/test/tools/javac/6199662/TreeInfo.java
--- a/langtools/test/tools/javac/6199662/TreeScanner.java
+++ b/langtools/test/tools/javac/6199662/TreeScanner.java
--- a/langtools/test/tools/javac/6302184/T6302184.java
+++ b/langtools/test/tools/javac/6302184/T6302184.java
--- a/langtools/test/tools/javac/6400872/C.java
+++ b/langtools/test/tools/javac/6400872/C.java
--- a/langtools/test/tools/javac/6508981/p/A.java
+++ b/langtools/test/tools/javac/6508981/p/A.java
--- a/langtools/test/tools/javac/6917288/GraphicalInstallerTest.java
+++ b/langtools/test/tools/javac/6917288/GraphicalInstallerTest.java
--- a/langtools/test/tools/javac/7153958/pkg/ClassToBeStaticallyImportedA.java
+++ b/langtools/test/tools/javac/7153958/pkg/ClassToBeStaticallyImportedA.java
--- a/langtools/test/tools/javac/7153958/pkg/ClassToBeStaticallyImportedB.java
+++ b/langtools/test/tools/javac/7153958/pkg/ClassToBeStaticallyImportedB.java
--- a/langtools/test/tools/javac/MethodParameters/ClassFileVisitor.java
+++ b/langtools/test/tools/javac/MethodParameters/ClassFileVisitor.java
--- a/langtools/test/tools/javac/MethodParameters/ReflectionVisitor.java
+++ b/langtools/test/tools/javac/MethodParameters/ReflectionVisitor.java
--- a/langtools/test/tools/javac/NameClash/NameClashTest.java
+++ b/langtools/test/tools/javac/NameClash/NameClashTest.java
--- a/langtools/test/tools/javac/T6458823/MyProcessor.java
+++ b/langtools/test/tools/javac/T6458823/MyProcessor.java
--- a/langtools/test/tools/javac/T6942649.java
+++ b/langtools/test/tools/javac/T6942649.java
--- a/langtools/test/tools/javac/annotations/neg/8022765/VerifyAnnotationsAttributed.java
+++ b/langtools/test/tools/javac/annotations/neg/8022765/VerifyAnnotationsAttributed.java
--- a/langtools/test/tools/javac/annotations/typeAnnotations/TargetTypes.java
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/TargetTypes.java
--- a/langtools/test/tools/javac/annotations/typeAnnotations/TypeProcOnly.java
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/TypeProcOnly.java
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8008769.java
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8008769.java
--- a/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java
--- a/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/Anno.java
--- a/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/mypackage/MyClass.java
--- a/langtools/test/tools/javac/api/6557752/T6557752.java
+++ b/langtools/test/tools/javac/api/6557752/T6557752.java
--- a/langtools/test/tools/javac/api/TestGetElementReferenceData.java
+++ b/langtools/test/tools/javac/api/TestGetElementReferenceData.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java
--- a/langtools/test/tools/javac/defaultMethods/Assertions.java
+++ b/langtools/test/tools/javac/defaultMethods/Assertions.java
--- a/langtools/test/tools/javac/defaultMethods/crossCompile/Clinit.java
+++ b/langtools/test/tools/javac/defaultMethods/crossCompile/Clinit.java
--- a/langtools/test/tools/javac/diags/HTMLWriter.java
+++ b/langtools/test/tools/javac/diags/HTMLWriter.java
--- a/langtools/test/tools/javac/diags/examples/DiamondAndAnonClass.java
+++ b/langtools/test/tools/javac/diags/examples/DiamondAndAnonClass.java
--- a/langtools/test/tools/javac/diags/examples/DiamondAndNonDenotableTypes.java
+++ b/langtools/test/tools/javac/diags/examples/DiamondAndNonDenotableTypes.java
--- a/langtools/test/tools/javac/doctree/positions/TestPositionSource.java
+++ b/langtools/test/tools/javac/doctree/positions/TestPositionSource.java
--- a/langtools/test/tools/javac/file/zip/8003512/LoadClassFromJava6CreatedJarTest.java
+++ b/langtools/test/tools/javac/file/zip/8003512/LoadClassFromJava6CreatedJarTest.java
--- a/langtools/test/tools/javac/flow/AliveRanges.java
+++ b/langtools/test/tools/javac/flow/AliveRanges.java
--- a/langtools/test/tools/javac/generics/8004094/B.java
+++ b/langtools/test/tools/javac/generics/8004094/B.java
--- a/langtools/test/tools/javac/generics/bridges/Bridge.java
+++ b/langtools/test/tools/javac/generics/bridges/Bridge.java
--- a/langtools/test/tools/javac/generics/bridges/Bridges.java
+++ b/langtools/test/tools/javac/generics/bridges/Bridges.java
--- a/langtools/test/tools/javac/generics/bridges/tests/TestBridgeWithDefault.java
+++ b/langtools/test/tools/javac/generics/bridges/tests/TestBridgeWithDefault.java
--- a/langtools/test/tools/javac/generics/bridges/tests/TestClassAndInterfaceBridgeIdentical01.java
+++ b/langtools/test/tools/javac/generics/bridges/tests/TestClassAndInterfaceBridgeIdentical01.java
--- a/langtools/test/tools/javac/generics/bridges/tests/TestClassAndInterfaceBridgeIdentical02.java
+++ b/langtools/test/tools/javac/generics/bridges/tests/TestClassAndInterfaceBridgeIdentical02.java
--- a/langtools/test/tools/javac/generics/bridges/tests/TestNoBridgeInSiblingsSuper.java
+++ b/langtools/test/tools/javac/generics/bridges/tests/TestNoBridgeInSiblingsSuper.java
--- a/langtools/test/tools/javac/generics/bridges/tests/TestNoDuplicateBridges01.java
+++ b/langtools/test/tools/javac/generics/bridges/tests/TestNoDuplicateBridges01.java
--- a/langtools/test/tools/javac/generics/bridges/tests/TestNoDuplicateBridges02.java
+++ b/langtools/test/tools/javac/generics/bridges/tests/TestNoDuplicateBridges02.java
--- a/langtools/test/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java
+++ b/langtools/test/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java
--- a/langtools/test/tools/javac/implicitCompile/Implicit.java
+++ b/langtools/test/tools/javac/implicitCompile/Implicit.java
--- a/langtools/test/tools/javac/importscope/TestDuplicateImport.java
+++ b/langtools/test/tools/javac/importscope/TestDuplicateImport.java
--- a/langtools/test/tools/javac/importscope/TestLazyImportScope.java
+++ b/langtools/test/tools/javac/importscope/TestLazyImportScope.java
--- a/langtools/test/tools/javac/lambda/8068399/T8068399.java
+++ b/langtools/test/tools/javac/lambda/8068399/T8068399.java
--- a/langtools/test/tools/javac/lambda/LocalBreakAndContinue.java
+++ b/langtools/test/tools/javac/lambda/LocalBreakAndContinue.java
--- a/langtools/test/tools/javac/lambda/bridge/template_tests/BridgeMethodTestCase.java
+++ b/langtools/test/tools/javac/lambda/bridge/template_tests/BridgeMethodTestCase.java
--- a/langtools/test/tools/javac/lambda/bridge/template_tests/BridgeMethodsTemplateTest.java
+++ b/langtools/test/tools/javac/lambda/bridge/template_tests/BridgeMethodsTemplateTest.java
--- a/langtools/test/tools/javac/lambda/inaccessibleMref01/p1/C.java
+++ b/langtools/test/tools/javac/lambda/inaccessibleMref01/p1/C.java
--- a/langtools/test/tools/javac/lambda/inaccessibleMref02/p1/C.java
+++ b/langtools/test/tools/javac/lambda/inaccessibleMref02/p1/C.java
--- a/langtools/test/tools/javac/lambda/methodReferenceExecution/pkg/B.java
+++ b/langtools/test/tools/javac/lambda/methodReferenceExecution/pkg/B.java
--- a/langtools/test/tools/javac/lambda/separate/Foo.java
+++ b/langtools/test/tools/javac/lambda/separate/Foo.java
--- a/langtools/test/tools/javac/options/T7022337.java
+++ b/langtools/test/tools/javac/options/T7022337.java
--- a/langtools/test/tools/javac/policy/test3/Test.java
+++ b/langtools/test/tools/javac/policy/test3/Test.java
--- a/langtools/test/tools/javac/processing/6414633/A.java
+++ b/langtools/test/tools/javac/processing/6414633/A.java
--- a/langtools/test/tools/javac/processing/TestWarnErrorCount.java
+++ b/langtools/test/tools/javac/processing/TestWarnErrorCount.java
--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java
--- a/langtools/test/tools/javac/resolve/Candidate.java
+++ b/langtools/test/tools/javac/resolve/Candidate.java
--- a/langtools/test/tools/javac/resolve/Pos.java
+++ b/langtools/test/tools/javac/resolve/Pos.java
--- a/langtools/test/tools/javac/resolve/TraceResolve.java
+++ b/langtools/test/tools/javac/resolve/TraceResolve.java
--- a/langtools/test/tools/javac/resolve/tests/AbstractMerge.java
+++ b/langtools/test/tools/javac/resolve/tests/AbstractMerge.java
--- a/langtools/test/tools/javac/scope/DupUnsharedTest.java
+++ b/langtools/test/tools/javac/scope/DupUnsharedTest.java
--- a/langtools/test/tools/javac/scope/RemoveSymbolUnitTest.java
+++ b/langtools/test/tools/javac/scope/RemoveSymbolUnitTest.java
--- a/langtools/test/tools/javac/staticImport/6665223/pkg/A.java
+++ b/langtools/test/tools/javac/staticImport/6665223/pkg/A.java
--- a/langtools/test/tools/javac/staticImport/6665223/pkg/B.java
+++ b/langtools/test/tools/javac/staticImport/6665223/pkg/B.java
--- a/langtools/test/tools/javac/tree/JavacTreeScannerTest.java
+++ b/langtools/test/tools/javac/tree/JavacTreeScannerTest.java
--- a/langtools/test/tools/javac/tree/SourceTreeScannerTest.java
+++ b/langtools/test/tools/javac/tree/SourceTreeScannerTest.java
--- a/langtools/test/tools/javac/tree/TestAnnotatedAnonClass.java
+++ b/langtools/test/tools/javac/tree/TestAnnotatedAnonClass.java
--- a/langtools/test/tools/javac/warnings/suppress/T8021112a.java
+++ b/langtools/test/tools/javac/warnings/suppress/T8021112a.java
--- a/langtools/test/tools/javadoc/parser/7091528/p/C3.java
+++ b/langtools/test/tools/javadoc/parser/7091528/p/C3.java
--- a/langtools/test/tools/javadoc/subpackageIgnore/pkg1/not-subpkg/SomeJavaFile.java
+++ b/langtools/test/tools/javadoc/subpackageIgnore/pkg1/not-subpkg/SomeJavaFile.java
--- a/langtools/test/tools/javap/ExtPath.java
+++ b/langtools/test/tools/javap/ExtPath.java
--- a/langtools/test/tools/javap/T4880672.java
+++ b/langtools/test/tools/javap/T4880672.java
--- a/langtools/test/tools/javap/T6729471.java
+++ b/langtools/test/tools/javap/T6729471.java
--- a/langtools/test/tools/javap/T6866657.java
+++ b/langtools/test/tools/javap/T6866657.java
--- a/langtools/test/tools/jdeps/VerboseFormat/JdepsDependencyClosure.java
+++ b/langtools/test/tools/jdeps/VerboseFormat/JdepsDependencyClosure.java
--- a/langtools/test/tools/jdeps/VerboseFormat/use/indirect/DontUseUnsafe2.java
+++ b/langtools/test/tools/jdeps/VerboseFormat/use/indirect/DontUseUnsafe2.java
--- a/langtools/test/tools/jdeps/VerboseFormat/use/indirect/UseUnsafeIndirectly.java
+++ b/langtools/test/tools/jdeps/VerboseFormat/use/indirect/UseUnsafeIndirectly.java
--- a/langtools/test/tools/jdeps/VerboseFormat/use/indirect2/DontUseUnsafe3.java
+++ b/langtools/test/tools/jdeps/VerboseFormat/use/indirect2/DontUseUnsafe3.java
--- a/langtools/test/tools/jdeps/VerboseFormat/use/indirect2/UseUnsafeIndirectly2.java
+++ b/langtools/test/tools/jdeps/VerboseFormat/use/indirect2/UseUnsafeIndirectly2.java
--- a/langtools/test/tools/jdeps/VerboseFormat/use/unsafe/DontUseUnsafe.java
+++ b/langtools/test/tools/jdeps/VerboseFormat/use/unsafe/DontUseUnsafe.java
--- a/langtools/test/tools/jdeps/VerboseFormat/use/unsafe/UseUnsafeClass.java
+++ b/langtools/test/tools/jdeps/VerboseFormat/use/unsafe/UseUnsafeClass.java
--- a/langtools/test/tools/jdeps/VerboseFormat/use/unsafe/UseUnsafeClass2.java
+++ b/langtools/test/tools/jdeps/VerboseFormat/use/unsafe/UseUnsafeClass2.java
--- a/langtools/test/tools/sjavac/ExclPattern.java
+++ b/langtools/test/tools/sjavac/ExclPattern.java