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

equal deleted inserted replaced

-:d23ae2d67a5d
+:ea7475564d07
 import static com.sun.tools.javac.code.Kinds.Kind.*;
 import com.sun.tools.javac.code.Symbol.ModuleSymbol;
 import com.sun.tools.javac.resources.CompilerProperties.Errors;
+import com.sun.tools.javac.resources.CompilerProperties.Fragments;
+import com.sun.tools.javac.resources.CompilerProperties.Notes;
 import com.sun.tools.javac.resources.CompilerProperties.Warnings;
 import static com.sun.tools.javac.code.TypeTag.CLASS;
 import static com.sun.tools.javac.main.Option.*;
 import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*;
 try {
 // catch completion problems with predefineds
 syms = Symtab.instance(context);
 } catch (CompletionFailure ex) {
 // inlined Check.completionError as it is not initialized yet
-log.error("cant.access", ex.sym, ex.getDetailValue());
+log.error(Errors.CantAccess(ex.sym, ex.getDetailValue()));
 if (ex instanceof ClassFinder.BadClassFile)
 throw new Abort();
 }
 source = Source.instance(context);
 attr = Attr.instance(context);
 /** The number of errors reported so far.
 */
 public int errorCount() {
 if (werror && log.nerrors == 0 && log.nwarnings > 0) {
-log.error("warnings.and.werror");
+log.error(Errors.WarningsAndWerror);
 }
 return log.nerrors;
 }
 protected final <T> Queue<T> stopIfError(CompileState cs, Queue<T> queue) {
 public CharSequence readSource(JavaFileObject filename) {
 try {
 inputFiles.add(filename);
 return filename.getCharContent(false);
 } catch (IOException e) {
-log.error("error.reading.file", filename, JavacFileManager.getMessage(e));
+log.error(Errors.ErrorReadingFile(filename, JavacFileManager.getMessage(e)));
 return null;
 }
 }
 /** Parse contents of input stream.
 JavaFileObject genCode(Env<AttrContext> env, JCClassDecl cdef) throws IOException {
 try {
 if (gen.genClass(env, cdef) && (errorCount() == 0))
 return writer.writeClass(cdef.sym);
 } catch (ClassWriter.PoolOverflow ex) {
-log.error(cdef.pos(), "limit.pool");
+log.error(cdef.pos(), Errors.LimitPool);
 } catch (ClassWriter.StringOverflow ex) {
-log.error(cdef.pos(), "limit.string.overflow",
+log.error(cdef.pos(),
-ex.value.substring(0, 20));
+Errors.LimitStringOverflow(ex.value.substring(0, 20)));
 } catch (CompletionFailure ex) {
 chk.completionError(cdef.pos(), ex);
 }
 return null;
 }
 = fileManager.getJavaFileForOutput(CLASS_OUTPUT,
 cdef.sym.flatname.toString(),
 JavaFileObject.Kind.SOURCE,
 null);
 if (inputFiles.contains(outFile)) {
-log.error(cdef.pos(), "source.cant.overwrite.input.file", outFile);
+log.error(cdef.pos(), Errors.SourceCantOverwriteInputFile(outFile));
 return null;
 } else {
 try (BufferedWriter out = new BufferedWriter(outFile.openWriter())) {
 new Pretty(out, true).printUnit(env.toplevel, cdef);
 if (verbose)
 *              or null if should be parsed from source
 *  @param c    the ClassSymbol to complete
 */
 public void readSourceFile(JCCompilationUnit tree, ClassSymbol c) throws CompletionFailure {
 if (completionFailureName == c.fullname) {
-throw new CompletionFailure(c, "user-selected completion failure by class name");
+JCDiagnostic msg =
+diagFactory.fragment(Fragments.UserSelectedCompletionFailure);
+throw new CompletionFailure(c, msg);
 }
 JavaFileObject filename = c.classfile;
 JavaFileObject prev = log.useSource(filename);
 if (tree == null) {
 try {
 tree = parse(filename, filename.getCharContent(false));
 } catch (IOException e) {
-log.error("error.reading.file", filename, JavacFileManager.getMessage(e));
+log.error(Errors.ErrorReadingFile(filename, JavacFileManager.getMessage(e)));
 tree = make.TopLevel(List.<JCTree>nil());
 } finally {
 log.useSource(prev);
 }
 }
 // complete a specific symbol, throw CompletionFailure.
 // Note that if module resolution failed, we may not even
 // have enough modules available to access java.lang, and
 // so risk getting FatalError("no.java.lang") from MemberEnter.
 if (!modules.enter(List.of(tree), c)) {
-throw new CompletionFailure(c, diags.fragment("cant.resolve.modules"));
+throw new CompletionFailure(c, diags.fragment(Fragments.CantResolveModules));
 }
 enter.complete(List.of(tree), c);
 if (!taskListener.isEmpty()) {
 tree.sourcefile.isNameCompatible("module-info",
 JavaFileObject.Kind.SOURCE);
 if (isModuleInfo) {
 if (enter.getEnv(tree.modle) == null) {
 JCDiagnostic diag =
-diagFactory.fragment("file.does.not.contain.module");
+diagFactory.fragment(Fragments.FileDoesNotContainModule);
 throw new ClassFinder.BadClassFile(c, filename, diag, diagFactory);
 }
 } else if (isPkgInfo) {
 if (enter.getEnv(tree.packge) == null) {
 JCDiagnostic diag =
-diagFactory.fragment("file.does.not.contain.package",
+diagFactory.fragment(Fragments.FileDoesNotContainPackage(c.location()));
-c.location());
 throw new ClassFinder.BadClassFile(c, filename, diag, diagFactory);
 }
 } else {
 JCDiagnostic diag =
-diagFactory.fragment("file.doesnt.contain.class",
+diagFactory.fragment(Fragments.FileDoesntContainClass(c.getQualifiedName()));
-c.getQualifiedName());
 throw new ClassFinder.BadClassFile(c, filename, diag, diagFactory);
 }
 }
 implicitSourceFilesRead = true;
 if (!processAnnotations) {
 // If there are no annotation processors present, and
 // annotation processing is to occur with compilation,
 // emit a warning.
 if (options.isSet(PROC, "only")) {
-log.warning("proc.proc-only.requested.no.procs");
+log.warning(Warnings.ProcProcOnlyRequestedNoProcs);
 todo.clear();
 }
 // If not processing annotations, classnames must be empty
 if (!classnames.isEmpty()) {
-log.error("proc.no.explicit.annotation.processing.requested",
+log.error(Errors.ProcNoExplicitAnnotationProcessingRequested(classnames));
-classnames);
 }
 Assert.checkNull(deferredDiagnosticHandler);
 return ; // continue regular compilation
 }
 List<PackageSymbol> pckSymbols = List.nil();
 if (!classnames.isEmpty()) {
 // Check for explicit request for annotation
 // processing
 if (!explicitAnnotationProcessingRequested()) {
-log.error("proc.no.explicit.annotation.processing.requested",
+log.error(Errors.ProcNoExplicitAnnotationProcessingRequested(classnames));
-classnames);
 deferredDiagnosticHandler.reportDeferredDiagnostics();
 log.popDiagnosticHandler(deferredDiagnosticHandler);
 return ; // TODO: Will this halt compilation?
 } else {
 boolean errors = false;
 // doProcessing will have handled deferred diagnostics
 } finally {
 procEnvImpl.close();
 }
 } catch (CompletionFailure ex) {
-log.error("cant.access", ex.sym, ex.getDetailValue());
+log.error(Errors.CantAccess(ex.sym, ex.getDetailValue()));
 if (deferredDiagnosticHandler != null) {
 deferredDiagnosticHandler.reportDeferredDiagnostics();
 log.popDiagnosticHandler(deferredDiagnosticHandler);
 }
 }
 file = genCode(env, cdef);
 }
 if (results != null && file != null)
 results.add(file);
 } catch (IOException ex) {
-log.error(cdef.pos(), "class.cant.write",
+log.error(cdef.pos(),
-cdef.sym, ex.getMessage());
+Errors.ClassCantWrite(cdef.sym, ex.getMessage()));
 return;
 } finally {
 log.useSource(prev);
 }
 if (errorCount() == 0
 && annotationProcessingOccurred
 && implicitSourceFilesRead
 && implicitSourcePolicy == ImplicitSourcePolicy.UNSET) {
 if (explicitAnnotationProcessingRequested())
-log.warning("proc.use.implicit");
+log.warning(Warnings.ProcUseImplicit);
 else
-log.warning("proc.use.proc.or.implicit");
+log.warning(Warnings.ProcUseProcOrImplicit);
 }
 chk.reportDeferredDiagnostics();
 if (log.compressedOutput) {
-log.mandatoryNote(null, "compressed.diags");
+log.mandatoryNote(null, Notes.CompressedDiags);
 }
 }
 public void enterDone() {
 enterDone = true;
 } catch (IOException e) {
 // When javac uses JDK 7 as a baseline, this code would be
 // better written to set any/all exceptions from all the
 // Closeables as suppressed exceptions on the FatalError
 // that is thrown.
-JCDiagnostic msg = diagFactory.fragment("fatal.err.cant.close");
+JCDiagnostic msg = diagFactory.fragment(Fragments.FatalErrCantClose);
 throw new FatalError(msg, e);
 }
 }
 closeables = List.nil();
 }

changeset 45504	ea7475564d07
parent 44290	202973b2d1ae
child 45862	c6827bac317d