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

-:01c9d4161882
+:c0f0c41cafa0
 * Source level of the compile.
 */
 Source source;
 private ClassLoader processorClassLoader;
+private SecurityException processorClassLoaderException;
 /**
 * JavacMessages object used for localization
 */
 private JavacMessages messages;
 private MultiTaskListener taskListener;
 private Context context;
-public JavacProcessingEnvironment(Context context, Iterable<? extends Processor> processors) {
+/** Get the JavacProcessingEnvironment instance for this context. */
+public static JavacProcessingEnvironment instance(Context context) {
+JavacProcessingEnvironment instance = context.get(JavacProcessingEnvironment.class);
+if (instance == null)
+instance = new JavacProcessingEnvironment(context);
+return instance;
+}
+protected JavacProcessingEnvironment(Context context) {
 this.context = context;
 log = Log.instance(context);
 source = Source.instance(context);
 diags = JCDiagnostic.Factory.instance(context);
 options = Options.instance(context);
 typeUtils = JavacTypes.instance(context);
 processorOptions = initProcessorOptions(context);
 unmatchedProcessorOptions = initUnmatchedProcessorOptions();
 messages = JavacMessages.instance(context);
 taskListener = MultiTaskListener.instance(context);
+initProcessorClassLoader();
+}
+public void setProcessors(Iterable<? extends Processor> processors) {
+Assert.checkNull(discoveredProcs);
 initProcessorIterator(context, processors);
 }
 private Set<String> initPlatformAnnotations() {
 Set<String> platformAnnotations = new HashSet<String>();
 platformAnnotations.add("java.lang.annotation.Retention");
 platformAnnotations.add("java.lang.annotation.Target");
 return Collections.unmodifiableSet(platformAnnotations);
 }
+private void initProcessorClassLoader() {
+JavaFileManager fileManager = context.get(JavaFileManager.class);
+try {
+// If processorpath is not explicitly set, use the classpath.
+processorClassLoader = fileManager.hasLocation(ANNOTATION_PROCESSOR_PATH)
+? fileManager.getClassLoader(ANNOTATION_PROCESSOR_PATH)
+: fileManager.getClassLoader(CLASS_PATH);
+if (processorClassLoader != null && processorClassLoader instanceof Closeable) {
+JavaCompiler compiler = JavaCompiler.instance(context);
+compiler.closeables = compiler.closeables.prepend((Closeable) processorClassLoader);
+}
+} catch (SecurityException e) {
+processorClassLoaderException = e;
+}
+}
 private void initProcessorIterator(Context context, Iterable<? extends Processor> processors) {
 Log   log   = Log.instance(context);
 Iterator<? extends Processor> processorIterator;
 if (options.isSet(XPRINT)) {
 }
 } else if (processors != null) {
 processorIterator = processors.iterator();
 } else {
 String processorNames = options.get(PROCESSOR);
-JavaFileManager fileManager = context.get(JavaFileManager.class);
+if (processorClassLoaderException == null) {
-try {
-// If processorpath is not explicitly set, use the classpath.
-processorClassLoader = fileManager.hasLocation(ANNOTATION_PROCESSOR_PATH)
-? fileManager.getClassLoader(ANNOTATION_PROCESSOR_PATH)
-: fileManager.getClassLoader(CLASS_PATH);
-if (processorClassLoader != null && processorClassLoader instanceof Closeable) {
-JavaCompiler compiler = JavaCompiler.instance(context);
-compiler.closeables = compiler.closeables.prepend((Closeable) processorClassLoader);
-}
 /*
 * If the "-processor" option is used, search the appropriate
 * path for the named class.  Otherwise, use a service
 * provider mechanism to create the processor iterator.
 */
 if (processorNames != null) {
 processorIterator = new NameProcessIterator(processorNames, processorClassLoader, log);
 } else {
 processorIterator = new ServiceIterator(processorClassLoader, log);
 }
-} catch (SecurityException e) {
+} else {
 /*
 * A security exception will occur if we can't create a classloader.
 * Ignore the exception if, with hindsight, we didn't need it anyway
 * (i.e. no processor was specified either explicitly, or implicitly,
 * in service configuration file.) Otherwise, we cannot continue.
 */
-processorIterator = handleServiceLoaderUnavailability("proc.cant.create.loader", e);
+processorIterator = handleServiceLoaderUnavailability("proc.cant.create.loader",
+processorClassLoaderException);
 }
 }
 discoveredProcs = new DiscoveredProcessors(processorIterator);
 }
 return Pattern.compile(s_prime);
 }
 }
 /**
-* For internal use only.  This method will be
+* For internal use only.  This method may be removed without warning.
-* removed without warning.
 */
 public Context getContext() {
 return context;
+}
+/**
+* For internal use only.  This method may be removed without warning.
+*/
+public ClassLoader getProcessorClassLoader() {
+return processorClassLoader;
 }
 public String toString() {
 return "javac ProcessingEnvironment";
 }

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

comparison: src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java

src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java