langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
equal
deleted
inserted
replaced
286 nameClashes.put(n, conflicts.append(sym)); |
286 nameClashes.put(n, conflicts.append(sym)); |
287 } |
287 } |
288 |
288 |
289 public String simplify(Symbol s) { |
289 public String simplify(Symbol s) { |
290 String name = s.getQualifiedName().toString(); |
290 String name = s.getQualifiedName().toString(); |
291 if (!s.type.isCompound()) { |
291 if (!s.type.isCompound() && !s.type.isPrimitive()) { |
292 List<Symbol> conflicts = nameClashes.get(s.getSimpleName()); |
292 List<Symbol> conflicts = nameClashes.get(s.getSimpleName()); |
293 if (conflicts == null || |
293 if (conflicts == null || |
294 (conflicts.size() == 1 && |
294 (conflicts.size() == 1 && |
295 conflicts.contains(s))) { |
295 conflicts.contains(s))) { |
296 List<Name> l = List.nil(); |
296 List<Name> l = List.nil(); |