diff --git a/core/src/main/java/com/tlcsdm/core/javafx/controlsfx/FxActionGroup.java b/core/src/main/java/com/tlcsdm/core/javafx/controlsfx/FxActionGroup.java index f9ba25279..c7866bc98 100644 --- a/core/src/main/java/com/tlcsdm/core/javafx/controlsfx/FxActionGroup.java +++ b/core/src/main/java/com/tlcsdm/core/javafx/controlsfx/FxActionGroup.java @@ -86,6 +86,14 @@ public static ActionGroup view(Action... actions) { return create(I18nUtils.get("core.menubar.view"), "/com/tlcsdm/core/static/menubar/view.png", actions); } + /** + * menubar jdkTool + */ + public static ActionGroup jdkTool(Action... actions) { + return create(I18nUtils.get("core.menubar.setting.jdkTool"), "/com/tlcsdm/core/static/icon/java.png", + actions); + } + /** * menubar language */ diff --git a/core/src/main/java/com/tlcsdm/core/javafx/controlsfx/FxJDKToolActionGroup.java b/core/src/main/java/com/tlcsdm/core/javafx/controlsfx/FxJDKToolActionGroup.java new file mode 100644 index 000000000..01bd48ade --- /dev/null +++ b/core/src/main/java/com/tlcsdm/core/javafx/controlsfx/FxJDKToolActionGroup.java @@ -0,0 +1,115 @@ +/* + * Copyright (c) 2023 unknowIfGuestInDream. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of unknowIfGuestInDream, any associated website, nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL UNKNOWIFGUESTINDREAM BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package com.tlcsdm.core.javafx.controlsfx; + +import cn.hutool.log.StaticLog; +import com.tlcsdm.core.javafx.dialog.ExceptionDialog; +import com.tlcsdm.core.javafx.helper.LayoutHelper; +import com.tlcsdm.core.javafx.util.OSUtil; +import org.controlsfx.control.action.Action; +import org.controlsfx.control.action.ActionGroup; + +import java.io.File; +import java.io.IOException; + +/** + * JDK Tool ActionGroup. + * + * @author unknowIfGuestInDream + */ +public class FxJDKToolActionGroup { + Action jmc; + Action jconsole; + Action jvisualvm; + Action jshell; + private static final String javaHome = System.getProperty("java.home"); + private static final String javaHomeEnv = System.getenv("JAVA_HOME"); + private final String jmcRelativePath; + private final String jconsoleRelativePath; + private final String jvisualvmRelativePath; + private final String jshellRelativePath; + + public FxJDKToolActionGroup() { + boolean isWin = OSUtil.getOS().equals(OSUtil.OS.WINDOWS); + jmcRelativePath = "bin" + File.separator + (isWin ? "jmc.exe" : "jmc"); + jconsoleRelativePath = "bin" + File.separator + (isWin ? "jconsole.exe" : "jconsole"); + jvisualvmRelativePath = "bin" + File.separator + (isWin ? "jvisualvm.exe" : "jvisualvm"); + jshellRelativePath = "bin" + File.separator + (isWin ? "jshell.exe" : "jshell"); + + jmc = createToolAction("jmc", jmcRelativePath, "/com/tlcsdm/core/static/icon/jmc.png"); + jconsole = createToolAction("jConsole", jconsoleRelativePath, "/com/tlcsdm/core/static/icon/java.png"); + jvisualvm = createToolAction("jvisualvm", jvisualvmRelativePath, "/com/tlcsdm/core/static/icon/jvisualvm.png"); + jshell = createToolAction("jshell", jshellRelativePath, "/com/tlcsdm/core/static/icon/jshell.png"); + } + + private Action createToolAction(String name, String relativePath, String iconPath) { + Action action = new Action(name, e -> { + File file = findToolExecutable(name, relativePath); + if (file != null) { + runProgram(file.getAbsolutePath()); + } + }); + action.setGraphic(LayoutHelper.iconView(FxJDKToolActionGroup.class.getResource(iconPath))); + + // 检查工具是否存在 + boolean toolExists = findToolExecutable(name, relativePath) != null; + if (!toolExists) { + action.setDisabled(true); + } + + return action; + } + + private File findToolExecutable(String toolName, String relativePath) { + File file = new File(javaHome, relativePath); + if (file.exists()) { + return file; + } + + file = new File(javaHomeEnv, relativePath); + if (file.exists()) { + return file; + } + + StaticLog.warn("Not found " + toolName + "."); + return null; + } + + private void runProgram(String filePath) { + ProcessBuilder builder = new ProcessBuilder("cmd", "/c", "start", filePath); + try { + builder.start(); + } catch (IOException ex) { + new ExceptionDialog(ex).show(); + } + } + + public ActionGroup create() { + return FxActionGroup.jdkTool(jmc, jconsole, jvisualvm, jshell); + } +} diff --git a/core/src/main/resources/com/tlcsdm/core/i18n/messages_en.properties b/core/src/main/resources/com/tlcsdm/core/i18n/messages_en.properties index a49cd7393..0de2881c4 100644 --- a/core/src/main/resources/com/tlcsdm/core/i18n/messages_en.properties +++ b/core/src/main/resources/com/tlcsdm/core/i18n/messages_en.properties @@ -65,6 +65,7 @@ core.menubar.file.restart=Restart core.menubar.file.exit=Exit core.menubar.setting=Setting core.menubar.setting.language=Language +core.menubar.setting.jdkTool=JDK Tool core.menubar.setting.systemSetting=System Setting core.menubar.setting.systemProperties=System Properties core.menubar.setting.colorPicker=Color Extractor diff --git a/core/src/main/resources/com/tlcsdm/core/i18n/messages_ja.properties b/core/src/main/resources/com/tlcsdm/core/i18n/messages_ja.properties index b55f8b46b..63f2a1ccd 100644 --- a/core/src/main/resources/com/tlcsdm/core/i18n/messages_ja.properties +++ b/core/src/main/resources/com/tlcsdm/core/i18n/messages_ja.properties @@ -65,6 +65,7 @@ core.menubar.file.restart=\u518D\u8D77\u52D5 core.menubar.file.exit=\u7D42\u4E86\u3059\u308B core.menubar.setting=\u8A2D\u5B9A core.menubar.setting.language=\u8A00\u8A9E +core.menubar.setting.jdkTool=JDK\u30C4\u30FC\u30EB core.menubar.setting.systemSetting=\u30B7\u30B9\u30C6\u30E0\u8A2D\u5B9A core.menubar.setting.systemProperties=\u30B7\u30B9\u30C6\u30E0\u30D7\u30ED\u30D1\u30C6\u30A3 core.menubar.setting.colorPicker=\u30AB\u30E9\u30FC\u30A8\u30AF\u30B9\u30C8\u30E9\u30AF\u30BF diff --git a/core/src/main/resources/com/tlcsdm/core/i18n/messages_zh.properties b/core/src/main/resources/com/tlcsdm/core/i18n/messages_zh.properties index 45cddb2eb..de55eec2b 100644 --- a/core/src/main/resources/com/tlcsdm/core/i18n/messages_zh.properties +++ b/core/src/main/resources/com/tlcsdm/core/i18n/messages_zh.properties @@ -65,6 +65,7 @@ core.menubar.file.restart=\u91CD\u542F core.menubar.file.exit=\u9000\u51FA core.menubar.setting=\u8BBE\u7F6E core.menubar.setting.language=\u8BED\u8A00 +core.menubar.setting.jdkTool=JDK \u5DE5\u5177 core.menubar.setting.systemSetting=\u7CFB\u7EDF\u8BBE\u7F6E core.menubar.setting.systemProperties=\u7CFB\u7EDF\u5C5E\u6027 core.menubar.setting.colorPicker=\u989C\u8272\u63D0\u53D6\u5668 diff --git a/core/src/main/resources/com/tlcsdm/core/static/icon/jmc.png b/core/src/main/resources/com/tlcsdm/core/static/icon/jmc.png new file mode 100644 index 000000000..9dadad169 Binary files /dev/null and b/core/src/main/resources/com/tlcsdm/core/static/icon/jmc.png differ diff --git a/core/src/main/resources/com/tlcsdm/core/static/icon/jmc@2x.png b/core/src/main/resources/com/tlcsdm/core/static/icon/jmc@2x.png new file mode 100644 index 000000000..92445b495 Binary files /dev/null and b/core/src/main/resources/com/tlcsdm/core/static/icon/jmc@2x.png differ diff --git a/core/src/main/resources/com/tlcsdm/core/static/icon/jshell.png b/core/src/main/resources/com/tlcsdm/core/static/icon/jshell.png new file mode 100644 index 000000000..c9a1b7ee8 Binary files /dev/null and b/core/src/main/resources/com/tlcsdm/core/static/icon/jshell.png differ diff --git a/core/src/main/resources/com/tlcsdm/core/static/icon/jshell@2x.png b/core/src/main/resources/com/tlcsdm/core/static/icon/jshell@2x.png new file mode 100644 index 000000000..512088566 Binary files /dev/null and b/core/src/main/resources/com/tlcsdm/core/static/icon/jshell@2x.png differ diff --git a/core/src/main/resources/com/tlcsdm/core/static/icon/jvisualvm.png b/core/src/main/resources/com/tlcsdm/core/static/icon/jvisualvm.png new file mode 100644 index 000000000..09899dafb Binary files /dev/null and b/core/src/main/resources/com/tlcsdm/core/static/icon/jvisualvm.png differ diff --git a/core/src/main/resources/com/tlcsdm/core/static/icon/jvisualvm@2x.png b/core/src/main/resources/com/tlcsdm/core/static/icon/jvisualvm@2x.png new file mode 100644 index 000000000..8ec7221e3 Binary files /dev/null and b/core/src/main/resources/com/tlcsdm/core/static/icon/jvisualvm@2x.png differ diff --git a/qe/src/main/java/com/tlcsdm/qe/provider/QeMenubarConfigrationProvider.java b/qe/src/main/java/com/tlcsdm/qe/provider/QeMenubarConfigrationProvider.java index 8dd1d62bf..a2646b5e6 100644 --- a/qe/src/main/java/com/tlcsdm/qe/provider/QeMenubarConfigrationProvider.java +++ b/qe/src/main/java/com/tlcsdm/qe/provider/QeMenubarConfigrationProvider.java @@ -33,6 +33,7 @@ import com.tlcsdm.core.javafx.control.DependencyTableView; import com.tlcsdm.core.javafx.controlsfx.FxAction; import com.tlcsdm.core.javafx.controlsfx.FxActionGroup; +import com.tlcsdm.core.javafx.controlsfx.FxJDKToolActionGroup; import com.tlcsdm.core.javafx.controlsfx.FxLanguageActionGroup; import com.tlcsdm.core.javafx.dialog.FxAlerts; import com.tlcsdm.core.javafx.dialog.FxButtonType; @@ -181,6 +182,8 @@ public class QeMenubarConfigrationProvider implements MenubarConfigration { private final Action release = FxAction.release(actionEvent -> CoreUtil.openWeb(QeConstant.PROJECT_RELEASE_URL)); + private final ActionGroup jdkToolGroup = new FxJDKToolActionGroup().create(); + private final ActionGroup languageGroup = new FxLanguageActionGroup((s) -> { if (FxAlerts.confirmOkCancel(I18nUtils.get("qe.menubar.setting.language.dialog.title"), I18nUtils.get("qe.menubar.setting.language.dialog.message"))) { @@ -191,7 +194,7 @@ public class QeMenubarConfigrationProvider implements MenubarConfigration { private final Collection actions = List.of( FxActionGroup.file(export, induct, ACTION_SEPARATOR, restart, exit), FxActionGroup.setting(systemSetting, languageGroup), - FxActionGroup.tool(logConsole, pathWatch, colorPicker, screenshot), + FxActionGroup.tool(jdkToolGroup, ACTION_SEPARATOR, logConsole, pathWatch, colorPicker, screenshot), FxActionGroup.help(openSysConfig, openLogDir, openUserData, openPropertiesDialog, ACTION_SEPARATOR, contactSupport, submitFeedback, ACTION_SEPARATOR, api, css, fxml, ACTION_SEPARATOR, helpContent, release, about)); diff --git a/smc/src/main/java/com/tlcsdm/smc/provider/SmcMenubarConfigrationProvider.java b/smc/src/main/java/com/tlcsdm/smc/provider/SmcMenubarConfigrationProvider.java index 0f50bc9bd..0da7e3067 100644 --- a/smc/src/main/java/com/tlcsdm/smc/provider/SmcMenubarConfigrationProvider.java +++ b/smc/src/main/java/com/tlcsdm/smc/provider/SmcMenubarConfigrationProvider.java @@ -31,6 +31,7 @@ import com.tlcsdm.core.javafx.control.DependencyTableView; import com.tlcsdm.core.javafx.controlsfx.FxAction; import com.tlcsdm.core.javafx.controlsfx.FxActionGroup; +import com.tlcsdm.core.javafx.controlsfx.FxJDKToolActionGroup; import com.tlcsdm.core.javafx.controlsfx.FxLanguageActionGroup; import com.tlcsdm.core.javafx.dialog.FxAlerts; import com.tlcsdm.core.javafx.dialog.FxButtonType; @@ -178,6 +179,8 @@ public class SmcMenubarConfigrationProvider implements MenubarConfigration { private final Action release = FxAction.release(actionEvent -> CoreUtil.openWeb(SmcConstant.PROJECT_RELEASE_URL)); + private final ActionGroup jdkToolGroup = new FxJDKToolActionGroup().create(); + private final ActionGroup languageGroup = new FxLanguageActionGroup((s) -> { if (FxAlerts.confirmOkCancel(I18nUtils.get("smc.menubar.setting.language.dialog.title"), I18nUtils.get("smc.menubar.setting.language.dialog.message"))) { @@ -190,7 +193,7 @@ public class SmcMenubarConfigrationProvider implements MenubarConfigration { private final Collection actions = List.of( FxActionGroup.file(export, induct, ACTION_SEPARATOR, restart, exit), FxActionGroup.setting(preferences, languageGroup), FxActionGroup.view(fullscreen), - FxActionGroup.tool(logConsole, pathWatch, colorPicker, screenshot), + FxActionGroup.tool(jdkToolGroup, ACTION_SEPARATOR, logConsole, pathWatch, colorPicker, screenshot), FxActionGroup.help(openSysConfig, openLogDir, openUserData, openPropertiesDialog, ACTION_SEPARATOR, contactSupport, submitFeedback, ACTION_SEPARATOR, api, css, fxml, ACTION_SEPARATOR, helpContent, release, about));