1.1 --- a/src/share/classes/com/sun/tools/apt/main/Main.java Tue Nov 08 17:06:08 2011 -0800
1.2 +++ b/src/share/classes/com/sun/tools/apt/main/Main.java Tue Nov 08 17:06:58 2011 -0800
1.3 @@ -205,7 +205,7 @@
1.4 String s = " " + helpSynopsis();
1.5 out.print(s);
1.6 for (int j = s.length(); j < 29; j++) out.print(" ");
1.7 - Bark.printLines(out, getLocalizedString(descrKey));
1.8 + Bark.printRawLines(out, getLocalizedString(descrKey));
1.9 }
1.10
1.11 }
1.12 @@ -227,7 +227,7 @@
1.13 String s = " " + helpSynopsis();
1.14 out.print(s);
1.15 for (int j = s.length(); j < 29; j++) out.print(" ");
1.16 - Bark.printLines(out, getLocalizedString(descrKey));
1.17 + Bark.printRawLines(out, getLocalizedString(descrKey));
1.18 }
1.19
1.20 }
1.21 @@ -259,7 +259,7 @@
1.22 String s = " " + helpSynopsis();
1.23 out.print(s);
1.24 for (int j = s.length(); j < 29; j++) out.print(" ");
1.25 - Log.printLines(out, getLocalizedString(descrKey));
1.26 + Log.printRawLines(out, getLocalizedString(descrKey));
1.27 }
1.28 };
1.29
1.30 @@ -421,7 +421,7 @@
1.31 },
1.32 new AptOption("-version", "opt.version") {
1.33 boolean process(String option) {
1.34 - Bark.printLines(out, ownName + " " + AptJavaCompiler.version());
1.35 + Bark.printRawLines(out, ownName + " " + AptJavaCompiler.version());
1.36 return super.process(option);
1.37 }
1.38 },
1.39 @@ -660,11 +660,11 @@
1.40 /** Print a string that explains usage.
1.41 */
1.42 void help() {
1.43 - Bark.printLines(out, getLocalizedString("msg.usage.header", ownName));
1.44 + Bark.printRawLines(out, getLocalizedString("msg.usage.header", ownName));
1.45 for (int i=0; i < recognizedOptions.length; i++) {
1.46 recognizedOptions[i].help();
1.47 }
1.48 - Bark.printLines(out, getLocalizedString("msg.usage.footer"));
1.49 + Bark.printRawLines(out, getLocalizedString("msg.usage.footer"));
1.50 out.println();
1.51 }
1.52
1.53 @@ -675,7 +675,7 @@
1.54 recognizedOptions[i].xhelp();
1.55 }
1.56 out.println();
1.57 - Bark.printLines(out, getLocalizedString("msg.usage.nonstandard.footer"));
1.58 + Bark.printRawLines(out, getLocalizedString("msg.usage.nonstandard.footer"));
1.59 }
1.60
1.61 /** Report a usage error.
1.62 @@ -688,7 +688,7 @@
1.63 /** Report a warning.
1.64 */
1.65 void warning(String key, Object... args) {
1.66 - Bark.printLines(out, ownName + ": "
1.67 + Bark.printRawLines(out, ownName + ": "
1.68 + getLocalizedString(key, args));
1.69 }
1.70
1.71 @@ -796,7 +796,7 @@
1.72 origFilenames = processArgs((args=CommandLine.parse(args)));
1.73
1.74 if (options.get("suppress-tool-api-removal-message") == null) {
1.75 - Bark.printLines(out, getLocalizedString("misc.Deprecation"));
1.76 + Bark.printRawLines(out, getLocalizedString("misc.Deprecation"));
1.77 }
1.78
1.79 if (origFilenames == null) {
1.80 @@ -808,7 +808,7 @@
1.81 return EXIT_OK;
1.82 }
1.83 } catch (java.io.FileNotFoundException e) {
1.84 - Bark.printLines(out, ownName + ": " +
1.85 + Bark.printRawLines(out, ownName + ": " +
1.86 getLocalizedString("err.file.not.found",
1.87 e.getMessage()));
1.88 return EXIT_SYSERR;
1.89 @@ -1183,7 +1183,7 @@
1.90 /** Print a message reporting an internal error.
1.91 */
1.92 void bugMessage(Throwable ex) {
1.93 - Bark.printLines(out, getLocalizedString("msg.bug",
1.94 + Bark.printRawLines(out, getLocalizedString("msg.bug",
1.95 AptJavaCompiler.version()));
1.96 ex.printStackTrace(out);
1.97 }
1.98 @@ -1191,34 +1191,34 @@
1.99 /** Print a message reporting an fatal error.
1.100 */
1.101 void apMessage(AnnotationProcessingError ex) {
1.102 - Bark.printLines(out, getLocalizedString("misc.Problem"));
1.103 + Bark.printRawLines(out, getLocalizedString("misc.Problem"));
1.104 ex.getCause().printStackTrace(out);
1.105 }
1.106
1.107 /** Print a message about sun.misc.Service problem.
1.108 */
1.109 void sceMessage(sun.misc.ServiceConfigurationError ex) {
1.110 - Bark.printLines(out, getLocalizedString("misc.SunMiscService"));
1.111 + Bark.printRawLines(out, getLocalizedString("misc.SunMiscService"));
1.112 ex.printStackTrace(out);
1.113 }
1.114
1.115 /** Print a message reporting an fatal error.
1.116 */
1.117 void feMessage(Throwable ex) {
1.118 - Bark.printLines(out, ex.toString());
1.119 + Bark.printRawLines(out, ex.toString());
1.120 }
1.121
1.122 /** Print a message reporting an input/output error.
1.123 */
1.124 void ioMessage(Throwable ex) {
1.125 - Bark.printLines(out, getLocalizedString("msg.io"));
1.126 + Bark.printRawLines(out, getLocalizedString("msg.io"));
1.127 ex.printStackTrace(out);
1.128 }
1.129
1.130 /** Print a message reporting an out-of-resources error.
1.131 */
1.132 void resourceMessage(Throwable ex) {
1.133 - Bark.printLines(out, getLocalizedString("msg.resource"));
1.134 + Bark.printRawLines(out, getLocalizedString("msg.resource"));
1.135 ex.printStackTrace(out);
1.136 }
1.137
