Merge pull request #554 from sid-srini/streamline-jdk-downloader

Updated the JDK Downloader UI to make it easier to get started

Author: sid-srini

README.md

@@ -127,10 +127,12 @@ Program arguments, VM options, environment variables, etc., can be set in the Ru
 ![Run Configuration](vscode/images/run_config.png) 
 
 ## JDK Downloader
-If the system does not detect any JDK, the extension will offer a downloader and setup prompt to help you set up a JDK. This setup provides options for Oracle JDK, OpenJDK, and allows you to choose from any installed JDK on your system.
-Alternatively, you can manually specify the path to JDK binaries by utilizing the JDK downloader.
+If the system does not detect any JDK, the extension will offer a downloader and setup prompts to help you set up a JDK. This allows you to get the latest Oracle JDK build for your system. Additionally, it provides options for different Oracle JDK and Oracle OpenJDK builds with system OS and architecture variants.
+
+Alternatively, you can manually select an already installed JDK to use with the extension through the "Select an installed JDK" command in the VS Code command palette.
+
 You can also access the JDK downloader through the "Download, install, and Use JDK" option in the command palette.<br/>
-![JDK Downloader](vscode/images/jdk_downloader.png)
+![JDK Downloader](vscode/images/jdk_downloader.gif)
 
 ## Enabling Java Preview Features 
 When using preview features use the quick fix action option to easily enable them.

vscode/images/jdk_downloader.gif

@@ -1,20 +1,23 @@
 {
   "jdk.downloader.heading": "JDK Downloader",
-  "jdk.downloader.html.details":"<p>This tool enables you to download either the latest Oracle JDK with <a href='https://www.java.com/freeuselicense'>Oracle No-Fee Terms and Conditions</a> or the Oracle OpenJDK builds under the <a href='https://openjdk.org/legal/gplv2+ce.html'>GNU Public License with ClassPath Exception</a></p> <p>It will then handle the installation and configuration on your behalf.</p> <p>This enables you to take full advantage of all the features offered by this extension.</p>",
-  "jdk.downloader.button.label.oracleJdk": "Download Oracle JDK",
-  "jdk.downloader.label.or": "or",
-  "jdk.downloader.label.openJdk": "OpenJDK",
+  "jdk.downloader.html.summary":"Download and install the latest Oracle JDK",
+  "jdk.downloader.html.details":"<p>This tool enables you to download the latest Oracle JDK under the <a href='https://www.java.com/freeuselicense'>Oracle No-Fee Terms and Conditions</a>.</p> <p>It then handles installation and configuration on your behalf. This ensures you can take full advantage of all the features offered by this extension.</p>",
+  "jdk.downloader.html.license.openJdk":"The Oracle OpenJDK builds are under the <a href='https://openjdk.org/legal/gplv2+ce.html'>GNU Public License with ClassPath Exception</a>.",
+  "jdk.downloader.html.footnote":"<em>Note:</em> Use the command <a href='command:jdk.select.jdk'><code>Select an installed JDK</code></a> to choose an already installed JDK for use with the extension.",
+  "jdk.downloader.button.label.latestOracleJdk": "Install Oracle JDK",
+  "jdk.downloader.button.label.selectedJdk": "Install selected JDK",
+  "jdk.downloader.label.otherOptions": "Other Options",
+  "jdk.downloader.label.openJdk": "Oracle OpenJDK",
   "jdk.downloader.label.oracleJdk": "Oracle JDK",
-  "jdk.downloader.button.label.openJdk": "Download Oracle OpenJDK",
-  "jdk.downloader.button.label.selectJdkFromSystem": "Select installed JDK from my system",
-  "jdk.downloader.label.selectOracleJdkVersion": "Select Oracle JDK Version",
-  "jdk.downloader.label.detectedOs": "Detected OS",
+  "jdk.downloader.label.selectOracleJdkVersion": "Select Oracle JDK version",
+  "jdk.downloader.label.selectOpenJdkVersion": "Select Oracle OpenJDK version",
+  "jdk.downloader.label.selectedOsArch": "Selected OS",
+  "jdk.downloader.label.changeOsArch": "Change",
+  "jdk.downloader.label.selectOs": "Select OS",
   "jdk.downloader.label.windows": "Microsoft Windows",
   "jdk.downloader.label.mac": "macOS",
   "jdk.downloader.label.linux": "Linux",
-  "jdk.downloader.label.detectedMachineArchitecture": "Detected Machine Architecture",
-  "jdk.downloader.button.label.downloadAndInstall": "Install and start setup",
-  "jdk.downloader.label.selectOpenJdkVersion": "Select Oracle OpenJDK Version",
+  "jdk.downloader.label.selectMachineArchitecture": "Select machine architecture",
   "jdk.downloader.message.downloadProgressBar":"{jdkType} {jdkVersion} download in progress",
   "jdk.downloader.message.downloadingAndCompletingSetup": "Downloading and completing setup of {jdkType} {jdkVersion}...",
   "jdk.downloader.message.downloadCompleted":"{jdkType} {jdkVersion} for {osType} download completed!",

vscode/images/jdk_downloader.png

@@ -1,20 +1,23 @@
 {
   "jdk.downloader.heading": "JDKダウンローダ",
-  "jdk.downloader.html.details":"<p>このツールは、<a href='https://www.java.com/freeuselicense'>Oracle No-Fee Terms and Conditions</a>の最新のOracle JDKまたは、<a href='https://openjdk.org/legal/gplv2+ce.html'>クラスパス例外付きGNU Public License</a>に基づいたOracle OpenJDKビルドのいずれかをダウンロードできます</p> <p>次に、インストールおよび構成をかわりに処理します。</p> <p>これにより、この拡張によって提供されたすべての機能を最大限活用できます。</p>",
-  "jdk.downloader.button.label.oracleJdk": "Oracle JDKのダウンロード",
-  "jdk.downloader.label.or": "または",
-  "jdk.downloader.label.openJdk": "OpenJDK",
+  "jdk.downloader.html.summary":"Download and install the latest Oracle JDK",
+  "jdk.downloader.html.details":"<p>このツールは、<a href='https://www.java.com/freeuselicense'>Oracle No-Fee Terms and Conditions</a>の最新のOracle JDKまたは、</p> <p>次に、インストールおよび構成をかわりに処理します。これにより、この拡張によって提供されたすべての機能を最大限活用できます。</p>",
+  "jdk.downloader.html.license.openJdk":"<a href='https://openjdk.org/legal/gplv2+ce.html'>クラスパス例外付きGNU Public License</a>に基づいたOracle OpenJDKビルドのかをダウンロードできます",
+  "jdk.downloader.html.footnote":"<em>Note:</em> Use the command <a href='command:jdk.select.jdk'><code>インストール済JDKの選択</code></a> to choose an already installed JDK for use with the extension.",
+  "jdk.downloader.button.label.latestOracleJdk": "Install Oracle JDK",
+  "jdk.downloader.button.label.selectedJdk": "Install selected JDK",
+  "jdk.downloader.label.otherOptions": "Other Options",
+  "jdk.downloader.label.openJdk": "Oracle OpenJDK",
   "jdk.downloader.label.oracleJdk": "Oracle JDK",
-  "jdk.downloader.button.label.openJdk": "Oracle OpenJDKのダウンロード",
-  "jdk.downloader.button.label.selectJdkFromSystem": "システムからインストール済JDKの選択",
   "jdk.downloader.label.selectOracleJdkVersion": "Oracle JDKバージョンの選択",
-  "jdk.downloader.label.detectedOs": "検出済OS",
+  "jdk.downloader.label.selectOpenJdkVersion": "Oracle OpenJDKバージョンの選択",
+  "jdk.downloader.label.selectedOsArch": "Selected OS",
+  "jdk.downloader.label.changeOsArch": "Change",
+  "jdk.downloader.label.selectOs": "Select OS",
   "jdk.downloader.label.windows": "Microsoft Windows",
   "jdk.downloader.label.mac": "macOS",
   "jdk.downloader.label.linux": "Linux",
-  "jdk.downloader.label.detectedMachineArchitecture": "検出済マシン・アーキテクチャ",
-  "jdk.downloader.button.label.downloadAndInstall": "インストールおよび設定の開始",
-  "jdk.downloader.label.selectOpenJdkVersion": "Oracle OpenJDKバージョンの選択",
+  "jdk.downloader.label.selectMachineArchitecture": "Select machine architecture",
   "jdk.downloader.message.downloadProgressBar":"{jdkType} {jdkVersion}のダウンロード中",
   "jdk.downloader.message.downloadingAndCompletingSetup": "{jdkType} {jdkVersion}の設定をダウンロードおよび完了しています...",
   "jdk.downloader.message.downloadCompleted":"{osType}用の{jdkType} {jdkVersion}のダウンロードが完了しました。",

vscode/l10n/bundle.l10n.en.json

@@ -1,20 +1,23 @@
 {
   "jdk.downloader.heading": "JDK 下载工具",
-  "jdk.downloader.html.details":"<p>使用此工具，您可以遵循 <a href='https://www.java.com/freeuselicense'>Oracle 免费条款和条件</a>下载最新的 Oracle JDK，或者依照 <a href='https://openjdk.org/legal/gplv2+ce.html'>GNU 公共许可证（包含 ClassPath 例外条款）</a>下载 Oracle OpenJDK 构建</p> <p>之后，它将代表您处理安装和配置。</p> <p>这样，您可以充分利用此扩展提供的所有功能。</p>",
-  "jdk.downloader.button.label.oracleJdk": "下载 Oracle JDK",
-  "jdk.downloader.label.or": "或",
-  "jdk.downloader.label.openJdk": "OpenJDK",
+  "jdk.downloader.html.summary":"Download and install the latest Oracle JDK",
+  "jdk.downloader.html.details":"<p>使用此工具，您可以遵循 <a href='https://www.java.com/freeuselicense'>Oracle 免费条款和条件</a>下载最新的 Oracle JDK，</p> <p>之后，它将代表您处理安装和配置。这样，您可以充分利用此扩展提供的所有功能。</p>",
+  "jdk.downloader.html.license.openJdk":"依照 <a href='https://openjdk.org/legal/gplv2+ce.html'>GNU 公共许可证（包含 ClassPath 例外条款）</a>下载 Oracle OpenJDK 构建",
+  "jdk.downloader.html.footnote":"<em>Note:</em> Use the command <a href='command:jdk.select.jdk'><code>选择安装的 JDK</code></a> to choose an already installed JDK for use with the extension.",
+  "jdk.downloader.button.label.latestOracleJdk": "Install Oracle JDK",
+  "jdk.downloader.button.label.selectedJdk": "Install selected JDK",
+  "jdk.downloader.label.otherOptions": "Other Options",
+  "jdk.downloader.label.openJdk": "Oracle OpenJDK",
   "jdk.downloader.label.oracleJdk": "Oracle JDK",
-  "jdk.downloader.button.label.openJdk": "下载 Oracle OpenJDK",
-  "jdk.downloader.button.label.selectJdkFromSystem": "从我的系统选择安装的 JDK",
   "jdk.downloader.label.selectOracleJdkVersion": "选择 Oracle JDK 版本",
-  "jdk.downloader.label.detectedOs": "检测到的操作系统",
+  "jdk.downloader.label.selectOpenJdkVersion": "选择 Oracle OpenJDK 版本",
+  "jdk.downloader.label.selectedOsArch": "Selected OS",
+  "jdk.downloader.label.changeOsArch": "Change",
+  "jdk.downloader.label.selectOs": "Select OS",
   "jdk.downloader.label.windows": "Microsoft Windows",
   "jdk.downloader.label.mac": "macOS",
   "jdk.downloader.label.linux": "Linux",
-  "jdk.downloader.label.detectedMachineArchitecture": "检测到的计算机体系结构",
-  "jdk.downloader.button.label.downloadAndInstall": "安装并启动设置",
-  "jdk.downloader.label.selectOpenJdkVersion": "选择 Oracle OpenJDK 版本",
+  "jdk.downloader.label.selectMachineArchitecture": "Select machine architecture",
   "jdk.downloader.message.downloadProgressBar":"{jdkType} {jdkVersion} 正在下载",
   "jdk.downloader.message.downloadingAndCompletingSetup": "正在下载 {jdkType} {jdkVersion} 并完成其设置...",
   "jdk.downloader.message.downloadCompleted":"适用于 {osType} 的 {jdkType} {jdkVersion} 下载已完成！",

vscode/l10n/bundle.l10n.ja.json

@@ -658,6 +658,11 @@
 				"command": "jdk.download.jdk",
 				"title": "%jdk.download.jdk%"
 			},
+			{
+				"command": "jdk.select.jdk",
+				"title": "%jdk.select.jdk%",
+				"category": "Java"
+			},
 			{
 				"command": "jdk.open.test",
 				"title": "%jdk.open.test%",
@@ -780,6 +785,9 @@
 				{
 					"command": "jdk.download.jdk"
 				},
+				{
+					"command": "jdk.select.jdk"
+				},
 				{
 					"command": "jdk.workspace.compile",
 					"when": "nbJdkReady"

vscode/l10n/bundle.l10n.zh-cn.json

@@ -26,6 +26,7 @@
     "testing.runAll": "すべてのテストの実行",
     "jdk.addEventListener": "イベント・リスナーの追加",
     "jdk.download.jdk": "JDKのダウンロード、インストールおよび使用",
+    "jdk.select.jdk": "インストール済JDKの選択",
     "jdk.open.test": "テスト/テスト済のクラスへ移動...",
     "jdk.delete.cache": "このワークスペースのOracle Java拡張キャッシュの削除",
     "jdk.open.userDir": "このワークスペースのOracle Java拡張キャッシュ・ディレクトリを開く",

vscode/package.json

@@ -26,6 +26,7 @@
     "testing.runAll": "Run All Tests",
     "jdk.addEventListener": "Add event listener",
     "jdk.download.jdk": "Download, install and use JDK",
+    "jdk.select.jdk": "Select an installed JDK",
     "jdk.open.test": "Go To Test/Tested class...",
     "jdk.delete.cache": "Delete Oracle Java extension cache for this workspace",
     "jdk.open.userDir": "Open Oracle Java extension cache directory for this workspace",

vscode/package.nls.ja.json

@@ -26,6 +26,7 @@
     "testing.runAll": "运行所有测试",
     "jdk.addEventListener": "添加事件监听程序",
     "jdk.download.jdk": "下载、安装和使用 JDK",
+    "jdk.select.jdk": "选择安装的 JDK",
     "jdk.open.test": "转至测试/被测试的类...",
     "jdk.delete.cache": "删除此工作区的 Oracle Java 扩展高速缓存",
     "jdk.open.userDir": "打开此工作区的 Oracle Java 扩展高速缓存目录",