langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java

*** 49,68 ****
  import com.sun.tools.javac.comp.Annotate;
  import com.sun.tools.javac.file.JRTIndex;
  import com.sun.tools.javac.file.JavacFileManager;
  import com.sun.tools.javac.jvm.ClassReader;
  import com.sun.tools.javac.jvm.Profile;
  import com.sun.tools.javac.platform.PlatformDescription;
  import com.sun.tools.javac.util.*;
  
  import static javax.tools.StandardLocation.*;
  
  import static com.sun.tools.javac.code.Flags.*;
  import static com.sun.tools.javac.code.Kinds.Kind.*;
  
- import static com.sun.tools.javac.main.Option.*;
- 
  import com.sun.tools.javac.util.Dependencies.CompletionCause;
  
  /**
   *  This class provides operations to locate class definitions
   *  from the source and class files on the paths provided to javac.
--- 49,67 ----
  import com.sun.tools.javac.comp.Annotate;
  import com.sun.tools.javac.file.JRTIndex;
  import com.sun.tools.javac.file.JavacFileManager;
  import com.sun.tools.javac.jvm.ClassReader;
  import com.sun.tools.javac.jvm.Profile;
+ import com.sun.tools.javac.main.Option;
  import com.sun.tools.javac.platform.PlatformDescription;
  import com.sun.tools.javac.util.*;
  
  import static javax.tools.StandardLocation.*;
  
  import static com.sun.tools.javac.code.Flags.*;
  import static com.sun.tools.javac.code.Kinds.Kind.*;
  
  import com.sun.tools.javac.util.Dependencies.CompletionCause;
  
  /**
   *  This class provides operations to locate class definitions
   *  from the source and class files on the paths provided to javac.
*** 198,219 ****
  
          log = Log.instance(context);
          annotate = Annotate.instance(context);
  
          Options options = Options.instance(context);
!         verbose = options.isSet(VERBOSE);
          cacheCompletionFailure = options.isUnset("dev");
          preferSource = "source".equals(options.get("-Xprefer"));
!         userPathsFirst = options.isSet(XXUSERPATHSFIRST);
          allowSigFiles = context.get(PlatformDescription.class) != null;
  
          completionFailureName =
              options.isSet("failcomplete")
              ? names.fromString(options.get("failcomplete"))
              : null;
  
!         moduleOverride = options.isSet(XMODULE) ? names.fromString(options.get(XMODULE))
                                                  : null;
  
          // Temporary, until more info is available from the module system.
          boolean useCtProps;
          JavaFileManager fm = context.get(JavaFileManager.class);
--- 197,218 ----
  
          log = Log.instance(context);
          annotate = Annotate.instance(context);
  
          Options options = Options.instance(context);
!         verbose = options.isSet(Option.VERBOSE);
          cacheCompletionFailure = options.isUnset("dev");
          preferSource = "source".equals(options.get("-Xprefer"));
!         userPathsFirst = options.isSet(Option.XXUSERPATHSFIRST);
          allowSigFiles = context.get(PlatformDescription.class) != null;
  
          completionFailureName =
              options.isSet("failcomplete")
              ? names.fromString(options.get("failcomplete"))
              : null;
  
!         moduleOverride = options.isSet(Option.XMODULE) ? names.fromString(options.get(Option.XMODULE))
                                                  : null;
  
          // Temporary, until more info is available from the module system.
          boolean useCtProps;
          JavaFileManager fm = context.get(JavaFileManager.class);