--- a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java Tue Jul 08 18:26:34 2014 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java Wed Jul 09 16:32:05 2014 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -29,10 +29,12 @@
import com.sun.source.util.TreePath;
import com.sun.tools.javac.code.Kinds;
-import com.sun.tools.javac.code.Scope;
+import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.util.List;
+import static com.sun.tools.javac.code.Scope.LookupKind.NON_RECURSIVE;
+
/**
* Represents an annotation type.
*
@@ -91,9 +93,9 @@
*/
public AnnotationTypeElementDoc[] elements() {
List<AnnotationTypeElementDoc> elements = List.nil();
- for (Scope.Entry e = tsym.members().elems; e != null; e = e.sibling) {
- if (e.sym != null && e.sym.kind == Kinds.MTH) {
- MethodSymbol s = (MethodSymbol)e.sym;
+ for (Symbol sym : tsym.members().getSymbols(NON_RECURSIVE)) {
+ if (sym != null && sym.kind == Kinds.MTH) {
+ MethodSymbol s = (MethodSymbol)sym;
elements = elements.prepend(env.getAnnotationTypeElementDoc(s));
}
}