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 4d0ea883..79f6f6aa 100644 --- a/package.json +++ b/package.json @@ -210,18 +210,16 @@ { "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.select%" ] }, "string" ], - "markdownDescription": "%configuration.java.project.exportJar.targetPath%", + "markdownDescription": "%configuration.java.project.exportJar.targetPath.customization%", "default": "${workspaceFolder}/${workspaceFolderBasename}.jar" } } @@ -561,7 +559,22 @@ }, "targetPath": { "type": "string", - "description": "%taskDefinitions.java.project.exportJar.targetPath%" + "anyOf": [ + { + "type": "string" + }, + { + "enum": [ + "${workspaceFolder}/${workspaceFolderBasename}.jar", + "" + ], + "enumDescriptions": [ + "%configuration.java.project.exportJar.targetPath.workspaceFolder%", + "%configuration.java.project.exportJar.targetPath.select%" + ] + } + ], + "description": "%configuration.java.project.exportJar.targetPath.customization%" }, "elements": { "type": "array", diff --git a/package.nls.json b/package.nls.json index b7534d58..c68f3bb9 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`. 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.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.askUser": "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.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 a24c56cb..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` 。您也可以将此选项置为空串或 `askUser` 来手动选择 jar 文件的导出目录。", + "configuration.java.project.exportJar.targetPath.customization": "导出 Jar 文件的路径。您可以将此选项置为空串来手动选择 jar 文件的导出路径。", "configuration.java.project.exportJar.targetPath.workspaceFolder": "导出 Jar 文件到工作空间文件夹下。Jar 文件的名称和工作空间文件夹的名称相同。", - "configuration.java.project.exportJar.targetPath.askUser": "您将在每次导出 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.compileOutput": "在 runtime scope 内包含输出的 class 文件的文件夹。", "taskDefinitions.java.project.exportJar.testCompileOutput": "在 test scope 内包含输出的 class 文件的文件夹。", "taskDefinitions.java.project.exportJar.dependencies": "在 runtime scope 内的依赖。",