Addressed review comments

Signed-off-by: Thomas Mäder <t.s.maeder@gmail.com>

Author: tsmaeder

package.json

@@ -930,9 +930,6 @@
                 "name": {
                   "type": "string",
                   "enum": [
-                    "J2SE-1.5",
-                    "JavaSE-1.6",
-                    "JavaSE-1.7",
                     "JavaSE-1.8",
                     "JavaSE-9",
                     "JavaSE-10",

src/commands.ts

@@ -380,6 +380,11 @@ export namespace Commands {
 	 * Open Java Dashboard
 	 */
 	export const OPEN_JAVA_DASHBOARD = 'java.dashboard.open';
+
+    /**
+     * Add Java Runtime
+     */
+    export const ADD_JAVA_RUNTIME = 'java.runtimes.add';
 }
 
 /**

src/javaRuntimes.ts

@@ -1,36 +1,57 @@
-import { getRuntime } from "jdk-utils";
+import { getRuntime, IJavaRuntime } from "jdk-utils";
 import * as vscode from "vscode";
 import { getSupportedJreNames } from "./jdkUtils";
+import { Commands } from "./commands";
+import * as path from "path";
 
 
 export namespace JavaRuntimes {
+    function compatible(runtime: IJavaRuntime, jreName: string): boolean {
+        if (!runtime.version) {
+            return true;
+        }
+        const majorVersion = runtime.version.major;
+        if (majorVersion === 8) {
+            return jreName === 'JavaSE-1.8';
+        }
+        const versionStrings = /[0-9]+/g.exec(jreName);
+        if (versionStrings && versionStrings.length > 0) {
+            return majorVersion >= parseInt(versionStrings[0]);
+        }
+        return false;
+    }
+
     export async function initialize(context: vscode.ExtensionContext): Promise<void> {
-        context.subscriptions.push(vscode.commands.registerCommand('java.runtimes.add', async () => {
+        context.subscriptions.push(vscode.commands.registerCommand(Commands.ADD_JAVA_RUNTIME, async () => {
+            const  lastSelectedDirectory: vscode.Uri | undefined = context.workspaceState.get('java.runtimes.lastSelectedDirectory');
             const directory = await vscode.window.showOpenDialog({
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
                 title: 'Select JDK Directory',
+                defaultUri: lastSelectedDirectory,
             });
             if (directory) {
-                const runtime = await getRuntime(directory[0].fsPath);
+                context.workspaceState.update('java.runtimes.lastSelectedDirectory', vscode.Uri.file(path.dirname(directory[0].fsPath)));
+                const runtime = await getRuntime(directory[0].fsPath, {withVersion: true});
                 if (runtime) {
                     const config = vscode.workspace.getConfiguration('java.configuration').get('runtimes');
                     if (Array.isArray(config)) {
-                        if (config.some(r => r.path === directory[0].fsPath)) {
-                            vscode.window.showErrorMessage(`JDK Directory ${directory[0].fsPath} already configured`);
-                        } else {
-                            const name = await vscode.window.showQuickPick(getSupportedJreNames(), {
+                        const candidates = getSupportedJreNames().filter(name => !config.some(r => r.name === name) && compatible(runtime, name));
+                        if (candidates.length > 0) {
+                            const name = await vscode.window.showQuickPick(candidates, {
                                 title: 'Select Java Runtime',
                             });
                             if (name) {
                                 config.push({
                                     name: name,
                                     path: directory[0].fsPath,
                                 });
+                                vscode.workspace.getConfiguration('java.configuration').update('runtimes', config, vscode.ConfigurationTarget.Global);
+                                vscode.window.showInformationMessage(`JDK Directory ${directory[0].fsPath} added`);
                             }
-                            vscode.workspace.getConfiguration('java.configuration').update('runtimes', config, vscode.ConfigurationTarget.Global);
-                            vscode.window.showInformationMessage(`JDK Directory ${directory[0].fsPath} added`);
+                        } else {
+                            vscode.window.showErrorMessage('No compatible environment available');
                         }
                     }
                 } else {

test/lightweight-mode-suite/extension.test.ts

@@ -30,7 +30,7 @@ suite('Java Language Extension - LightWeight', () => {
 				Commands.FILESEXPLORER_ONPASTE,
 				Commands.CHANGE_JAVA_SEARCH_SCOPE,
 				Commands.OPEN_JAVA_DASHBOARD,
-				"java.runtimes.add"
+				Commands.ADD_JAVA_RUNTIME
 			].sort();
 			const foundJavaCommands = commands.filter((value) => {
 				return JAVA_COMMANDS.indexOf(value)>=0 || value.startsWith('java.');

test/standard-mode-suite/extension.test.ts

@@ -129,7 +129,7 @@ suite('Java Language Extension - Standard', () => {
 				Commands.RESOLVE_PASTED_TEXT,
 				Commands.CHANGE_JAVA_SEARCH_SCOPE,
 				Commands.OPEN_JAVA_DASHBOARD,
-				"java.runtimes.add"
+				Commands.ADD_JAVA_RUNTIME
 			].sort();
 			const foundJavaCommands = commands.filter((value) => {
 				return JAVA_COMMANDS.indexOf(value)>=0 || value.startsWith('java.');