Merge pull request #1944 from apache/master

 sync master to release 113 branch for beta3 (extra time)

Author: ebarboni

apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/customizer/SingleModuleProperties.java

@@ -118,7 +118,7 @@ public final class SingleModuleProperties extends ModuleProperties {
     public static final String SPEC_VERSION_BASE = "spec.version.base"; // NOI18N
     /** @see "#66278" */
     public static final String JAVAC_COMPILERARGS = "javac.compilerargs"; // NOI18N
-    static final String[] SOURCE_LEVELS = {"1.4", "1.5", "1.6", "1.7", "1.8", "9", "10", "11", "12"}; // NOI18N
+    static final String[] SOURCE_LEVELS = {"1.4", "1.5", "1.6", "1.7", "1.8", "9", "10", "11", "12", "13", "14"}; // NOI18N
     private final static Map<String, String> DEFAULTS;
 
     private static final Logger LOG = Logger.getLogger(SingleModuleProperties.class.getName());

groovy/gradle.java/src/org/netbeans/modules/gradle/java/classpath/ClassPathProviderImpl.java

@@ -315,7 +315,7 @@ private ClassPath createMultiplexClassPath(ClassPath modulePath, ClassPath class
 
         public boolean  hasModuleInfo() {
             GradleJavaProject gjp = GradleJavaProject.get(ClassPathProviderImpl.this.project);
-            GradleJavaSourceSet ss = gjp.getSourceSets().get(group);
+            GradleJavaSourceSet ss = gjp != null ? gjp.getSourceSets().get(group) : null;
             return ss != null && ss.findResource(MODULE_INFO_JAVA, false, GradleJavaSourceSet.SourceType.JAVA) != null;
         }
 

groovy/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleBinaryForSource.java

@@ -93,7 +93,8 @@ public Res(Project prj, String sourceSetName, boolean resource) {
 
         @Override
         public URL[] getRoots() {
-            GradleJavaSourceSet ss = GradleJavaProject.get(prj).getSourceSets().get(sourceSetName);
+            GradleJavaProject gjp = GradleJavaProject.get(prj);
+            GradleJavaSourceSet ss = gjp != null ? gjp.getSourceSets().get(sourceSetName) : null;
             if (ss == null) {
                 return new URL[0];
             }

java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java

@@ -196,7 +196,11 @@ public static boolean checkTypesAssignable(CompilationInfo info, TypeMirror from
 
     public static TypeMirror getBound(WildcardType wildcardType) {
         Type.TypeVar bound = ((Type.WildcardType)wildcardType).bound;
-        return bound != null ? bound.bound : null;
+        try {
+            return bound != null ? bound.bound : null;
+        } catch (NoSuchFieldError err) {
+            return bound != null ? bound.getUpperBound() : null;
+        }
     }
 
     /**

java/java.source.base/test/unit/data/sourceutils/TestGetBound.java

@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package sourceutils;
+
+public class TestGetBound<T extends TestGetBoundExtra<? extends String>> {
+}
+class TestGetBoundExtra<T extends CharSequence> {}

java/java.source.base/test/unit/src/org/netbeans/api/java/source/SourceUtilsTest.java

@@ -19,6 +19,7 @@
 
 package org.netbeans.api.java.source;
 
+import com.sun.source.tree.Tree;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -38,7 +39,12 @@
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.TypeParameterElement;
 import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.TypeVariable;
+import javax.lang.model.type.WildcardType;
 import javax.lang.model.util.ElementFilter;
 import javax.swing.event.ChangeListener;
 import org.netbeans.api.java.classpath.ClassPath;
@@ -428,6 +434,21 @@ public void testDollarSourceName() throws Exception {
         assertEquals("TestDollarSourceName.java", f.getNameExt());
     }
 
+    public void testGetBound() throws Exception {
+        //only a scatch of the test, add testcases as needed:
+        prepareTest();
+
+        TypeElement test = info.getElements().getTypeElement("sourceutils.TestGetBound");
+
+        assertNotNull(test);
+
+        TypeParameterElement typeParam = test.getTypeParameters().get(0);
+        TypeMirror outerBound = ((TypeVariable) typeParam.asType()).getUpperBound();
+
+        TypeMirror bound = SourceUtils.getBound((WildcardType) ((DeclaredType) outerBound).getTypeArguments().get(0));
+        assertEquals("java.lang.CharSequence", String.valueOf(bound));
+    }
+
     //<editor-fold defaultstate="collapsed" desc="Helper methods & Mock services">
 
     private void prepareTest() throws Exception {