archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 18:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8054500: Refactor sjavac Main class into ClientMain and ServerMain

Browse source 
Restructured Main into ClientMain and ServerMain

Reviewed-by: jfranck
This commit is contained in:
Andreas Lundblad 2014-08-28 17:38:40 +02:00
parent 5f800435e3
commit 43eb10bcb8
8 changed files with 406 additions and 437 deletions
Download patch file Download diff file Expand all files Collapse all files

11
langtools/test/tools/sjavac/OptionDecoding.java
View file

@ -50,6 +50,7 @@ import com.sun.tools.sjavac.CopyFile;
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 @@ public class OptionDecoding {
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 @@ public class OptionDecoding {
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 @@ public class OptionDecoding {
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 @@ public class OptionDecoding {
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 @@ public class OptionDecoding {
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);