Mercurial > jdk8-mips64-public > langtools / file comparison
comparison: src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
- changeset 240
- 8c55d5b0ed71
- parent 229
- 03bcd66bd8e7
- parent 238
- 86b60aa941c6
- child 288
- d402db1005ad
equal
deleted
inserted
replaced
| 230:2c0076945b1a | 240:8c55d5b0ed71 |
|---|---|
| 52 DiagnosticPart.DETAILS, | 52 DiagnosticPart.DETAILS, |
| 53 DiagnosticPart.SUBDIAGNOSTICS))); | 53 DiagnosticPart.SUBDIAGNOSTICS))); |
| 54 } | 54 } |
| 55 | 55 |
| 56 //provide common default formats | 56 //provide common default formats |
| 57 public String format(JCDiagnostic d, Locale l) { | 57 public String formatDiagnostic(JCDiagnostic d, Locale l) { |
| 58 try { | 58 try { |
| 59 StringBuffer buf = new StringBuffer(); | 59 StringBuffer buf = new StringBuffer(); |
| 60 if (d.getPosition() != Position.NOPOS) { | 60 if (d.getPosition() != Position.NOPOS) { |
| 61 buf.append(formatSource(d, false, null)); | 61 buf.append(formatSource(d, false, null)); |
| 62 buf.append(':'); | 62 buf.append(':'); |
| 80 } | 80 } |
| 81 | 81 |
| 82 public String formatMessage(JCDiagnostic d, Locale l) { | 82 public String formatMessage(JCDiagnostic d, Locale l) { |
| 83 StringBuilder buf = new StringBuilder(); | 83 StringBuilder buf = new StringBuilder(); |
| 84 Collection<String> args = formatArguments(d, l); | 84 Collection<String> args = formatArguments(d, l); |
| 85 buf.append(d.getCode()); | 85 buf.append(localize(null, d.getCode(), args.toArray())); |
| 86 String sep = ": "; | |
| 87 for (Object o : args) { | |
| 88 buf.append(sep); | |
| 89 buf.append(o); | |
| 90 sep = ", "; | |
| 91 } | |
| 92 if (d.isMultiline() && getConfiguration().getVisible().contains(DiagnosticPart.SUBDIAGNOSTICS)) { | 86 if (d.isMultiline() && getConfiguration().getVisible().contains(DiagnosticPart.SUBDIAGNOSTICS)) { |
| 93 List<String> subDiags = formatSubdiagnostics(d, null); | 87 List<String> subDiags = formatSubdiagnostics(d, null); |
| 94 if (subDiags.nonEmpty()) { | 88 if (subDiags.nonEmpty()) { |
| 95 sep = ""; | 89 String sep = ""; |
| 96 buf.append(",{"); | 90 buf.append(",{"); |
| 97 for (String sub : formatSubdiagnostics(d, null)) { | 91 for (String sub : formatSubdiagnostics(d, null)) { |
| 98 buf.append(sep); | 92 buf.append(sep); |
| 99 buf.append("(" + sub + ")"); | 93 buf.append("(" + sub + ")"); |
| 100 sep = ","; | 94 sep = ","; |
| 115 if (arg instanceof JCDiagnostic) | 109 if (arg instanceof JCDiagnostic) |
| 116 return "(" + s + ")"; | 110 return "(" + s + ")"; |
| 117 else | 111 else |
| 118 return s; | 112 return s; |
| 119 } | 113 } |
| 114 | |
| 115 @Override | |
| 116 protected String localize(Locale l, String key, Object... args) { | |
| 117 StringBuilder buf = new StringBuilder(); | |
| 118 buf.append(key); | |
| 119 String sep = ": "; | |
| 120 for (Object o : args) { | |
| 121 buf.append(sep); | |
| 122 buf.append(o); | |
| 123 sep = ", "; | |
| 124 } | |
| 125 return buf.toString(); | |
| 126 } | |
| 120 } | 127 } |
