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

-:5c956be64b9e
+:71f35e4b93a5
 /*
-* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 /** The set of top level classes to be processed this round. */
 List<ClassSymbol> topLevelClasses;
 /** The set of package-info files to be processed this round. */
 List<PackageSymbol> packageInfoFiles;
-/** The number of Messager errors generated in this round. */
-int nMessagerErrors;
 /** Create a round (common code). */
 private Round(Context context, int number, int priorErrors, int priorWarnings,
 Log.DeferredDiagnosticHandler deferredDiagnosticHandler) {
 this.context = context;
 this.number = number;
 compiler = JavaCompiler.instance(context);
 log = Log.instance(context);
 log.nerrors = priorErrors;
-log.nwarnings += priorWarnings;
+log.nwarnings = priorWarnings;
 if (number == 1) {
 Assert.checkNonNull(deferredDiagnosticHandler);
 this.deferredDiagnosticHandler = deferredDiagnosticHandler;
 } else {
 this.deferredDiagnosticHandler = new Log.DeferredDiagnosticHandler(log);
 /** Create a new round. */
 private Round(Round prev,
 Set<JavaFileObject> newSourceFiles, Map<String,JavaFileObject> newClassFiles) {
 this(prev.nextContext(),
 prev.number+1,
-prev.nMessagerErrors,
+prev.compiler.log.nerrors,
 prev.compiler.log.nwarnings,
 null);
 this.genClassFiles = prev.genClassFiles;
 List<JCCompilationUnit> parsedFiles = compiler.parseFiles(newSourceFiles);
 compiler.close(false);
 }
 }
 /** Create the compiler to be used for the final compilation. */
-JavaCompiler finalCompiler(boolean errorStatus) {
+JavaCompiler finalCompiler() {
 try {
 Context nextCtx = nextContext();
 JavacProcessingEnvironment.this.context = nextCtx;
 JavaCompiler c = JavaCompiler.instance(nextCtx);
-c.log.nwarnings += compiler.log.nwarnings;
+c.log.initRound(compiler.log);
-if (errorStatus) {
-c.log.nerrors += compiler.log.nerrors;
-}
 return c;
 } finally {
 compiler.close(false);
 }
 }
 }
 } finally {
 if (!taskListener.isEmpty())
 taskListener.finished(new TaskEvent(TaskEvent.Kind.ANNOTATION_PROCESSING_ROUND));
 }
-nMessagerErrors = messager.errorCount();
 }
 void showDiagnostics(boolean showAll) {
 Set<JCDiagnostic.Kind> kinds = EnumSet.allOf(JCDiagnostic.Kind.class);
 if (!showAll) {
 Tokens tokens = Tokens.instance(context);
 Assert.checkNonNull(tokens);
 next.put(Tokens.tokensKey, tokens);
 Log nextLog = Log.instance(next);
-// propogate the log's writers directly, instead of going through context
+nextLog.initRound(log);
-nextLog.setWriters(log);
-nextLog.setSourceMap(log);
 JavaCompiler oldCompiler = JavaCompiler.instance(context);
 JavaCompiler nextCompiler = JavaCompiler.instance(next);
 nextCompiler.initRound(oldCompiler);
 Set<JavaFileObject> newSourceFiles =
 new LinkedHashSet<JavaFileObject>(filer.getGeneratedSourceFileObjects());
 roots = cleanTrees(round.roots);
-JavaCompiler compiler = round.finalCompiler(errorStatus);
+JavaCompiler compiler = round.finalCompiler();
 if (newSourceFiles.size() > 0)
 roots = roots.appendList(compiler.parseFiles(newSourceFiles));
 errorStatus = errorStatus || (compiler.errorCount() > 0);
 */
 private boolean needClassLoader(String procNames, Iterable<? extends File> workingpath) {
 if (procNames != null)
 return true;
-String procPath;
 URL[] urls = new URL[1];
 for(File pathElement : workingpath) {
 try {
 urls[0] = pathElement.toURI().toURL();
 if (ServiceProxy.hasService(Processor.class, urls))
 super.visitSelect(node);
 }
 public void visitIdent(JCIdent node) {
 node.sym = null;
 super.visitIdent(node);
+}
+public void visitAnnotation(JCAnnotation node) {
+node.attribute = null;
+super.visitAnnotation(node);
 }
 };
 private boolean moreToDo() {

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