Skip to content

Commit a521ea6

Browse files
andxuandxu
authored
fix issue: java11 template cannot be found. (microsoft#82)
* fix issue: java11 template cannot be found. * 1. use jdkSpecificTemplateRoot to reduce join two times.
1 parent e22a721 commit a521ea6

3 files changed

Lines changed: 23 additions & 2 deletions

File tree

‎src/controllers/projectController.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,15 @@ export class ProjectController {
5454
const templateRoot: string = path.join(this.context.extensionPath, "templates");
5555
const projectFile: string = path.join(projectRoot, ".project");
5656
try {
57+
let jdkSpecificTemplateRoot: string = path.join(templateRoot, `Java${javaVersion}`);
58+
if (!await fse.pathExists(jdkSpecificTemplateRoot)) {
59+
// fall back to 8
60+
jdkSpecificTemplateRoot = path.join(templateRoot, `Java8`);
61+
}
5762
await fse.ensureDir(projectRoot);
58-
5963
await Promise.all([
6064
fse.copy(path.join(templateRoot, "App.java.sample"), path.join(projectRoot, "src", "app", "App.java")),
61-
fse.copy(path.join(templateRoot, `Java${javaVersion}`), projectRoot),
65+
fse.copy(jdkSpecificTemplateRoot, projectRoot),
6266
fse.copy(path.join(templateRoot, ".project"), path.join(projectRoot, ".project")),
6367
fse.ensureDir(path.join(projectRoot, "bin")),
6468
]);

‎templates/Java11/.classpath‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
4+
<classpathentry kind="src" path="src"/>
5+
<classpathentry kind="output" path="bin"/>
6+
</classpath>

‎templates/Java11/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
4+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
5+
org.eclipse.jdt.core.compiler.compliance=10
6+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
7+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
8+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
9+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
10+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
11+
org.eclipse.jdt.core.compiler.source=10

0 commit comments

Comments
 (0)