1.1 --- a/test/tools/javac/6304921/TestLog.java Tue Sep 09 10:28:21 2008 -0700 1.2 +++ b/test/tools/javac/6304921/TestLog.java Tue Sep 09 10:40:50 2008 -0700 1.3 @@ -34,6 +34,7 @@ 1.4 import javax.tools.SimpleJavaFileObject; 1.5 import com.sun.tools.javac.file.JavacFileManager; 1.6 import com.sun.tools.javac.parser.Parser; 1.7 +import com.sun.tools.javac.parser.ParserFactory; 1.8 import com.sun.tools.javac.parser.Scanner; 1.9 import com.sun.tools.javac.tree.JCTree; 1.10 import com.sun.tools.javac.tree.TreeScanner; 1.11 @@ -60,7 +61,7 @@ 1.12 1.13 JavacFileManager.preRegister(context); 1.14 Scanner.Factory sfac = Scanner.Factory.instance(context); 1.15 - Parser.Factory pfac = Parser.Factory.instance(context); 1.16 + ParserFactory pfac = ParserFactory.instance(context); 1.17 1.18 final String text = 1.19 "public class Foo {\n" 1.20 @@ -74,9 +75,9 @@ 1.21 JavaFileObject fo = new StringJavaFileObject("Foo", text); 1.22 log.useSource(fo); 1.23 1.24 - Scanner s = sfac.newScanner(fo.getCharContent(true)); 1.25 - Parser parser = pfac.newParser(s, false, genEndPos); 1.26 - JCTree.JCCompilationUnit tree = parser.compilationUnit(); 1.27 + CharSequence cs = fo.getCharContent(true); 1.28 + Parser parser = pfac.newParser(cs, false, genEndPos, false); 1.29 + JCTree.JCCompilationUnit tree = parser.parseCompilationUnit(); 1.30 log.setEndPosTable(fo, tree.endPositions); 1.31 1.32 TreeScanner ts = new LogTester(log, tree.endPositions);