diff -r 03b276d8e6a6 -r 79b7dee406cc langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java --- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Mon Jul 12 16:37:46 2010 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Tue Jul 13 19:14:09 2010 -0700 @@ -654,9 +654,6 @@ Set annotationsPresent, List topLevelClasses, List packageInfoFiles) { - // Writer for -XprintRounds and -XprintProcessorInfo data - PrintWriter xout = context.get(Log.outKey); - Map unmatchedAnnotations = new HashMap(annotationsPresent.size()); @@ -708,10 +705,10 @@ ps.removeSupportedOptions(unmatchedProcessorOptions); if (printProcessorInfo || verbose) { - xout.println(Log.getLocalizedString("x.print.processor.info", - ps.processor.getClass().getName(), - matchedNames.toString(), - processingResult)); + log.printNoteLines("x.print.processor.info", + ps.processor.getClass().getName(), + matchedNames.toString(), + processingResult); } if (processingResult) { @@ -795,8 +792,6 @@ throws IOException { log = Log.instance(context); - // Writer for -XprintRounds and -XprintProcessorInfo data - PrintWriter xout = context.get(Log.outKey); TaskListener taskListener = context.get(TaskListener.class); JavaCompiler compiler = JavaCompiler.instance(context); @@ -839,7 +834,7 @@ this.context = currentContext; roundNumber++; - printRoundInfo(xout, roundNumber, topLevelClasses, annotationsPresent, false); + printRoundInfo(roundNumber, topLevelClasses, annotationsPresent, false); if (taskListener != null) taskListener.started(new TaskEvent(TaskEvent.Kind.ANNOTATION_PROCESSING_ROUND)); @@ -908,7 +903,7 @@ break runAround; // No new files } } - roots = runLastRound(xout, roundNumber, errorStatus, compiler, roots, taskListener); + roots = runLastRound(roundNumber, errorStatus, compiler, roots, taskListener); // Set error status for any files compiled and generated in // the last round if (log.unrecoverableError) @@ -982,8 +977,7 @@ } // Call the last round of annotation processing - private List runLastRound(PrintWriter xout, - int roundNumber, + private List runLastRound(int roundNumber, boolean errorStatus, JavaCompiler compiler, List roots, @@ -991,7 +985,7 @@ roundNumber++; List noTopLevelClasses = List.nil(); Set noAnnotations = Collections.emptySet(); - printRoundInfo(xout, roundNumber, noTopLevelClasses, noAnnotations, true); + printRoundInfo(roundNumber, noTopLevelClasses, noAnnotations, true); Set emptyRootElements = Collections.emptySet(); // immutable RoundEnvironment renv = new JavacRoundEnvironment(true, @@ -1032,17 +1026,16 @@ } } - private void printRoundInfo(PrintWriter xout, - int roundNumber, + private void printRoundInfo(int roundNumber, List topLevelClasses, Set annotationsPresent, boolean lastRound) { if (printRounds || verbose) { - xout.println(Log.getLocalizedString("x.print.rounds", - roundNumber, - "{" + topLevelClasses.toString(", ") + "}", - annotationsPresent, - lastRound)); + log.printNoteLines("x.print.rounds", + roundNumber, + "{" + topLevelClasses.toString(", ") + "}", + annotationsPresent, + lastRound); } }