--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java Mon Aug 29 07:46:37 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java Mon Aug 29 20:55:24 2016 +0200
@@ -75,8 +75,6 @@
import com.sun.source.util.DocSourcePositions;
import com.sun.source.util.DocTrees;
import com.sun.source.util.TreePath;
-import com.sun.tools.javac.util.DefinedBy;
-import com.sun.tools.javac.util.DefinedBy.Api;
import jdk.javadoc.internal.doclets.toolkit.CommentUtils.DocCommentDuo;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
@@ -383,17 +381,17 @@
public boolean isAnnotationType(Element e) {
return new SimpleElementVisitor9<Boolean, Void>() {
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public Boolean visitExecutable(ExecutableElement e, Void p) {
return visit(e.getEnclosingElement());
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public Boolean visitUnknown(Element e, Void p) {
return false;
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected Boolean defaultAction(Element e, Void p) {
return e.getKind() == ANNOTATION_TYPE;
}
@@ -553,34 +551,34 @@
}
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitTypeAsInterface(TypeElement e, SortedSet<Modifier> p) {
addVisibilityModifier(p);
addStatic(p);
return finalString("interface");
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitTypeAsEnum(TypeElement e, SortedSet<Modifier> p) {
addVisibilityModifier(p);
addStatic(p);
return finalString("enum");
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitTypeAsAnnotationType(TypeElement e, SortedSet<Modifier> p) {
addVisibilityModifier(p);
addStatic(p);
return finalString("@interface");
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitTypeAsClass(TypeElement e, SortedSet<Modifier> p) {
addModifers(p);
return finalString("class");
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected String defaultAction(Element e, SortedSet<Modifier> p) {
addModifers(p);
return sb.toString().trim();
@@ -626,19 +624,19 @@
public boolean isPrimitive(TypeMirror t) {
return new SimpleTypeVisitor9<Boolean, Void>() {
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public Boolean visitNoType(NoType t, Void p) {
return t.getKind() == VOID;
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public Boolean visitPrimitive(PrimitiveType t, Void p) {
return true;
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public Boolean visitArray(ArrayType t, Void p) {
return visit(t.getComponentType());
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected Boolean defaultAction(TypeMirror e, Void p) {
return false;
}
@@ -726,7 +724,7 @@
return new SimpleTypeVisitor9<StringBuilder, Void>() {
final StringBuilder sb = new StringBuilder();
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public StringBuilder visitArray(ArrayType t, Void p) {
TypeMirror componentType = t.getComponentType();
visit(componentType);
@@ -734,7 +732,7 @@
return sb;
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public StringBuilder visitDeclared(DeclaredType t, Void p) {
Element e = t.asElement();
sb.append(qualifiedName ? getFullyQualifiedName(e) : getSimpleName(e));
@@ -755,14 +753,14 @@
return sb;
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public StringBuilder visitTypeVariable(javax.lang.model.type.TypeVariable t, Void p) {
Element e = t.asElement();
sb.append(qualifiedName ? getFullyQualifiedName(e, false) : getSimpleName(e));
return sb;
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public StringBuilder visitWildcard(javax.lang.model.type.WildcardType t, Void p) {
sb.append("?");
TypeMirror upperBound = t.getExtendsBound();
@@ -778,7 +776,7 @@
return sb;
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected StringBuilder defaultAction(TypeMirror e, Void p) {
return sb.append(e);
}
@@ -1176,17 +1174,17 @@
public TypeElement asTypeElement(TypeMirror t) {
return new SimpleTypeVisitor9<TypeElement, Void>() {
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public TypeElement visitDeclared(DeclaredType t, Void p) {
return (TypeElement) t.asElement();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public TypeElement visitArray(ArrayType t, Void p) {
return visit(t.getComponentType());
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public TypeElement visitTypeVariable(javax.lang.model.type.TypeVariable t, Void p) {
/*
* TODO: Check with JJG.
@@ -1199,17 +1197,17 @@
return visit(typeUtils.erasure(t));
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public TypeElement visitWildcard(javax.lang.model.type.WildcardType t, Void p) {
return visit(typeUtils.erasure(t));
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public TypeElement visitError(ErrorType t, Void p) {
return (TypeElement)t.asElement();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected TypeElement defaultAction(TypeMirror e, Void p) {
return super.defaultAction(e, p);
}
@@ -1233,13 +1231,13 @@
public String getDimension(TypeMirror t) {
return new SimpleTypeVisitor9<String, Void>() {
StringBuilder dimension = new StringBuilder("");
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitArray(ArrayType t, Void p) {
dimension.append("[]");
return visit(t.getComponentType());
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected String defaultAction(TypeMirror e, Void p) {
return dimension.toString();
}
@@ -1344,12 +1342,12 @@
public String getTypeName(TypeMirror t, boolean fullyQualified) {
return new SimpleTypeVisitor9<String, Void>() {
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitArray(ArrayType t, Void p) {
return visit(t.getComponentType());
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitDeclared(DeclaredType t, Void p) {
TypeElement te = asTypeElement(t);
return fullyQualified
@@ -1357,27 +1355,27 @@
: getSimpleName(te);
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitExecutable(ExecutableType t, Void p) {
return t.toString();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitPrimitive(PrimitiveType t, Void p) {
return t.toString();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitTypeVariable(javax.lang.model.type.TypeVariable t, Void p) {
return getSimpleName(t.asElement());
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitWildcard(javax.lang.model.type.WildcardType t, Void p) {
return t.toString();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected String defaultAction(TypeMirror e, Void p) {
return e.toString();
}
@@ -1840,22 +1838,22 @@
*/
public String getQualifiedTypeName(TypeMirror t) {
return new SimpleTypeVisitor9<String, Void>() {
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitDeclared(DeclaredType t, Void p) {
return getFullyQualifiedName(t.asElement());
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitArray(ArrayType t, Void p) {
return visit(t.getComponentType());
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitPrimitive(PrimitiveType t, Void p) {
return t.toString();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitTypeVariable(javax.lang.model.type.TypeVariable t, Void p) {
// The knee jerk reaction is to do this but don't!, as we would like
// it to be compatible with the old world, now if we decide to do so
@@ -1864,7 +1862,7 @@
return t.toString();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected String defaultAction(TypeMirror e, Void p) {
throw new UnsupportedOperationException("should not happen");
}
@@ -1885,19 +1883,16 @@
public String getFullyQualifiedName(Element e, final boolean outer) {
return new SimpleElementVisitor9<String, Void>() {
@Override
- @DefinedBy(Api.LANGUAGE_MODEL)
public String visitPackage(PackageElement e, Void p) {
return e.getQualifiedName().toString();
}
@Override
- @DefinedBy(Api.LANGUAGE_MODEL)
public String visitType(TypeElement e, Void p) {
return e.getQualifiedName().toString();
}
@Override
- @DefinedBy(Api.LANGUAGE_MODEL)
protected String defaultAction(Element e, Void p) {
return outer ? visit(e.getEnclosingElement()) : e.getSimpleName().toString();
}
@@ -2002,15 +1997,15 @@
private String getTypeCode(TypeMirror t) {
return new SimpleTypeVisitor9<String, Void>() {
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitPrimitive(PrimitiveType t, Void p) {
return "P";
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitArray(ArrayType t, Void p) {
return visit(t.getComponentType());
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected String defaultAction(TypeMirror e, Void p) {
return "R";
}
@@ -2049,12 +2044,12 @@
}
boolean hasParameters(Element e) {
return new SimpleElementVisitor9<Boolean, Void>() {
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public Boolean visitExecutable(ExecutableElement e, Void p) {
return true;
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected Boolean defaultAction(Element e, Void p) {
return false;
}
@@ -2072,29 +2067,29 @@
*/
private String getFullyQualifiedName(Element e) {
return new SimpleElementVisitor9<String, Void>() {
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitModule(ModuleElement e, Void p) {
return e.getQualifiedName().toString();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitPackage(PackageElement e, Void p) {
return e.getQualifiedName().toString();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitExecutable(ExecutableElement e, Void p) {
// For backward compatibility
return getFullyQualifiedName(e.getEnclosingElement())
+ "." + e.getSimpleName().toString();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitType(TypeElement e, Void p) {
return e.getQualifiedName().toString();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected String defaultAction(Element e, Void p) {
return getEnclosingTypeElement(e).getQualifiedName().toString()
+ "." + e.getSimpleName().toString();
@@ -2334,13 +2329,13 @@
return elements;
return new SimpleElementVisitor9<List<Element>, Void>() {
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public List<Element> visitPackage(PackageElement e, Void p) {
recursiveGetItems(elements, e, filter, select);
return elements;
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected List<Element> defaultAction(Element e0, Void p) {
return getItems0(e0, filter, select);
}
@@ -2402,12 +2397,12 @@
private String getSimpleName0(Element e) {
if (snvisitor == null) {
snvisitor = new SimpleElementVisitor9<String, Void>() {
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitModule(ModuleElement e, Void p) {
return e.getSimpleName().toString();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitType(TypeElement e, Void p) {
StringBuilder sb = new StringBuilder(e.getSimpleName());
Element enclosed = e.getEnclosingElement();
@@ -2419,7 +2414,7 @@
return sb.toString();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitExecutable(ExecutableElement e, Void p) {
if (e.getKind() == CONSTRUCTOR || e.getKind() == STATIC_INIT) {
return e.getEnclosingElement().getSimpleName().toString();
@@ -2427,7 +2422,7 @@
return e.getSimpleName().toString();
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected String defaultAction(Element e, Void p) {
return e.getSimpleName().toString();
}
@@ -2472,27 +2467,27 @@
* and we should fix this by using getConstantValue and the visitor to
* address this in the future.
*/
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitPrimitiveAsBoolean(PrimitiveType t, Object val) {
return (int)val == 0 ? "false" : "true";
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitPrimitiveAsDouble(PrimitiveType t, Object val) {
return sourceForm(((Double)val), 'd');
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitPrimitiveAsFloat(PrimitiveType t, Object val) {
return sourceForm(((Float)val).doubleValue(), 'f');
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public String visitPrimitiveAsLong(PrimitiveType t, Object val) {
return val + "L";
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected String defaultAction(TypeMirror e, Object val) {
if (val == null)
return null;
@@ -2585,22 +2580,22 @@
public boolean isSpecified(Element e) {
if (specifiedVisitor == null) {
specifiedVisitor = new SimpleElementVisitor9<Boolean, Void>() {
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public Boolean visitModule(ModuleElement e, Void p) {
return configuration.getSpecifiedModules().contains(e);
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public Boolean visitPackage(PackageElement e, Void p) {
return configuration.getSpecifiedPackages().contains(e);
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
public Boolean visitType(TypeElement e, Void p) {
return configuration.getSpecifiedClasses().contains(e);
}
- @Override @DefinedBy(Api.LANGUAGE_MODEL)
+ @Override
protected Boolean defaultAction(Element e, Void p) {
return false;
}