1.1 --- a/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java Tue Nov 08 17:06:08 2011 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java Tue Nov 08 17:06:58 2011 -0800
1.3 @@ -25,16 +25,6 @@
1.4
1.5 package com.sun.tools.javac.main;
1.6
1.7 -import com.sun.tools.javac.code.Lint;
1.8 -import com.sun.tools.javac.code.Source;
1.9 -import com.sun.tools.javac.code.Type;
1.10 -import com.sun.tools.javac.jvm.Target;
1.11 -import com.sun.tools.javac.main.JavacOption.HiddenOption;
1.12 -import com.sun.tools.javac.main.JavacOption.Option;
1.13 -import com.sun.tools.javac.main.JavacOption.XOption;
1.14 -import com.sun.tools.javac.util.ListBuffer;
1.15 -import com.sun.tools.javac.util.Options;
1.16 -import com.sun.tools.javac.processing.JavacProcessingEnvironment;
1.17 import java.io.File;
1.18 import java.io.FileWriter;
1.19 import java.io.PrintWriter;
1.20 @@ -44,6 +34,19 @@
1.21 import java.util.Set;
1.22 import javax.lang.model.SourceVersion;
1.23
1.24 +import com.sun.tools.javac.code.Lint;
1.25 +import com.sun.tools.javac.code.Source;
1.26 +import com.sun.tools.javac.code.Type;
1.27 +import com.sun.tools.javac.jvm.Target;
1.28 +import com.sun.tools.javac.main.JavacOption.HiddenOption;
1.29 +import com.sun.tools.javac.main.JavacOption.Option;
1.30 +import com.sun.tools.javac.main.JavacOption.XOption;
1.31 +import com.sun.tools.javac.processing.JavacProcessingEnvironment;
1.32 +import com.sun.tools.javac.util.ListBuffer;
1.33 +import com.sun.tools.javac.util.Log;
1.34 +import com.sun.tools.javac.util.Log.PrefixKind;
1.35 +import com.sun.tools.javac.util.Options;
1.36 +
1.37 import static com.sun.tools.javac.main.OptionName.*;
1.38
1.39 /**
1.40 @@ -79,13 +82,18 @@
1.41 }
1.42
1.43 public static class GrumpyHelper implements OptionHelper {
1.44 + private Log log;
1.45 +
1.46 + public GrumpyHelper(Log log) {
1.47 + this.log = log;
1.48 + }
1.49
1.50 public void setOut(PrintWriter out) {
1.51 throw new IllegalArgumentException();
1.52 }
1.53
1.54 public void error(String key, Object... args) {
1.55 - throw new IllegalArgumentException(Main.getLocalizedString(key, args));
1.56 + throw new IllegalArgumentException(log.localize(PrefixKind.JAVAC, key, args));
1.57 }
1.58
1.59 public void printVersion() {
1.60 @@ -400,9 +408,9 @@
1.61 },
1.62 new Option(A, "opt.arg.key.equals.value","opt.A") {
1.63 @Override
1.64 - String helpSynopsis() {
1.65 + String helpSynopsis(Log log) {
1.66 hasSuffix = true;
1.67 - return super.helpSynopsis();
1.68 + return super.helpSynopsis(log);
1.69 }
1.70
1.71 @Override
1.72 @@ -444,9 +452,9 @@
1.73 // It's actually implemented by the launcher.
1.74 new Option(J, "opt.arg.flag", "opt.J") {
1.75 @Override
1.76 - String helpSynopsis() {
1.77 + String helpSynopsis(Log log) {
1.78 hasSuffix = true;
1.79 - return super.helpSynopsis();
1.80 + return super.helpSynopsis(log);
1.81 }
1.82 @Override
1.83 public boolean process(Options options, String option) {
1.84 @@ -570,9 +578,9 @@
1.85 // It's actually implemented by the CommandLine class.
1.86 new Option(AT, "opt.arg.file", "opt.AT") {
1.87 @Override
1.88 - String helpSynopsis() {
1.89 + String helpSynopsis(Log log) {
1.90 hasSuffix = true;
1.91 - return super.helpSynopsis();
1.92 + return super.helpSynopsis(log);
1.93 }
1.94 @Override
1.95 public boolean process(Options options, String option) {
