Thu, 19 Jun 2008 15:52:31 -0700
6716866: some javac regression tests fail to compile with re-orged file manager
Reviewed-by: darcy
1.1 --- a/test/tools/javac/T6358024.java Wed Jun 18 07:23:25 2008 -0700 1.2 +++ b/test/tools/javac/T6358024.java Thu Jun 19 15:52:31 2008 -0700 1.3 @@ -36,6 +36,7 @@ 1.4 import com.sun.source.util.*; 1.5 import com.sun.tools.javac.api.*; 1.6 import com.sun.tools.javac.file.*; 1.7 +import com.sun.tools.javac.file.JavacFileManager; 1.8 import com.sun.tools.javac.main.*; 1.9 import com.sun.tools.javac.util.*; 1.10
2.1 --- a/test/tools/javac/T6358166.java Wed Jun 18 07:23:25 2008 -0700 2.2 +++ b/test/tools/javac/T6358166.java Thu Jun 19 15:52:31 2008 -0700 2.3 @@ -33,6 +33,7 @@ 2.4 import javax.lang.model.element.*; 2.5 import javax.tools.*; 2.6 import com.sun.tools.javac.file.*; 2.7 +import com.sun.tools.javac.file.JavacFileManager; // disambiguate 2.8 import com.sun.tools.javac.main.JavaCompiler; 2.9 import com.sun.tools.javac.main.*; 2.10 import com.sun.tools.javac.util.*;
3.1 --- a/test/tools/javac/T6358168.java Wed Jun 18 07:23:25 2008 -0700 3.2 +++ b/test/tools/javac/T6358168.java Thu Jun 19 15:52:31 2008 -0700 3.3 @@ -34,6 +34,7 @@ 3.4 import javax.lang.model.element.*; 3.5 import javax.tools.*; 3.6 import com.sun.tools.javac.file.*; 3.7 +import com.sun.tools.javac.file.JavacFileManager; 3.8 import com.sun.tools.javac.main.JavaCompiler; 3.9 import com.sun.tools.javac.main.*; 3.10 import com.sun.tools.javac.util.*;
4.1 --- a/test/tools/javac/T6625520.java Wed Jun 18 07:23:25 2008 -0700 4.2 +++ b/test/tools/javac/T6625520.java Thu Jun 19 15:52:31 2008 -0700 4.3 @@ -25,6 +25,7 @@ 4.4 import java.util.*; 4.5 import javax.tools.*; 4.6 import com.sun.tools.javac.file.*; 4.7 +import com.sun.tools.javac.file.JavacFileManager; 4.8 import com.sun.tools.javac.util.*; 4.9 4.10 /* 4.11 @@ -51,4 +52,4 @@ 4.12 if (dc.getDiagnostics().size() > 0) 4.13 throw new Exception("unexpected diagnostics found"); 4.14 } 4.15 -} 4.16 \ No newline at end of file 4.17 +}