langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
equal
deleted
inserted
replaced
301 if (conflicts == null || |
301 if (conflicts == null || |
302 (conflicts.size() == 1 && |
302 (conflicts.size() == 1 && |
303 conflicts.contains(s))) { |
303 conflicts.contains(s))) { |
304 List<Name> l = List.nil(); |
304 List<Name> l = List.nil(); |
305 Symbol s2 = s; |
305 Symbol s2 = s; |
306 while (s2.type.getEnclosingType().hasTag(CLASS) |
306 while (s2.type.hasTag(CLASS) && |
307 && s2.owner.kind == Kinds.TYP) { |
307 s2.type.getEnclosingType().hasTag(CLASS) && |
|
308 s2.owner.kind == Kinds.TYP) { |
308 l = l.prepend(s2.getSimpleName()); |
309 l = l.prepend(s2.getSimpleName()); |
309 s2 = s2.owner; |
310 s2 = s2.owner; |
310 } |
311 } |
311 l = l.prepend(s2.getSimpleName()); |
312 l = l.prepend(s2.getSimpleName()); |
312 StringBuilder buf = new StringBuilder(); |
313 StringBuilder buf = new StringBuilder(); |