changeset 811:687d51cb403b

6716866: some javac regression tests fail to compile with re-orged file manager Reviewed-by: darcy
author jjg
date Thu, 19 Jun 2008 15:52:31 -0700
parents e4b6a6d206e6
children d60171f70ade
files langtools/test/tools/javac/T6358024.java langtools/test/tools/javac/T6358166.java langtools/test/tools/javac/T6358168.java langtools/test/tools/javac/T6625520.java
diffstat 4 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/langtools/test/tools/javac/T6358024.java	Wed Jun 18 07:23:25 2008 -0700
+++ b/langtools/test/tools/javac/T6358024.java	Thu Jun 19 15:52:31 2008 -0700
@@ -36,6 +36,7 @@
 import com.sun.source.util.*;
 import com.sun.tools.javac.api.*;
 import com.sun.tools.javac.file.*;
+import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.main.*;
 import com.sun.tools.javac.util.*;
 
--- a/langtools/test/tools/javac/T6358166.java	Wed Jun 18 07:23:25 2008 -0700
+++ b/langtools/test/tools/javac/T6358166.java	Thu Jun 19 15:52:31 2008 -0700
@@ -33,6 +33,7 @@
 import javax.lang.model.element.*;
 import javax.tools.*;
 import com.sun.tools.javac.file.*;
+import com.sun.tools.javac.file.JavacFileManager; // disambiguate
 import com.sun.tools.javac.main.JavaCompiler;
 import com.sun.tools.javac.main.*;
 import com.sun.tools.javac.util.*;
--- a/langtools/test/tools/javac/T6358168.java	Wed Jun 18 07:23:25 2008 -0700
+++ b/langtools/test/tools/javac/T6358168.java	Thu Jun 19 15:52:31 2008 -0700
@@ -34,6 +34,7 @@
 import javax.lang.model.element.*;
 import javax.tools.*;
 import com.sun.tools.javac.file.*;
+import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.main.JavaCompiler;
 import com.sun.tools.javac.main.*;
 import com.sun.tools.javac.util.*;
--- a/langtools/test/tools/javac/T6625520.java	Wed Jun 18 07:23:25 2008 -0700
+++ b/langtools/test/tools/javac/T6625520.java	Thu Jun 19 15:52:31 2008 -0700
@@ -25,6 +25,7 @@
 import java.util.*;
 import javax.tools.*;
 import com.sun.tools.javac.file.*;
+import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.util.*;
 
 /*
@@ -51,4 +52,4 @@
         if (dc.getDiagnostics().size() > 0)
             throw new Exception("unexpected diagnostics found");
     }
-}
\ No newline at end of file
+}