1.1 --- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Thu Mar 03 18:05:52 2011 +0000
1.2 +++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Fri Mar 04 11:33:37 2011 -0800
1.3 @@ -585,7 +585,7 @@
1.4 null, List.<JCTree>nil());
1.5 if (content != null) {
1.6 if (verbose) {
1.7 - printVerbose("parsing.started", filename);
1.8 + log.printVerbose("parsing.started", filename);
1.9 }
1.10 if (taskListener != null) {
1.11 TaskEvent e = new TaskEvent(TaskEvent.Kind.PARSE, filename);
1.12 @@ -594,7 +594,7 @@
1.13 Parser parser = parserFactory.newParser(content, keepComments(), genEndPos, lineDebugInfo);
1.14 tree = parser.parseCompilationUnit();
1.15 if (verbose) {
1.16 - printVerbose("parsing.done", Long.toString(elapsed(msec)));
1.17 + log.printVerbose("parsing.done", Long.toString(elapsed(msec)));
1.18 }
1.19 }
1.20
1.21 @@ -681,7 +681,7 @@
1.22 try {
1.23 new Pretty(out, true).printUnit(env.toplevel, cdef);
1.24 if (verbose)
1.25 - printVerbose("wrote.file", outFile);
1.26 + log.printVerbose("wrote.file", outFile);
1.27 } finally {
1.28 out.close();
1.29 }
1.30 @@ -867,7 +867,7 @@
1.31
1.32 if (verbose) {
1.33 elapsed_msec = elapsed(start_msec);
1.34 - printVerbose("total", Long.toString(elapsed_msec));
1.35 + log.printVerbose("total", Long.toString(elapsed_msec));
1.36 }
1.37
1.38 reportDeferredDiagnostics();
1.39 @@ -1154,7 +1154,7 @@
1.40 if (verboseCompilePolicy)
1.41 printNote("[attribute " + env.enclClass.sym + "]");
1.42 if (verbose)
1.43 - printVerbose("checking.attribution", env.enclClass.sym);
1.44 + log.printVerbose("checking.attribution", env.enclClass.sym);
1.45
1.46 if (taskListener != null) {
1.47 TaskEvent e = new TaskEvent(TaskEvent.Kind.ANALYZE, env.toplevel, env.enclClass.sym);
1.48 @@ -1575,14 +1575,6 @@
1.49 Log.printLines(log.noticeWriter, lines);
1.50 }
1.51
1.52 - /** Output for "-verbose" option.
1.53 - * @param key The key to look up the correct internationalized string.
1.54 - * @param arg An argument for substitution into the output string.
1.55 - */
1.56 - protected void printVerbose(String key, Object arg) {
1.57 - log.printNoteLines("verbose." + key, arg);
1.58 - }
1.59 -
1.60 /** Print numbers of errors and warnings.
1.61 */
1.62 protected void printCount(String kind, int count) {
