1.1 --- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Mon Dec 12 08:15:32 2011 -0800 1.2 +++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Tue Dec 13 11:21:28 2011 -0800 1.3 @@ -62,7 +62,7 @@ 1.4 import com.sun.tools.javac.util.Log.WriterKind; 1.5 1.6 import static javax.tools.StandardLocation.CLASS_OUTPUT; 1.7 -import static com.sun.tools.javac.main.OptionName.*; 1.8 +import static com.sun.tools.javac.main.Option.*; 1.9 import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*; 1.10 import static com.sun.tools.javac.util.ListBuffer.lb; 1.11 1.12 @@ -817,8 +817,8 @@ 1.13 1.14 // forcibly set the equivalent of -Xlint:-options, so that no further 1.15 // warnings about command line options are generated from this point on 1.16 - options.put(XLINT_CUSTOM + "-" + LintCategory.OPTIONS.option, "true"); 1.17 - options.remove(XLINT_CUSTOM + LintCategory.OPTIONS.option); 1.18 + options.put(XLINT_CUSTOM.text + "-" + LintCategory.OPTIONS.option, "true"); 1.19 + options.remove(XLINT_CUSTOM.text + LintCategory.OPTIONS.option); 1.20 1.21 start_msec = now(); 1.22