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

-:d2aaaec153e8
+:7b413ac1a720
 */
 package com.sun.tools.javac.main;
 import java.io.*;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.MissingResourceException;
+import java.util.Queue;
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.annotation.processing.Processor;
+import javax.lang.model.SourceVersion;
 import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject;
 import javax.tools.DiagnosticListener;
-import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.source.util.TaskEvent;
 import com.sun.source.util.TaskListener;
+import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.tree.*;
+import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.parser.*;
 import com.sun.tools.javac.comp.*;
 import com.sun.tools.javac.jvm.*;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.processing.*;
-import javax.annotation.processing.Processor;
 import static javax.tools.StandardLocation.CLASS_OUTPUT;
+import static com.sun.tools.javac.main.OptionName.*;
 import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*;
 import static com.sun.tools.javac.util.ListBuffer.lb;
-import java.util.HashMap;
-import java.util.Queue;
-import javax.lang.model.SourceVersion;
 /** This class could be the main entry point for GJC when GJC is used as a
 *  component in a larger software system. It provides operations to
 *  construct a new compiler, and to run a new compiler on a set of source
 *  files.
 reader.sourceCompleter = this;
 Options options = Options.instance(context);
-verbose       = options.get("-verbose")       != null;
+verbose       = options.isSet(VERBOSE);
-sourceOutput  = options.get("-printsource")   != null; // used to be -s
+sourceOutput  = options.isSet(PRINTSOURCE); // used to be -s
-stubOutput    = options.get("-stubs")         != null;
+stubOutput    = options.isSet("-stubs");
-relax         = options.get("-relax")         != null;
+relax         = options.isSet("-relax");
-printFlat     = options.get("-printflat")     != null;
+printFlat     = options.isSet("-printflat");
-attrParseOnly = options.get("-attrparseonly") != null;
+attrParseOnly = options.isSet("-attrparseonly");
-encoding      = options.get("-encoding");
+encoding      = options.get(ENCODING);
-lineDebugInfo = options.get("-g:")            == null ||
+lineDebugInfo = options.isUnset(G_CUSTOM) ||
-options.get("-g:lines")       != null;
+options.isSet(G_CUSTOM, "lines");
-genEndPos     = options.get("-Xjcov")         != null ||
+genEndPos     = options.isSet(XJCOV) ||
 context.get(DiagnosticListener.class) != null;
-devVerbose    = options.get("dev") != null;
+devVerbose    = options.isSet("dev");
-processPcks   = options.get("process.packages") != null;
+processPcks   = options.isSet("process.packages");
-werror        = options.get("-Werror")        != null;
+werror        = options.isSet(WERROR);
-verboseCompilePolicy = options.get("verboseCompilePolicy") != null;
+verboseCompilePolicy = options.isSet("verboseCompilePolicy");
 if (attrParseOnly)
 compilePolicy = CompilePolicy.ATTR_ONLY;
 else
 compilePolicy = CompilePolicy.decode(options.get("compilePolicy"));
 implicitSourcePolicy = ImplicitSourcePolicy.decode(options.get("-implicit"));
 completionFailureName =
-(options.get("failcomplete") != null)
+options.isSet("failcomplete")
 ? names.fromString(options.get("failcomplete"))
 : null;
 shouldStopPolicy =
-(options.get("shouldStopPolicy") != null)
+options.isSet("shouldStopPolicy")
 ? CompileState.valueOf(options.get("shouldStopPolicy"))
 : null;
-if (options.get("oldDiags") == null)
+if (options.isUnset("oldDiags"))
 log.setDiagnosticFormatter(RichDiagnosticFormatter.instance(context));
 }
 /* Switches:
 */
 */
 public void initProcessAnnotations(Iterable<? extends Processor> processors) {
 // Process annotations if processing is not disabled and there
 // is at least one Processor available.
 Options options = Options.instance(context);
-if (options.get("-proc:none") != null) {
+if (options.isSet(PROC, "none")) {
 processAnnotations = false;
 } else if (procEnvImpl == null) {
 procEnvImpl = new JavacProcessingEnvironment(context, processors);
 processAnnotations = procEnvImpl.atLeastOneProcessor();
 if (!processAnnotations) {
 // If there are no annotation processors present, and
 // annotation processing is to occur with compilation,
 // emit a warning.
 Options options = Options.instance(context);
-if (options.get("-proc:only") != null) {
+if (options.isSet(PROC, "only")) {
 log.warning("proc.proc-only.requested.no.procs");
 todo.clear();
 }
 // If not processing annotations, classnames must be empty
 if (!classnames.isEmpty()) {
 boolean explicitAnnotationProcessingRequested() {
 Options options = Options.instance(context);
 return
 explicitAnnotationProcessingRequested ||
-options.get("-processor") != null ||
+options.isSet(PROCESSOR) ||
-options.get("-processorpath") != null ||
+options.isSet(PROCESSORPATH) ||
-options.get("-proc:only") != null ||
+options.isSet(PROC, "only") ||
-options.get("-Xprint") != null;
+options.isSet(XPRINT);
 }
 /**
 * Attribute a list of parse trees, such as found on the "todo" list.
 * Note that attributing classes may cause additional files to be

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

comparison: src/share/classes/com/sun/tools/javac/main/JavaCompiler.java

src/share/classes/com/sun/tools/javac/main/JavaCompiler.java