1.1 --- a/test/tools/javac/failover/CheckAttributedTree.java Mon Nov 14 08:09:47 2011 -0800
1.2 +++ b/test/tools/javac/failover/CheckAttributedTree.java Mon Nov 14 15:11:10 2011 -0800
1.3 @@ -55,12 +55,8 @@
1.4 import java.io.PrintWriter;
1.5 import java.io.StringWriter;
1.6 import java.lang.reflect.Field;
1.7 -import java.lang.reflect.Modifier;
1.8 -import java.nio.charset.Charset;
1.9 import java.util.ArrayList;
1.10 -import java.util.HashMap;
1.11 import java.util.List;
1.12 -import java.util.Map;
1.13 import javax.tools.Diagnostic;
1.14 import javax.tools.DiagnosticListener;
1.15 import javax.tools.JavaFileObject;
1.16 @@ -72,8 +68,8 @@
1.17 import com.sun.tools.javac.api.JavacTool;
1.18 import com.sun.tools.javac.code.Symbol;
1.19 import com.sun.tools.javac.code.Type;
1.20 +import com.sun.tools.javac.parser.EndPosTable;
1.21 import com.sun.tools.javac.tree.JCTree;
1.22 -import com.sun.tools.javac.tree.JCTree.JCClassDecl;
1.23 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
1.24 import com.sun.tools.javac.tree.JCTree.JCImport;
1.25 import com.sun.tools.javac.tree.TreeInfo;
1.26 @@ -421,7 +417,7 @@
1.27 }
1.28
1.29 JavaFileObject sourcefile;
1.30 - Map<JCTree, Integer> endPosTable;
1.31 + EndPosTable endPosTable;
1.32 Info encl;
1.33 }
1.34
1.35 @@ -437,7 +433,7 @@
1.36 end = Integer.MAX_VALUE;
1.37 }
1.38
1.39 - Info(JCTree tree, Map<JCTree, Integer> endPosTable) {
1.40 + Info(JCTree tree, EndPosTable endPosTable) {
1.41 this.tree = tree;
1.42 tag = tree.getTag();
1.43 start = TreeInfo.getStartPos(tree);
