From 072d9b84554390e5144e1bca1bf58bb86f070d03 Mon Sep 17 00:00:00 2001 From: Shi Chen Date: Wed, 22 Dec 2021 10:27:41 +0800 Subject: [PATCH 1/5] deprecate document --- README.md | 2 +- package.json | 5 +---- package.nls.json | 3 +-- package.nls.zh.json | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 7c6970cd..06e5c8df 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ You can tell that the glob pattern is supported. And here's more - you can incl | `java.dependency.autoRefresh` | Specify whether to automatically sync the change from editor to the Java Projects explorer. | `true` | | `java.dependency.refreshDelay` | The delay time (ms) the auto refresh is invoked when changes are detected. | `2000ms` | | `java.dependency.packagePresentation` | Specify how to display the package. Supported values are: `flat`, `hierarchical`.| `flat` | -| `java.project.exportJar.targetPath` | The output path of export jar. When this setting is **empty** or equals `askUser`, a file explorer will pop up to let the user select the output location.| `${workspaceFolder}/${workspaceFolderBasename}.jar` | +| `java.project.exportJar.targetPath` | The output path of export jar. When this setting is **empty** , a file explorer will pop up to let the user select the output location.| `${workspaceFolder}/${workspaceFolderBasename}.jar` | ## Contribution diff --git a/package.json b/package.json index e5bf1fc3..5773ed90 100644 --- a/package.json +++ b/package.json @@ -210,13 +210,10 @@ { "enum": [ "${workspaceFolder}/${workspaceFolderBasename}.jar", - "askUser", "" ], "enumDescriptions": [ - "%configuration.java.project.exportJar.targetPath.workspaceFolder%", - "%configuration.java.project.exportJar.targetPath.askUser%", - "%configuration.java.project.exportJar.targetPath.askUser%" + "%configuration.java.project.exportJar.targetPath.workspaceFolder%" ] }, "string" diff --git a/package.nls.json b/package.nls.json index b7534d58..43219882 100644 --- a/package.nls.json +++ b/package.nls.json @@ -26,9 +26,8 @@ "configuration.java.dependency.autoRefresh": "Synchronize Java Projects explorer with changes", "configuration.java.dependency.refreshDelay": "The delay time (ms) the auto refresh is invoked when changes are detected", "configuration.java.dependency.packagePresentation": "Package presentation mode: flat or hierarchical", - "configuration.java.project.exportJar.targetPath": "Specifies the output path of export jar. The default value is `${workspaceFolder}/${workspaceFolderBasename}.jar`. To select the output location manually each time exporting the jar file, simply leave it empty or set it to `askUser`.", + "configuration.java.project.exportJar.targetPath": "Specifies the output path of export jar. The default value is `${workspaceFolder}/${workspaceFolderBasename}.jar`. You can leave it empty to select the output location manually each time exporting the jar file.", "configuration.java.project.exportJar.targetPath.workspaceFolder": "Export the jar file into the workspace folder. Its name is the same as the folder's.", - "configuration.java.project.exportJar.targetPath.askUser": "You will select the output location manually each time exporting the jar file.", "taskDefinitions.java.project.exportJar.label": "The label of export jar task.", "taskDefinitions.java.project.exportJar.elements": "The content list of the exported jar.", "taskDefinitions.java.project.exportJar.mainClass": "The main class in the manifest of the exported jar.", diff --git a/package.nls.zh.json b/package.nls.zh.json index a24c56cb..04fc2301 100644 --- a/package.nls.zh.json +++ b/package.nls.zh.json @@ -26,9 +26,8 @@ "configuration.java.dependency.autoRefresh": "在 Java 项目管理器中自动同步修改", "configuration.java.dependency.refreshDelay": "控制 Java 项目管理器刷新的延迟时间 (毫秒)", "configuration.java.dependency.packagePresentation": "Java 包显示方式: 平行显示或者分层显示", - "configuration.java.project.exportJar.targetPath": "导出 Jar 文件的默认路径，默认值为 `${workspaceFolder}/${workspaceFolderBasename}.jar` 。您也可以将此选项置为空串或 `askUser` 来手动选择 jar 文件的导出目录。", + "configuration.java.project.exportJar.targetPath": "导出 Jar 文件的默认路径，默认值为 `${workspaceFolder}/${workspaceFolderBasename}.jar` 。您也可以将此选项置为空串来手动选择 jar 文件的导出目录。", "configuration.java.project.exportJar.targetPath.workspaceFolder": "导出 Jar 文件到工作空间文件夹下。Jar 文件的名称和工作空间文件夹的名称相同。", - "configuration.java.project.exportJar.targetPath.askUser": "您将在每次导出 jar 文件时手动选择输出目录。", "taskDefinitions.java.project.exportJar.label": "导出 Jar 任务的名称。", "taskDefinitions.java.project.exportJar.elements": "导出 Jar 文件的内容列表。", "taskDefinitions.java.project.exportJar.mainClass": "导出 Jar 文件的 main 函数所在的类。", From f1a42c2b5be3f895ab547cc9d24b8e206f220c5b Mon Sep 17 00:00:00 2001 From: Shi Chen Date: Wed, 22 Dec 2021 10:45:02 +0800 Subject: [PATCH 2/5] add description for empty value --- package.json | 3 ++- package.nls.json | 1 + package.nls.zh.json | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5773ed90..1a235b42 100644 --- a/package.json +++ b/package.json @@ -213,7 +213,8 @@ "" ], "enumDescriptions": [ - "%configuration.java.project.exportJar.targetPath.workspaceFolder%" + "%configuration.java.project.exportJar.targetPath.workspaceFolder%", + "%configuration.java.project.exportJar.targetPath.select%" ] }, "string" diff --git a/package.nls.json b/package.nls.json index 43219882..0f2aa992 100644 --- a/package.nls.json +++ b/package.nls.json @@ -28,6 +28,7 @@ "configuration.java.dependency.packagePresentation": "Package presentation mode: flat or hierarchical", "configuration.java.project.exportJar.targetPath": "Specifies the output path of export jar. The default value is `${workspaceFolder}/${workspaceFolderBasename}.jar`. You can leave it empty to select the output location manually each time exporting the jar file.", "configuration.java.project.exportJar.targetPath.workspaceFolder": "Export the jar file into the workspace folder. Its name is the same as the folder's.", + "configuration.java.project.exportJar.targetPath.select": "You will select the output location manually each time exporting the jar file.", "taskDefinitions.java.project.exportJar.label": "The label of export jar task.", "taskDefinitions.java.project.exportJar.elements": "The content list of the exported jar.", "taskDefinitions.java.project.exportJar.mainClass": "The main class in the manifest of the exported jar.", diff --git a/package.nls.zh.json b/package.nls.zh.json index 04fc2301..1d60535a 100644 --- a/package.nls.zh.json +++ b/package.nls.zh.json @@ -28,6 +28,7 @@ "configuration.java.dependency.packagePresentation": "Java 包显示方式: 平行显示或者分层显示", "configuration.java.project.exportJar.targetPath": "导出 Jar 文件的默认路径，默认值为 `${workspaceFolder}/${workspaceFolderBasename}.jar` 。您也可以将此选项置为空串来手动选择 jar 文件的导出目录。", "configuration.java.project.exportJar.targetPath.workspaceFolder": "导出 Jar 文件到工作空间文件夹下。Jar 文件的名称和工作空间文件夹的名称相同。", + "configuration.java.project.exportJar.targetPath.select": "您将在每次导出 Jar 文件时手动选择输出目录。", "taskDefinitions.java.project.exportJar.label": "导出 Jar 任务的名称。", "taskDefinitions.java.project.exportJar.elements": "导出 Jar 文件的内容列表。", "taskDefinitions.java.project.exportJar.mainClass": "导出 Jar 文件的 main 函数所在的类。", From 8f0e75c350b9d1881b8ff0262d4eb9e4c4ffbb4d Mon Sep 17 00:00:00 2001 From: Shi Chen Date: Wed, 22 Dec 2021 11:30:24 +0800 Subject: [PATCH 3/5] refine description of taskDefiniton.targetPath --- package.json | 15 +++++++++++++++ package.nls.json | 4 ++-- package.nls.zh.json | 4 ++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 1a235b42..8ad2a048 100644 --- a/package.json +++ b/package.json @@ -559,6 +559,21 @@ }, "targetPath": { "type": "string", + "anyOf": [ + { + "type": "string" + }, + { + "enum": [ + "${workspaceFolder}/${workspaceFolderBasename}.jar", + "" + ], + "enumDescriptions": [ + "%configuration.java.project.exportJar.targetPath.workspaceFolder%", + "%configuration.java.project.exportJar.targetPath.select%" + ] + } + ], "description": "%taskDefinitions.java.project.exportJar.targetPath%" }, "elements": { diff --git a/package.nls.json b/package.nls.json index 0f2aa992..f253ac4c 100644 --- a/package.nls.json +++ b/package.nls.json @@ -28,11 +28,11 @@ "configuration.java.dependency.packagePresentation": "Package presentation mode: flat or hierarchical", "configuration.java.project.exportJar.targetPath": "Specifies the output path of export jar. The default value is `${workspaceFolder}/${workspaceFolderBasename}.jar`. You can leave it empty to select the output location manually each time exporting the jar file.", "configuration.java.project.exportJar.targetPath.workspaceFolder": "Export the jar file into the workspace folder. Its name is the same as the folder's.", - "configuration.java.project.exportJar.targetPath.select": "You will select the output location manually each time exporting the jar file.", + "configuration.java.project.exportJar.targetPath.select": "Select output location manually when exporting the jar file.", "taskDefinitions.java.project.exportJar.label": "The label of export jar task.", "taskDefinitions.java.project.exportJar.elements": "The content list of the exported jar.", "taskDefinitions.java.project.exportJar.mainClass": "The main class in the manifest of the exported jar.", - "taskDefinitions.java.project.exportJar.targetPath": "The output path of the exported jar. This will override configuration.java.project.exportJar.targetPath.", + "taskDefinitions.java.project.exportJar.targetPath": "The output path of the exported jar. This will override setting java.project.exportJar.targetPath.", "taskDefinitions.java.project.exportJar.compileOutput": "The folders containing output class files in the runtime scope.", "taskDefinitions.java.project.exportJar.testCompileOutput": "The folders containing output class files in the test scope.", "taskDefinitions.java.project.exportJar.dependencies": "The artifact dependencies in the runtime scope.", diff --git a/package.nls.zh.json b/package.nls.zh.json index 1d60535a..6b7e8c13 100644 --- a/package.nls.zh.json +++ b/package.nls.zh.json @@ -28,11 +28,11 @@ "configuration.java.dependency.packagePresentation": "Java 包显示方式: 平行显示或者分层显示", "configuration.java.project.exportJar.targetPath": "导出 Jar 文件的默认路径，默认值为 `${workspaceFolder}/${workspaceFolderBasename}.jar` 。您也可以将此选项置为空串来手动选择 jar 文件的导出目录。", "configuration.java.project.exportJar.targetPath.workspaceFolder": "导出 Jar 文件到工作空间文件夹下。Jar 文件的名称和工作空间文件夹的名称相同。", - "configuration.java.project.exportJar.targetPath.select": "您将在每次导出 Jar 文件时手动选择输出目录。", + "configuration.java.project.exportJar.targetPath.select": "在导出 Jar 文件时手动选择输出目录。", "taskDefinitions.java.project.exportJar.label": "导出 Jar 任务的名称。", "taskDefinitions.java.project.exportJar.elements": "导出 Jar 文件的内容列表。", "taskDefinitions.java.project.exportJar.mainClass": "导出 Jar 文件的 main 函数所在的类。", - "taskDefinitions.java.project.exportJar.targetPath": "导出 Jar 文件的输出路径。将会覆盖配置项: configuration.java.project.exportJar.targetPath 的值。", + "taskDefinitions.java.project.exportJar.targetPath": "导出 Jar 文件的输出路径。将会覆盖配置项 java.project.exportJar.targetPath 的值。", "taskDefinitions.java.project.exportJar.compileOutput": "在 runtime scope 内包含输出的 class 文件的文件夹。", "taskDefinitions.java.project.exportJar.testCompileOutput": "在 test scope 内包含输出的 class 文件的文件夹。", "taskDefinitions.java.project.exportJar.dependencies": "在 runtime scope 内的依赖。", From 587f99c23238f9915ca641285b1c1c8ba1c19c4e Mon Sep 17 00:00:00 2001 From: Shi Chen Date: Wed, 22 Dec 2021 14:01:28 +0800 Subject: [PATCH 4/5] refine document --- package.json | 4 ++-- package.nls.json | 3 +-- package.nls.zh.json | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8ad2a048..bc11a724 100644 --- a/package.json +++ b/package.json @@ -219,7 +219,7 @@ }, "string" ], - "markdownDescription": "%configuration.java.project.exportJar.targetPath%", + "markdownDescription": "%configuration.java.project.exportJar.targetPath.customization%", "default": "${workspaceFolder}/${workspaceFolderBasename}.jar" } } @@ -574,7 +574,7 @@ ] } ], - "description": "%taskDefinitions.java.project.exportJar.targetPath%" + "description": "%configuration.java.project.exportJar.targetPath.customization%" }, "elements": { "type": "array", diff --git a/package.nls.json b/package.nls.json index f253ac4c..98c8c576 100644 --- a/package.nls.json +++ b/package.nls.json @@ -26,13 +26,12 @@ "configuration.java.dependency.autoRefresh": "Synchronize Java Projects explorer with changes", "configuration.java.dependency.refreshDelay": "The delay time (ms) the auto refresh is invoked when changes are detected", "configuration.java.dependency.packagePresentation": "Package presentation mode: flat or hierarchical", - "configuration.java.project.exportJar.targetPath": "Specifies the output path of export jar. The default value is `${workspaceFolder}/${workspaceFolderBasename}.jar`. You can leave it empty to select the output location manually each time exporting the jar file.", + "configuration.java.project.exportJar.targetPath.customization": "The output path of the exported jar. Leave it to empty if you want to manually pick the output location.", "configuration.java.project.exportJar.targetPath.workspaceFolder": "Export the jar file into the workspace folder. Its name is the same as the folder's.", "configuration.java.project.exportJar.targetPath.select": "Select output location manually when exporting the jar file.", "taskDefinitions.java.project.exportJar.label": "The label of export jar task.", "taskDefinitions.java.project.exportJar.elements": "The content list of the exported jar.", "taskDefinitions.java.project.exportJar.mainClass": "The main class in the manifest of the exported jar.", - "taskDefinitions.java.project.exportJar.targetPath": "The output path of the exported jar. This will override setting java.project.exportJar.targetPath.", "taskDefinitions.java.project.exportJar.compileOutput": "The folders containing output class files in the runtime scope.", "taskDefinitions.java.project.exportJar.testCompileOutput": "The folders containing output class files in the test scope.", "taskDefinitions.java.project.exportJar.dependencies": "The artifact dependencies in the runtime scope.", diff --git a/package.nls.zh.json b/package.nls.zh.json index 6b7e8c13..314a8392 100644 --- a/package.nls.zh.json +++ b/package.nls.zh.json @@ -26,13 +26,12 @@ "configuration.java.dependency.autoRefresh": "在 Java 项目管理器中自动同步修改", "configuration.java.dependency.refreshDelay": "控制 Java 项目管理器刷新的延迟时间 (毫秒)", "configuration.java.dependency.packagePresentation": "Java 包显示方式: 平行显示或者分层显示", - "configuration.java.project.exportJar.targetPath": "导出 Jar 文件的默认路径，默认值为 `${workspaceFolder}/${workspaceFolderBasename}.jar` 。您也可以将此选项置为空串来手动选择 jar 文件的导出目录。", + "configuration.java.project.exportJar.targetPath.customization": "导出 Jar 文件的路径。您可以将此选项置为空串来手动选择 jar 文件的导出路径。", "configuration.java.project.exportJar.targetPath.workspaceFolder": "导出 Jar 文件到工作空间文件夹下。Jar 文件的名称和工作空间文件夹的名称相同。", "configuration.java.project.exportJar.targetPath.select": "在导出 Jar 文件时手动选择输出目录。", "taskDefinitions.java.project.exportJar.label": "导出 Jar 任务的名称。", "taskDefinitions.java.project.exportJar.elements": "导出 Jar 文件的内容列表。", "taskDefinitions.java.project.exportJar.mainClass": "导出 Jar 文件的 main 函数所在的类。", - "taskDefinitions.java.project.exportJar.targetPath": "导出 Jar 文件的输出路径。将会覆盖配置项 java.project.exportJar.targetPath 的值。", "taskDefinitions.java.project.exportJar.compileOutput": "在 runtime scope 内包含输出的 class 文件的文件夹。", "taskDefinitions.java.project.exportJar.testCompileOutput": "在 test scope 内包含输出的 class 文件的文件夹。", "taskDefinitions.java.project.exportJar.dependencies": "在 runtime scope 内的依赖。", From eab77703ea4c2c51d5d93a37471ad1a9c166ba28 Mon Sep 17 00:00:00 2001 From: Shi Chen Date: Tue, 18 Jan 2022 13:31:25 +0800 Subject: [PATCH 5/5] fix typo --- package.nls.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.nls.json b/package.nls.json index 98c8c576..c68f3bb9 100644 --- a/package.nls.json +++ b/package.nls.json @@ -26,7 +26,7 @@ "configuration.java.dependency.autoRefresh": "Synchronize Java Projects explorer with changes", "configuration.java.dependency.refreshDelay": "The delay time (ms) the auto refresh is invoked when changes are detected", "configuration.java.dependency.packagePresentation": "Package presentation mode: flat or hierarchical", - "configuration.java.project.exportJar.targetPath.customization": "The output path of the exported jar. Leave it to empty if you want to manually pick the output location.", + "configuration.java.project.exportJar.targetPath.customization": "The output path of the exported jar. Leave it empty if you want to manually pick the output location.", "configuration.java.project.exportJar.targetPath.workspaceFolder": "Export the jar file into the workspace folder. Its name is the same as the folder's.", "configuration.java.project.exportJar.targetPath.select": "Select output location manually when exporting the jar file.", "taskDefinitions.java.project.exportJar.label": "The label of export jar task.",