1.1 --- a/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Fri Sep 12 23:32:51 2008 -0700
1.2 +++ b/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Tue Sep 16 18:35:18 2008 -0700
1.3 @@ -25,8 +25,6 @@
1.4
1.5 package com.sun.tools.javadoc;
1.6
1.7 -import java.util.*;
1.8 -
1.9 import com.sun.javadoc.*;
1.10
1.11 import static com.sun.javadoc.LanguageVersion.*;
1.12 @@ -40,7 +38,6 @@
1.13 import com.sun.tools.javac.code.Kinds;
1.14 import com.sun.tools.javac.code.TypeTags;
1.15 import com.sun.tools.javac.code.Type;
1.16 -import com.sun.tools.javac.code.Types;
1.17 import com.sun.tools.javac.code.Type.ClassType;
1.18 import com.sun.tools.javac.code.Scope;
1.19 import com.sun.tools.javac.code.Symbol;
1.20 @@ -55,9 +52,9 @@
1.21 import com.sun.tools.javac.tree.JCTree.JCClassDecl;
1.22 import com.sun.tools.javac.tree.TreeInfo;
1.23
1.24 +import com.sun.tools.javac.util.Names;
1.25 import static com.sun.tools.javac.code.Flags.*;
1.26 import static com.sun.tools.javac.code.Kinds.*;
1.27 -import static com.sun.tools.javac.code.TypeTags.*;
1.28
1.29 import java.io.File;
1.30 import java.util.Set;
1.31 @@ -549,7 +546,7 @@
1.32 * methods in this class. Does not include constructors.
1.33 */
1.34 public MethodDoc[] methods(boolean filter) {
1.35 - Name.Table names = tsym.name.table;
1.36 + Names names = tsym.name.table.names;
1.37 List<MethodDocImpl> methods = List.nil();
1.38 for (Scope.Entry e = tsym.members().elems; e != null; e = e.sibling) {
1.39 if (e.sym != null &&
1.40 @@ -582,7 +579,7 @@
1.41 * constructors in this class.
1.42 */
1.43 public ConstructorDoc[] constructors(boolean filter) {
1.44 - Name.Table names = tsym.name.table;
1.45 + Names names = tsym.name.table.names;
1.46 List<ConstructorDocImpl> constructors = List.nil();
1.47 for (Scope.Entry e = tsym.members().elems; e != null; e = e.sibling) {
1.48 if (e.sym != null &&
1.49 @@ -696,7 +693,7 @@
1.50 }
1.51
1.52 private ClassDoc searchClass(String className) {
1.53 - Name.Table names = tsym.name.table;
1.54 + Names names = tsym.name.table.names;
1.55
1.56 // search by qualified name first
1.57 ClassDoc cd = env.lookupClass(className);
1.58 @@ -848,7 +845,7 @@
1.59 *---------------------------------*/
1.60
1.61 // search current class
1.62 - Name.Table names = tsym.name.table;
1.63 + Names names = tsym.name.table.names;
1.64 Scope.Entry e = tsym.members().lookup(names.fromString(methodName));
1.65
1.66 //### Using modifier filter here isn't really correct,
1.67 @@ -936,7 +933,7 @@
1.68 */
1.69 public ConstructorDoc findConstructor(String constrName,
1.70 String[] paramTypes) {
1.71 - Name.Table names = tsym.name.table;
1.72 + Names names = tsym.name.table.names;
1.73 for (Scope.Entry e = tsym.members().lookup(names.fromString("<init>")); e.scope != null; e = e.next()) {
1.74 if (e.sym.kind == Kinds.MTH) {
1.75 if (hasParameterTypes((MethodSymbol)e.sym, paramTypes)) {
1.76 @@ -973,7 +970,7 @@
1.77 }
1.78
1.79 private FieldDocImpl searchField(String fieldName, Set<ClassDocImpl> searched) {
1.80 - Name.Table names = tsym.name.table;
1.81 + Names names = tsym.name.table.names;
1.82 if (searched.contains(this)) {
1.83 return null;
1.84 }
1.85 @@ -1040,7 +1037,7 @@
1.86 Env<AttrContext> compenv = env.enter.getEnv(tsym);
1.87 if (compenv == null) return new ClassDocImpl[0];
1.88
1.89 - Name asterisk = tsym.name.table.asterisk;
1.90 + Name asterisk = tsym.name.table.names.asterisk;
1.91 for (JCTree t : compenv.toplevel.defs) {
1.92 if (t.getTag() == JCTree.IMPORT) {
1.93 JCTree imp = ((JCImport) t).qualid;
1.94 @@ -1076,7 +1073,7 @@
1.95 ListBuffer<PackageDocImpl> importedPackages = new ListBuffer<PackageDocImpl>();
1.96
1.97 //### Add the implicit "import java.lang.*" to the result
1.98 - Name.Table names = tsym.name.table;
1.99 + Names names = tsym.name.table.names;
1.100 importedPackages.append(env.getPackageDoc(env.reader.enterPackage(names.java_lang)));
1.101
1.102 Env<AttrContext> compenv = env.enter.getEnv(tsym);
