changeset 2347:e9c247637a24

8034933: Update documentation for Types.directSupertypes to clarify behavior Reviewed-by: darcy
author pgovereau
date Tue, 01 Apr 2014 23:52:10 -0700
parents a6ed73c27673
children ec1cfd55bf28
files src/share/classes/javax/lang/model/util/Types.java test/tools/javac/processing/model/util/DirectSuperOfInt.java
diffstat 2 files changed, 71 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/lang/model/util/Types.java	Wed Apr 02 10:05:16 2014 +0400
+++ b/src/share/classes/javax/lang/model/util/Types.java	Tue Apr 01 23:52:10 2014 -0700
@@ -132,12 +132,15 @@
     boolean isSubsignature(ExecutableType m1, ExecutableType m2);
 
     /**
-     * Returns the direct supertypes of a type.  The interface types, if any,
-     * will appear last in the list.
+     * Returns the direct supertypes of a type. The interface types, if any,
+     * will appear last in the list. For an interface type with no direct
+     * super-interfaces, a type mirror representing {@code java.lang.Object}
+     * is returned.
      *
      * @param t  the type being examined
      * @return the direct supertypes, or an empty list if none
      * @throws IllegalArgumentException if given an executable or package type
+     * @jls 4.10 Subtyping
      */
     List<? extends TypeMirror> directSupertypes(TypeMirror t);
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/processing/model/util/DirectSuperOfInt.java	Tue Apr 01 23:52:10 2014 -0700
@@ -0,0 +1,66 @@
+/*
+ * 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
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug     8034933
+ * @summary Types.directSupertypes should return Object as the super type of interfaces
+ * @library /tools/javac/lib
+ * @build   JavacTestingAbstractProcessor DirectSuperOfInt
+ * @compile -processor DirectSuperOfInt -proc:only DirectSuperOfInt.java
+ */
+
+import java.util.Set;
+import java.util.List;
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+import javax.lang.model.util.*;
+import static javax.lang.model.util.ElementFilter.*;
+
+public class DirectSuperOfInt extends JavacTestingAbstractProcessor {
+    public boolean process(Set<? extends TypeElement> tes,
+                           RoundEnvironment round) {
+        if (round.processingOver())
+            return true;
+
+        boolean tested = false;
+        for (TypeElement te : typesIn(round.getRootElements())) {
+            if (!te.getSimpleName().contentEquals("DirectSuperOfIntI"))
+                continue;
+
+            tested = true;
+            List<? extends TypeMirror> supers = types.directSupertypes(te.asType());
+            if (supers.size() != 1)
+                throw new AssertionError("test failed");
+
+            if (!elements.getTypeElement("java.lang.Object").asType().equals((supers.get(0))))
+                throw new AssertionError("test failed");
+        }
+        if (!tested)
+            throw new AssertionError("test failed");
+        return true;
+    }
+}
+
+interface DirectSuperOfIntI {}