jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/api/JavacTool.java

-:4822dfe0922b
+:3809292620c9
 * questions.
 */
 package com.sun.tools.javac.api;
-import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.Writer;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import javax.lang.model.SourceVersion;
 import javax.tools.*;
 import com.sun.source.util.JavacTask;
 import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.main.JavacOption.OptionKind;
-import com.sun.tools.javac.main.JavacOption;
 import com.sun.tools.javac.main.Main;
-import com.sun.tools.javac.main.RecognizedOptions.GrumpyHelper;
+import com.sun.tools.javac.main.Option;
-import com.sun.tools.javac.main.RecognizedOptions;
+import com.sun.tools.javac.main.OptionHelper;
+import com.sun.tools.javac.main.OptionHelper.GrumpyHelper;
 import com.sun.tools.javac.util.ClientCodeException;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Log.PrefixKind;
 import com.sun.tools.javac.util.Options;
-import com.sun.tools.javac.util.Pair;
 /**
 * TODO: describe com.sun.tools.javac.api.Tool
 *
 * <p><b>This is NOT part of any supported API.
 * or deletion without notice.</b></p>
 *
 * @author Peter von der Ah\u00e9
 */
 public final class JavacTool implements JavaCompiler {
-private final List<Pair<String,String>> options
-= new ArrayList<Pair<String,String>>();
-private final Context dummyContext = new Context();
-private final PrintWriter silent = new PrintWriter(new OutputStream(){
-public void write(int b) {}
-});
-private final Main sharedCompiler = new Main("javac", silent);
-{
-sharedCompiler.setOptions(Options.instance(dummyContext));
-}
 /**
-* Constructor used by service provider mechanism.  The correct way to
+* Constructor used by service provider mechanism.  The recommended way to
-* obtain an instance of this class is using create or the service provider
+* obtain an instance of this class is by using {@link #create} or the
-* mechanism.
+* service provider mechanism.
 * @see javax.tools.JavaCompilerTool
 * @see javax.tools.ToolProvider
 * @see #create
 */
 @Deprecated
 * Static factory method for creating new instances of this tool.
 * @return new instance of this tool
 */
 public static JavacTool create() {
 return new JavacTool();
-}
-private String argsToString(Object... args) {
-String newArgs = null;
-if (args.length > 0) {
-StringBuilder sb = new StringBuilder();
-String separator = "";
-for (Object arg : args) {
-sb.append(separator).append(arg.toString());
-separator = File.pathSeparator;
-}
-newArgs = sb.toString();
-}
-return newArgs;
-}
-private void setOption1(String name, OptionKind kind, Object... args) {
-String arg = argsToString(args);
-JavacOption option = sharedCompiler.getOption(name);
-if (option == null || !match(kind, option.getKind()))
-throw new IllegalArgumentException(name);
-if ((args.length != 0) != option.hasArg())
-throw new IllegalArgumentException(name);
-if (option.hasArg()) {
-if (option.process(null, name, arg)) // FIXME
-throw new IllegalArgumentException(name);
-} else {
-if (option.process(null, name)) // FIXME
-throw new IllegalArgumentException(name);
-}
-options.add(new Pair<String,String>(name,arg));
-}
-public void setOption(String name, Object... args) {
-setOption1(name, OptionKind.NORMAL, args);
-}
-public void setExtendedOption(String name, Object... args)  {
-setOption1(name, OptionKind.EXTENDED, args);
-}
-private static boolean match(OptionKind clientKind, OptionKind optionKind) {
-return (clientKind == (optionKind == OptionKind.HIDDEN ? OptionKind.EXTENDED : optionKind));
 }
 public JavacFileManager getStandardFileManager(
 DiagnosticListener<? super JavaFileObject> diagnosticListener,
 Locale locale,
 context.put(Log.outKey, new PrintWriter(out, true));
 if (fileManager == null)
 fileManager = getStandardFileManager(diagnosticListener, null, null);
 fileManager = ccw.wrap(fileManager);
 context.put(JavaFileManager.class, fileManager);
 processOptions(context, fileManager, options);
 Main compiler = new Main("javacTask", context.get(Log.outKey));
 return new JavacTaskImpl(compiler, options, context, classes, compilationUnits);
 } catch (ClientCodeException ex) {
 throw new RuntimeException(ex.getCause());
 Iterable<String> options)
 {
 if (options == null)
 return;
-Options optionTable = Options.instance(context);
+final Options optionTable = Options.instance(context);
 Log log = Log.instance(context);
-JavacOption[] recognizedOptions =
+Option[] recognizedOptions =
-RecognizedOptions.getJavacToolOptions(new GrumpyHelper(log));
+Option.getJavacToolOptions().toArray(new Option[0]);
+OptionHelper optionHelper = new GrumpyHelper(log) {
+@Override
+public String get(Option option) {
+return optionTable.get(option.getText());
+}
+@Override
+public void put(String name, String value) {
+optionTable.put(name, value);
+}
+@Override
+public void remove(String name) {
+optionTable.remove(name);
+}
+};
 Iterator<String> flags = options.iterator();
 while (flags.hasNext()) {
 String flag = flags.next();
 int j;
 for (j=0; j<recognizedOptions.length; j++)
 String msg = log.localize(PrefixKind.JAVAC, "err.invalid.flag", flag);
 throw new IllegalArgumentException(msg);
 }
 }
-JavacOption option = recognizedOptions[j];
+Option option = recognizedOptions[j];
 if (option.hasArg()) {
 if (!flags.hasNext()) {
 String msg = log.localize(PrefixKind.JAVAC, "err.req.arg", flag);
 throw new IllegalArgumentException(msg);
 }
 String operand = flags.next();
-if (option.process(optionTable, flag, operand))
+if (option.process(optionHelper, flag, operand))
 // should not happen as the GrumpyHelper will throw exceptions
 // in case of errors
 throw new IllegalArgumentException(flag + " " + operand);
 } else {
-if (option.process(optionTable, flag))
+if (option.process(optionHelper, flag))
 // should not happen as the GrumpyHelper will throw exceptions
 // in case of errors
 throw new IllegalArgumentException(flag);
 }
 }
 return Collections.unmodifiableSet(EnumSet.range(SourceVersion.RELEASE_3,
 SourceVersion.latest()));
 }
 public int isSupportedOption(String option) {
-JavacOption[] recognizedOptions =
+Set<Option> recognizedOptions = Option.getJavacToolOptions();
-RecognizedOptions.getJavacToolOptions(new GrumpyHelper(null));
+for (Option o : recognizedOptions) {
-for (JavacOption o : recognizedOptions) {
 if (o.matches(option))
 return o.hasArg() ? 1 : 0;
 }
 return -1;
 }

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/javac/api/JavacTool.java

src/share/classes/com/sun/tools/javac/api/JavacTool.java