nb-javac merge with jdk-16 (#13)

* Integrated with JDK-16 to support new features

Author: singh-akhilesh

make/langtools/netbeans/nb-javac/nbproject/project.properties

@@ -104,4 +104,4 @@ javac.test.classpath=\
     ${build.dir}/lib/hamcrest-core-1.3.jar
 debug.classpath=${run.classpath}
 jnlp.enabled=false
-nb-javac-ver=15.0.0.2
+nb-javac-ver=16

make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/parser/DocCommentParserTest.java

@@ -111,8 +111,8 @@ public void test229725() throws IOException {
 
     public void testInlineSpan() throws IOException {
         doTestErrorRecovery("{@literal code}\n",
-                            "DOC_COMMENT:{@literal code}",
-                            "LITERAL:{@literal code}",
+                            "DOC_COMMENT:{@literal code}\n",
+                            "LITERAL:{@literal code}\n",
                             "TEXT:code"
                            );
     }

make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/parser/JavacParserTest.java

@@ -545,7 +545,7 @@ public void testVariableInIfThen3() throws IOException {
             codes.add(d.getCode());
         }
 
-        assertEquals(Arrays.<String>asList("compiler.err.expected3"), codes);//TODO: was "compiler.err.illegal.start.of.expr" before JDK8 merge
+        assertEquals(Arrays.<String>asList("compiler.err.expected4"), codes);//TODO: was "compiler.err.illegal.start.of.expr" before JDK8 merge
 //        assertEquals(Arrays.<String>asList("compiler.err.illegal.start.of.expr"), codes);
     }
 

src/java.compiler/share/classes/javax/annotation/processing/AbstractProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, 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
@@ -39,9 +39,9 @@
  * superclass for most concrete annotation processors.  This class
  * examines annotation values to compute the {@linkplain
  * #getSupportedOptions options}, {@linkplain
- * #getSupportedAnnotationTypes annotation types}, and {@linkplain
- * #getSupportedSourceVersion source version} supported by its
- * subtypes.
+ * #getSupportedAnnotationTypes annotation interfaces}, and
+ * {@linkplain #getSupportedSourceVersion source version} supported by
+ * its subtypes.
  *
  * <p>The getter methods may {@linkplain Messager#printMessage issue
  * warnings} about noteworthy conditions using the facilities available
@@ -98,8 +98,8 @@ public Set<String> getSupportedOptions() {
      * then any leading {@linkplain Processor#getSupportedAnnotationTypes
      * module prefixes} are stripped from the names.
      *
-     * @return the names of the annotation types supported by this
-     * processor, or an empty set if none
+     * @return the names of the annotation interfaces supported by
+     * this processor, or an empty set if none
      */
     public Set<String> getSupportedAnnotationTypes() {
             SupportedAnnotationTypes sat = this.getClass().getAnnotation(SupportedAnnotationTypes.class);
@@ -171,7 +171,7 @@ public abstract boolean process(Set<? extends TypeElement> annotations,
                                     RoundEnvironment roundEnv);
 
     /**
-     * Returns an empty iterable of completions.
+     * {@return an empty iterable of completions}
      *
      * @param element {@inheritDoc}
      * @param annotation {@inheritDoc}
@@ -186,11 +186,8 @@ public Iterable<? extends Completion> getCompletions(Element element,
     }
 
     /**
-     * Returns {@code true} if this object has been {@linkplain #init
-     * initialized}, {@code false} otherwise.
-     *
-     * @return {@code true} if this object has been initialized,
-     * {@code false} otherwise.
+     * {@return {@code true} if this object has been {@linkplain #init
+     * initialized}, {@code false} otherwise}
      */
     protected synchronized boolean isInitialized() {
         return initialized;

src/java.compiler/share/classes/javax/annotation/processing/Completion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, 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
@@ -38,14 +38,12 @@
 public interface Completion {
 
     /**
-     * Returns the text of the suggested completion.
-     * @return the text of the suggested completion.
+     * {@return the text of the suggested completion}
      */
     String getValue();
 
     /**
-     * Returns an informative message about the completion.
-     * @return an informative message about the completion.
+     * {@return an informative message about the completion}
      */
     String getMessage();
 }

src/java.compiler/share/classes/javax/annotation/processing/Completions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, 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
@@ -65,21 +65,19 @@ public String toString() {
     }
 
     /**
-     * Returns a completion of the value and message.
+     * {@return a completion of the value and message}
      *
      * @param value the text of the completion
      * @param message a message about the completion
-     * @return a completion of the provided value and message
      */
     public static Completion of(String value, String message) {
         return new SimpleCompletion(value, message);
     }
 
     /**
-     * Returns a completion of the value and an empty message
+     * {@return a completion of the value and an empty message}
      *
      * @param value the text of the completion
-     * @return a completion of the value and an empty message
      */
     public static Completion of(String value) {
         return new SimpleCompletion(value, "");

src/java.compiler/share/classes/javax/annotation/processing/Filer.java

@@ -66,9 +66,9 @@
  * <p>The file creation methods take a variable number of arguments to
  * allow the <em>originating elements</em> to be provided as hints to
  * the tool infrastructure to better manage dependencies.  The
- * originating elements are the types or packages (representing {@code
- * package-info} files) or modules (representing {@code
- * module-info} files) which caused an annotation processor to
+ * originating elements are the classes or interfaces or packages
+ * (representing {@code package-info} files) or modules (representing
+ * {@code module-info} files) which caused an annotation processor to
  * attempt to create a new file.  For example, if an annotation
  * processor tries to create a source file, {@code
  * GeneratedFromUserSource}, in response to processing
@@ -107,14 +107,15 @@
  * <p> In general, processors must not knowingly attempt to overwrite
  * existing files that were not generated by some processor.  A {@code
  * Filer} may reject attempts to open a file corresponding to an
- * existing type, like {@code java.lang.Object}.  Likewise, the
+ * existing class or interface, like {@code java.lang.Object}.  Likewise, the
  * invoker of the annotation processing tool must not knowingly
  * configure the tool such that the discovered processors will attempt
  * to overwrite existing files that were not generated.
  *
  * <p> Processors can indicate a source or class file is generated by
- * including a {@link javax.annotation.processing.Generated} annotation if the
- * environment is configured so that that type is accessible.
+ * including a {@link javax.annotation.processing.Generated}
+ * annotation if the environment is configured so that that class or
+ * interface is accessible.
  *
  * @apiNote Some of the effect of overwriting a file can be
  * achieved by using a <i>decorator</i>-style pattern.  Instead of
@@ -133,18 +134,18 @@
 public interface Filer {
     /**
      * Creates a new source file and returns an object to allow
-     * writing to it. A source file for a type, or a package can
-     * be created.
+     * writing to it. A source file for a class, interface, or a
+     * package can be created.
      *
      * The file's name and path (relative to the {@linkplain
      * StandardLocation#SOURCE_OUTPUT root output location for source
      * files}) are based on the name of the item to be declared in
      * that file as well as the specified module for the item (if
      * any).
      *
-     * If more than one type is being declared in a single file (that
+     * If more than one class or interface is being declared in a single file (that
      * is, a single compilation unit), the name of the file should
-     * correspond to the name of the principal top-level type (the
+     * correspond to the name of the principal top-level class or interface (the
      * public one, for example).
      *
      * <p>A source file can also be created to hold information about
@@ -155,7 +156,7 @@ public interface Filer {
      *
      * <p>The optional module name is prefixed to the type name or
      * package name and separated using a "{@code /}" character. For
-     * example, to create a source file for type {@code a.B} in module
+     * example, to create a source file for class {@code a.B} in module
      * {@code foo}, use a {@code name} argument of {@code "foo/a.B"}.
      *
      * <p>If no explicit module prefix is given and modules are supported
@@ -164,7 +165,7 @@ public interface Filer {
      * An implementation may use information about the configuration of
      * the annotation processing tool as part of the inference.
      *
-     * <p>Creating a source file in or for an unnamed package in a named
+     * <p>Creating a source file in or for an <em>unnamed</em> package in a <em>named</em>
      * module is <em>not</em> supported.
      *
      * @apiNote To use a particular {@linkplain
@@ -194,15 +195,15 @@ public interface Filer {
      * as the target module. A separate option may be used to provide the target
      * module if it cannot be determined using the above rules.
      *
-     * @param name  canonical (fully qualified) name of the principal type
+     * @param name  canonical (fully qualified) name of the principal class or interface
      *          being declared in this file or a package name followed by
      *          {@code ".package-info"} for a package information file
-     * @param originatingElements type or package or module elements causally
-     * associated with the creation of this file, may be elided or
-     * {@code null}
+     * @param originatingElements class, interface, package, or module
+     * elements causally associated with the creation of this file,
+     * may be elided or {@code null}
      * @return a {@code JavaFileObject} to write the new source file
      * @throws FilerException if the same pathname has already been
-     * created, the same type has already been created, the name is
+     * created, the same class or interface has already been created, the name is
      * otherwise not valid for the entity requested to being created,
      * if the target module cannot be determined, if the target
      * module is not writable, or a module is specified when the environment
@@ -215,7 +216,7 @@ JavaFileObject createSourceFile(CharSequence name,
 
     /**
      * Creates a new class file, and returns an object to allow
-     * writing to it. A class file for a type, or a package can
+     * writing to it. A class file for a class, interface, or a package can
      * be created.
      *
      * The file's name and path (relative to the {@linkplain
@@ -231,7 +232,7 @@ JavaFileObject createSourceFile(CharSequence name,
      *
      * <p>The optional module name is prefixed to the type name or
      * package name and separated using a "{@code /}" character. For
-     * example, to create a class file for type {@code a.B} in module
+     * example, to create a class file for class {@code a.B} in module
      * {@code foo}, use a {@code name} argument of {@code "foo/a.B"}.
      *
      * <p>If no explicit module prefix is given and modules are supported
@@ -240,7 +241,7 @@ JavaFileObject createSourceFile(CharSequence name,
      * An implementation may use information about the configuration of
      * the annotation processing tool as part of the inference.
      *
-     * <p>Creating a class file in or for an unnamed package in a named
+     * <p>Creating a class file in or for an <em>unnamed</em> package in a <em>named</em>
      * module is <em>not</em> supported.
      *
      * @apiNote To avoid subsequent errors, the contents of the class
@@ -259,15 +260,16 @@ JavaFileObject createSourceFile(CharSequence name,
      * as the target module. A separate option may be used to provide the target
      * module if it cannot be determined using the above rules.
      *
-     * @param name binary name of the type being written or a package name followed by
-     *          {@code ".package-info"} for a package information file
-     * @param originatingElements type or package or module elements causally
-     * associated with the creation of this file, may be elided or
-     * {@code null}
+     * @param name binary name of the class or interface being written
+     * or a package name followed by {@code ".package-info"} for a
+     * package information file
+     * @param originatingElements class or interface or package or
+     * module elements causally associated with the creation of this
+     * file, may be elided or {@code null}
      * @return a {@code JavaFileObject} to write the new class file
      * @throws FilerException if the same pathname has already been
-     * created, the same type has already been created, the name is
-     * not valid for a type, if the target module cannot be determined,
+     * created, the same class or interface has already been created, the name is
+     * not valid for a class or interface, if the target module cannot be determined,
      * if the target module is not writable, or a module is specified when
      * the environment doesn't support modules.
      * @throws IOException if the file cannot be created
@@ -330,8 +332,9 @@ JavaFileObject createClassFile(CharSequence name,
      * @param moduleAndPkg module and/or package relative to which the file
      *           should be named, or the empty string if none
      * @param relativeName final pathname components of the file
-     * @param originatingElements type or package or module elements causally
-     * associated with the creation of this file, may be elided or
+     * @param originatingElements class or interface or package or
+     * module elements causally associated with the creation of this
+     * file, may be elided or
      * {@code null}
      * @return a {@code FileObject} to write the new resource
      * @throws IOException if the file cannot be created

src/java.compiler/share/classes/javax/annotation/processing/FilerException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, 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
@@ -31,8 +31,9 @@
  * Indicates a {@link Filer} detected an attempt to open a file that
  * would violate the guarantees provided by the {@code Filer}.  Those
  * guarantees include not creating the same file more than once, not
- * creating multiple files corresponding to the same type or package, and not
- * creating files for types with invalid names.
+ * creating multiple files corresponding to the same class or
+ * interface or package, and not creating files for classes or
+ * interfaces with invalid names.
  *
  * @author Joseph D. Darcy
  * @author Scott Seligman