Mercurial Mercurial > jdk-sandbox / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
langtools/test/tools/sjavac/OptionDecoding.java
changeset 26271 97603426a4ce
parent 26089 196b7a50a266
child 27579 d1a63c99cdd5 
--- a/langtools/test/tools/sjavac/OptionDecoding.java	Wed Aug 27 06:56:29 2014 -0700
+++ b/langtools/test/tools/sjavac/OptionDecoding.java	Thu Aug 28 17:38:40 2014 +0200
@@ -50,6 +50,7 @@
 import com.sun.tools.sjavac.Main;
 import com.sun.tools.sjavac.Module;
 import com.sun.tools.sjavac.Source;
+import com.sun.tools.sjavac.client.ClientMain;
 import com.sun.tools.sjavac.options.Options;
 import com.sun.tools.sjavac.options.SourceLocation;
 
@@ -131,7 +132,7 @@
             Options options = Options.parseArgs("-if", "root/pkg1/ClassA1.java", "root");
 
             Map<String, Source> foundFiles = new HashMap<>();
-            Main.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
+            ClientMain.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
                     new HashMap<String, Module>(), new Module("", ""), false, true);
 
             checkFilesFound(foundFiles.keySet(), a1);
@@ -143,7 +144,7 @@
             Options options = Options.parseArgs("-i", "pkg1/*", "root");
 
             Map<String, Source> foundFiles = new HashMap<>();
-            Main.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
+            ClientMain.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
                     new HashMap<String, Module>(), new Module("", ""), false, true);
 
             checkFilesFound(foundFiles.keySet(), a1, a2, b1, b2);
@@ -155,7 +156,7 @@
             Options options = Options.parseArgs("-xf", "root/pkg1/ClassA1.java", "root");
 
             Map<String, Source> foundFiles = new HashMap<>();
-            Main.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
+            ClientMain.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
                     new HashMap<String, Module>(), new Module("", ""), false, true);
 
             checkFilesFound(foundFiles.keySet(), a2, b1, b2, c1, c2);
@@ -166,7 +167,7 @@
             Options options = Options.parseArgs("-i", "pkg1/*", "root");
 
             Map<String, Source> foundFiles = new HashMap<>();
-            Main.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
+            ClientMain.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
                     new HashMap<String, Module>(), new Module("", ""), false, true);
 
             checkFilesFound(foundFiles.keySet(), a1, a2, b1, b2);
@@ -177,7 +178,7 @@
             Options options = Options.parseArgs("-i", "pkg1/*", "-x", "pkg1/pkg2/*", "root");
 
             Map<String, Source> foundFiles = new HashMap<>();
-            Main.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
+            ClientMain.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
                     new HashMap<String, Module>(), new Module("", ""), false, true);
 
             checkFilesFound(foundFiles.keySet(), a1, a2);
jdk-sandbox