langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
equal
deleted
inserted
replaced
286 private void initOldFormat() { |
286 private void initOldFormat() { |
287 initFormats("%f:%l:%_%t%L%m", "%p%L%m", "%f:%_%t%L%m"); |
287 initFormats("%f:%l:%_%t%L%m", "%p%L%m", "%f:%_%t%L%m"); |
288 } |
288 } |
289 |
289 |
290 private void initFormats(String pos, String nopos, String clazz) { |
290 private void initFormats(String pos, String nopos, String clazz) { |
291 availableFormats = new EnumMap<BasicFormatKind, String>(BasicFormatKind.class); |
291 availableFormats = new EnumMap<>(BasicFormatKind.class); |
292 setFormat(BasicFormatKind.DEFAULT_POS_FORMAT, pos); |
292 setFormat(BasicFormatKind.DEFAULT_POS_FORMAT, pos); |
293 setFormat(BasicFormatKind.DEFAULT_NO_POS_FORMAT, nopos); |
293 setFormat(BasicFormatKind.DEFAULT_NO_POS_FORMAT, nopos); |
294 setFormat(BasicFormatKind.DEFAULT_CLASS_FORMAT, clazz); |
294 setFormat(BasicFormatKind.DEFAULT_CLASS_FORMAT, clazz); |
295 } |
295 } |
296 |
296 |
306 setFormat(BasicFormatKind.DEFAULT_POS_FORMAT, formats[0]); |
306 setFormat(BasicFormatKind.DEFAULT_POS_FORMAT, formats[0]); |
307 } |
307 } |
308 } |
308 } |
309 |
309 |
310 private void initIndentation() { |
310 private void initIndentation() { |
311 indentationLevels = new HashMap<DiagnosticPart, Integer>(); |
311 indentationLevels = new HashMap<>(); |
312 setIndentation(DiagnosticPart.SUMMARY, 0); |
312 setIndentation(DiagnosticPart.SUMMARY, 0); |
313 setIndentation(DiagnosticPart.DETAILS, DetailsInc); |
313 setIndentation(DiagnosticPart.DETAILS, DetailsInc); |
314 setIndentation(DiagnosticPart.SUBDIAGNOSTICS, DiagInc); |
314 setIndentation(DiagnosticPart.SUBDIAGNOSTICS, DiagInc); |
315 setIndentation(DiagnosticPart.SOURCE, 0); |
315 setIndentation(DiagnosticPart.SOURCE, 0); |
316 } |
316 } |
366 BOTTOM, |
366 BOTTOM, |
367 /** |
367 /** |
368 * Source line is displayed after the first line of the diagnostic |
368 * Source line is displayed after the first line of the diagnostic |
369 * message |
369 * message |
370 */ |
370 */ |
371 AFTER_SUMMARY; |
371 AFTER_SUMMARY |
372 } |
372 } |
373 |
373 |
374 /** |
374 /** |
375 * Set a metachar string for a specific format |
375 * Set a metachar string for a specific format |
376 * |
376 * |
404 */ |
404 */ |
405 DEFAULT_NO_POS_FORMAT, |
405 DEFAULT_NO_POS_FORMAT, |
406 /** |
406 /** |
407 * A format string to be used for diagnostics regarding classfiles |
407 * A format string to be used for diagnostics regarding classfiles |
408 */ |
408 */ |
409 DEFAULT_CLASS_FORMAT; |
409 DEFAULT_CLASS_FORMAT |
410 } |
410 } |
411 } |
411 } |
412 } |
412 } |