langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Fri Sep 12 23:32:51 2008 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Tue Sep 16 18:35:18 2008 -0700
@@ -70,6 +70,7 @@
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Name;
+import com.sun.tools.javac.util.Names;
import com.sun.tools.javac.util.Options;
import static javax.tools.StandardLocation.*;
@@ -831,7 +832,7 @@
topLevelClasses = List.nil();
packageInfoFiles = List.nil();
- compiler.close();
+ compiler.close(false);
currentContext = contextForNextRound(currentContext, true);
JavaFileManager fileManager = currentContext.get(JavaFileManager.class);
@@ -879,7 +880,7 @@
}
runLastRound(xout, roundNumber, errorStatus, taskListener);
- compiler.close();
+ compiler.close(false);
currentContext = contextForNextRound(currentContext, true);
compiler = JavaCompiler.instance(currentContext);
filer.newRound(currentContext, true);
@@ -913,7 +914,7 @@
} else if (procOnly) {
compiler.todo.clear();
} else { // Final compilation
- compiler.close();
+ compiler.close(false);
currentContext = contextForNextRound(currentContext, true);
compiler = JavaCompiler.instance(currentContext);
@@ -987,7 +988,7 @@
private ListBuffer<ClassSymbol> enterNewClassFiles(Context currentContext) {
ClassReader reader = ClassReader.instance(currentContext);
- Name.Table names = Name.Table.instance(currentContext);
+ Names names = Names.instance(currentContext);
ListBuffer<ClassSymbol> list = new ListBuffer<ClassSymbol>();
for (Map.Entry<String,JavaFileObject> entry : filer.getGeneratedClasses().entrySet()) {
@@ -1047,9 +1048,9 @@
next.put(Log.outKey, out);
if (shareNames) {
- Name.Table names = Name.Table.instance(context);
+ Names names = Names.instance(context);
assert names != null;
- next.put(Name.Table.namesKey, names);
+ next.put(Names.namesKey, names);
}
DiagnosticListener dl = context.get(DiagnosticListener.class);
@@ -1067,9 +1068,9 @@
((JavacFileManager)jfm).setContext(next);
}
- Name.Table names = Name.Table.instance(context);
+ Names names = Names.instance(context);
assert names != null;
- next.put(Name.Table.namesKey, names);
+ next.put(Names.namesKey, names);
Keywords keywords = Keywords.instance(context);
assert(keywords != null);