equal
deleted
inserted
replaced
61 boolean errToClassDoc, boolean considerAnnotations) { |
61 boolean errToClassDoc, boolean considerAnnotations) { |
62 if (env.legacyDoclet) { |
62 if (env.legacyDoclet) { |
63 t = env.types.erasure(t); |
63 t = env.types.erasure(t); |
64 } |
64 } |
65 |
65 |
66 if (considerAnnotations && |
66 if (considerAnnotations && t.isAnnotated()) { |
67 t.isAnnotated()) { |
67 return new AnnotatedTypeImpl(env, t); |
68 Type.AnnotatedType at = (Type.AnnotatedType) t; |
|
69 return new AnnotatedTypeImpl(env, at); |
|
70 } |
68 } |
71 |
69 |
72 switch (t.getTag()) { |
70 switch (t.getTag()) { |
73 case CLASS: |
71 case CLASS: |
74 if (ClassDocImpl.isGeneric((ClassSymbol)t.tsym)) { |
72 if (ClassDocImpl.isGeneric((ClassSymbol)t.tsym)) { |
141 * Class names are qualified if "full" is true. |
139 * Class names are qualified if "full" is true. |
142 */ |
140 */ |
143 static String getTypeString(DocEnv env, Type t, boolean full) { |
141 static String getTypeString(DocEnv env, Type t, boolean full) { |
144 // TODO: should annotations be included here? |
142 // TODO: should annotations be included here? |
145 if (t.isAnnotated()) { |
143 if (t.isAnnotated()) { |
146 Type.AnnotatedType at = (Type.AnnotatedType)t; |
144 t = t.unannotatedType(); |
147 t = at.underlyingType; |
|
148 } |
145 } |
149 switch (t.getTag()) { |
146 switch (t.getTag()) { |
150 case ARRAY: |
147 case ARRAY: |
151 StringBuilder s = new StringBuilder(); |
148 StringBuilder s = new StringBuilder(); |
152 while (t.hasTag(ARRAY)) { |
149 while (t.hasTag(ARRAY)) { |