jdk-sandbox: comparison langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java

equal deleted inserted replaced

-:d23ae2d67a5d
+:ea7475564d07
 import com.sun.tools.javac.model.JavacElements;
 import com.sun.tools.javac.model.JavacTypes;
 import com.sun.tools.javac.platform.PlatformDescription;
 import com.sun.tools.javac.platform.PlatformDescription.PluginInfo;
 import com.sun.tools.javac.resources.CompilerProperties.Errors;
+import com.sun.tools.javac.resources.CompilerProperties.Warnings;
 import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.util.Abort;
 import com.sun.tools.javac.util.Assert;
 import com.sun.tools.javac.util.ClientCodeException;
 } catch (Exception e) {
 // Fail softly if a loader is not actually needed.
 this.iterator = handleServiceLoaderUnavailability("proc.no.service", null);
 }
 } catch (Throwable t) {
-log.error("proc.service.problem");
+log.error(Errors.ProcServiceProblem);
 throw new Abort(t);
 }
 }
 ServiceIterator(ServiceLoader<Processor> loader, Log log) {
 @Override
 public boolean hasNext() {
 try {
 return internalHasNext();
 } catch(ServiceConfigurationError sce) {
-log.error("proc.bad.config.file", sce.getLocalizedMessage());
+log.error(Errors.ProcBadConfigFile(sce.getLocalizedMessage()));
 throw new Abort(sce);
 } catch (Throwable t) {
 throw new Abort(t);
 }
 }
 @Override
 public Processor next() {
 try {
 return internalNext();
 } catch (ServiceConfigurationError sce) {
-log.error("proc.bad.config.file", sce.getLocalizedMessage());
+log.error(Errors.ProcBadConfigFile(sce.getLocalizedMessage()));
 throw new Abort(sce);
 } catch (Throwable t) {
 throw new Abort(t);
 }
 }
 try {
 Class<?> processorClass = processorCL.loadClass(processorName);
 ensureReadable(processorClass);
 return (Processor) processorClass.getConstructor().newInstance();
 } catch (ClassNotFoundException cnfe) {
-log.error("proc.processor.not.found", processorName);
+log.error(Errors.ProcProcessorNotFound(processorName));
 return null;
 } catch (ClassCastException cce) {
-log.error("proc.processor.wrong.type", processorName);
+log.error(Errors.ProcProcessorWrongType(processorName));
 return null;
 } catch (Exception e ) {
-log.error("proc.processor.cant.instantiate", processorName);
+log.error(Errors.ProcProcessorCantInstantiate(processorName));
 return null;
 }
 } catch (ClientCodeException e) {
 throw e;
 } catch (Throwable t) {
 */
 private void checkSourceVersionCompatibility(Source source, Log log) {
 SourceVersion procSourceVersion = processor.getSupportedSourceVersion();
 if (procSourceVersion.compareTo(Source.toSourceVersion(source)) < 0 )  {
-log.warning("proc.processor.incompatible.source.version",
+log.warning(Warnings.ProcProcessorIncompatibleSourceVersion(procSourceVersion,
-procSourceVersion,
+processor.getClass().getName(),
-processor.getClass().getName(),
+source.name));
-source.name);
 }
 }
 private boolean checkOptionName(String optionName, Log log) {
 boolean valid = isValidOptionName(optionName);
 if (!valid)
-log.error("proc.processor.bad.option.name",
+log.error(Errors.ProcProcessorBadOptionName(optionName,
-optionName,
+processor.getClass().getName()));
-processor.getClass().getName());
 return valid;
 }
 public boolean annotationSupported(String annotationName) {
 for(Pattern p: supportedAnnotationPatterns) {
 if (lint && unmatchedAnnotations.size() > 0) {
 // Remove annotations processed by javac
 unmatchedAnnotations.keySet().removeAll(platformAnnotations);
 if (unmatchedAnnotations.size() > 0) {
-log.warning("proc.annotations.without.processors",
+log.warning(Warnings.ProcAnnotationsWithoutProcessors(unmatchedAnnotations.keySet()));
-unmatchedAnnotations.keySet());
 }
 }
 // Run contributing processors that haven't run yet
 psi.runContributingProcs(renv);
 Set<? extends TypeElement> tes,
 RoundEnvironment renv) {
 try {
 return proc.process(tes, renv);
 } catch (ClassFinder.BadClassFile ex) {
-log.error("proc.cant.access.1", ex.sym, ex.getDetailValue());
+log.error(Errors.ProcCantAccess1(ex.sym, ex.getDetailValue()));
 return false;
 } catch (CompletionFailure ex) {
 StringWriter out = new StringWriter();
 ex.printStackTrace(new PrintWriter(out));
-log.error("proc.cant.access", ex.sym, ex.getDetailValue(), out.toString());
+log.error(Errors.ProcCantAccess(ex.sym, ex.getDetailValue(), out.toString()));
 return false;
 } catch (ClientCodeException e) {
 throw e;
 } catch (Throwable t) {
 throw new AnnotationProcessingError(t);
 return true;
 }
 private void warnIfUnmatchedOptions() {
 if (!unmatchedProcessorOptions.isEmpty()) {
-log.warning("proc.unmatched.processor.options", unmatchedProcessorOptions.toString());
+log.warning(Warnings.ProcUnmatchedProcessorOptions(unmatchedProcessorOptions.toString()));
 }
 }
 /**
 * Free resources related to annotation processing.
 return true;
 } catch (MalformedURLException ex) {
 throw new AssertionError(ex);
 }
 catch (ServiceProxy.ServiceConfigurationError e) {
-log.error("proc.bad.config.file", e.getLocalizedMessage());
+log.error(Errors.ProcBadConfigFile(e.getLocalizedMessage()));
 return true;
 }
 }
 return false;
 pkg = s.substring(slash + 1);
 }
 if (MatchingUtils.isValidImportString(pkg)) {
 return Pattern.compile(module + MatchingUtils.validImportStringToPatternString(pkg));
 } else {
-log.warning("proc.malformed.supported.string", s, p.getClass().getName());
+log.warning(Warnings.ProcMalformedSupportedString(s, p.getClass().getName()));
 return noMatches; // won't match any valid identifier
 }
 }
 /**

changeset 45504	ea7475564d07
parent 44291	e1b620ac6c98
child 45744	db6aedca2c8c