diff options
Diffstat (limited to 'org.eclipse.jdt.compiler.tool/src')
3 files changed, 10 insertions, 13 deletions
diff --git a/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java b/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java index 4b3d38a849..b942161690 100644 --- a/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java +++ b/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java @@ -119,9 +119,10 @@ public class EclipseCompiler implements JavaCompiler { eclipseCompiler2.fileManager = this.getStandardFileManager(someDiagnosticListener, null, null); } - eclipseCompiler2.options.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_11); - eclipseCompiler2.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_11); - eclipseCompiler2.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_11); + String latest = CompilerOptions.getLatestVersion(); + eclipseCompiler2.options.put(CompilerOptions.OPTION_Compliance, latest); + eclipseCompiler2.options.put(CompilerOptions.OPTION_Source, latest); + eclipseCompiler2.options.put(CompilerOptions.OPTION_TargetPlatform, latest); ArrayList<String> allOptions = new ArrayList<>(); if (options != null) { diff --git a/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java b/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java index 05fcedbc18..cd80ce6633 100644 --- a/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java +++ b/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java @@ -1365,10 +1365,10 @@ public class EclipseFileManager implements StandardJavaFileManager { // FIXME: same for module source path? Map<String, String> options = new HashMap<>(); // FIXME: Find a way to get the options from the EclipseCompiler and pass it to the parser. - // FIXME: need to be the latest and not hardcoded value - options.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_11); - options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_11); - options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_11); + String latest = CompilerOptions.getLatestVersion(); + options.put(CompilerOptions.OPTION_Compliance, latest); + options.put(CompilerOptions.OPTION_Source, latest); + options.put(CompilerOptions.OPTION_TargetPlatform, latest); CompilerOptions compilerOptions = new CompilerOptions(options); ProblemReporter problemReporter = new ProblemReporter( diff --git a/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/JrtFileSystem.java b/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/JrtFileSystem.java index 57e6bd9a82..a140e15240 100644 --- a/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/JrtFileSystem.java +++ b/org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/JrtFileSystem.java @@ -92,12 +92,8 @@ public class JrtFileSystem extends Archive { } @Override - public FileVisitResult visitModule(Path mod) throws IOException { - String name = mod.getFileName().toString(); - if (name.endsWith("/")) { //$NON-NLS-1$ - name = name.substring(0, name.length() - 1); - } - JrtFileSystem.this.modulePathMap.put(name, mod); + public FileVisitResult visitModule(Path path, String name) throws IOException { + JrtFileSystem.this.modulePathMap.put(name, path); return FileVisitResult.CONTINUE; } }, JRTUtil.NOTIFY_MODULES); |