From 900676adc7b4419ffc80279f62d4991760fcaef0 Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Fri, 27 Jan 2023 23:19:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++ .../java/com/xwintop/xJavaFxTool/AppTest.java | 38 ------------------- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 src/test/java/com/xwintop/xJavaFxTool/AppTest.java diff --git a/.gitignore b/.gitignore index 4fff518e..1be5131b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ gradle .gradle build out +.murphy.yml +./config + diff --git a/src/test/java/com/xwintop/xJavaFxTool/AppTest.java b/src/test/java/com/xwintop/xJavaFxTool/AppTest.java deleted file mode 100644 index ad708893..00000000 --- a/src/test/java/com/xwintop/xJavaFxTool/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.xwintop.xJavaFxTool; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} -- Gitee From b0a8bcdc92d9f775f1a1dc1919c1f45bbf9aa5d2 Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Sat, 28 Jan 2023 09:39:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xwintop/xJavaFxTool/common/package-info.java | 12 ------------ .../xwintop/xJavaFxTool/controller/package-info.java | 12 ------------ .../com/xwintop/xJavaFxTool/model/package-info.java | 12 ------------ .../xwintop/xJavaFxTool/services/package-info.java | 12 ------------ .../com/xwintop/xJavaFxTool/utils/package-info.java | 12 ------------ .../com/xwintop/xJavaFxTool/view/package-info.java | 12 ------------ 6 files changed, 72 deletions(-) delete mode 100644 src/main/java/com/xwintop/xJavaFxTool/common/package-info.java delete mode 100644 src/main/java/com/xwintop/xJavaFxTool/controller/package-info.java delete mode 100644 src/main/java/com/xwintop/xJavaFxTool/model/package-info.java delete mode 100644 src/main/java/com/xwintop/xJavaFxTool/services/package-info.java delete mode 100644 src/main/java/com/xwintop/xJavaFxTool/utils/package-info.java delete mode 100644 src/main/java/com/xwintop/xJavaFxTool/view/package-info.java diff --git a/src/main/java/com/xwintop/xJavaFxTool/common/package-info.java b/src/main/java/com/xwintop/xJavaFxTool/common/package-info.java deleted file mode 100644 index f9723297..00000000 --- a/src/main/java/com/xwintop/xJavaFxTool/common/package-info.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright © 2017 公司名. All rights reserved. - * - * @Title: package-info.java - * @Prject: xJavaFxTool - * @Package: com.xwintop.xJavaFxTool.common - * @Description: 公共工具包 - * @author: xufeng - * @date: 2017年8月3日 上午8:37:58 - * @version: V1.0 - */ -package com.xwintop.xJavaFxTool.common; \ No newline at end of file diff --git a/src/main/java/com/xwintop/xJavaFxTool/controller/package-info.java b/src/main/java/com/xwintop/xJavaFxTool/controller/package-info.java deleted file mode 100644 index efcc66b8..00000000 --- a/src/main/java/com/xwintop/xJavaFxTool/controller/package-info.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright © 2017 公司名. All rights reserved. - * - * @Title: package-info.java - * @Prject: xJavaFxTool - * @Package: com.xwintop.xJavaFxTool.controller - * @Description: 视图控制层包 - * @author: xufeng - * @date: 2017年7月20日 上午9:11:11 - * @version: V1.0 - */ -package com.xwintop.xJavaFxTool.controller; \ No newline at end of file diff --git a/src/main/java/com/xwintop/xJavaFxTool/model/package-info.java b/src/main/java/com/xwintop/xJavaFxTool/model/package-info.java deleted file mode 100644 index cbc92669..00000000 --- a/src/main/java/com/xwintop/xJavaFxTool/model/package-info.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright © 2017 公司名. All rights reserved. - * - * @Title: package-info.java - * @Prject: xJavaFxTool - * @Package: com.xwintop.xJavaFxTool.model - * @Description: model层包 - * @author: xufeng - * @date: 2017年7月20日 上午9:08:17 - * @version: V1.0 - */ -package com.xwintop.xJavaFxTool.model; \ No newline at end of file diff --git a/src/main/java/com/xwintop/xJavaFxTool/services/package-info.java b/src/main/java/com/xwintop/xJavaFxTool/services/package-info.java deleted file mode 100644 index 2721ea53..00000000 --- a/src/main/java/com/xwintop/xJavaFxTool/services/package-info.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright © 2017 公司名. All rights reserved. - * - * @Title: package-info.java - * @Prject: xJavaFxTool - * @Package: com.xwintop.xJavaFxTool.services - * @Description: 服务层包 - * @author: xufeng - * @date: 2017年7月20日 上午9:12:13 - * @version: V1.0 - */ -package com.xwintop.xJavaFxTool.services; \ No newline at end of file diff --git a/src/main/java/com/xwintop/xJavaFxTool/utils/package-info.java b/src/main/java/com/xwintop/xJavaFxTool/utils/package-info.java deleted file mode 100644 index 33f9324e..00000000 --- a/src/main/java/com/xwintop/xJavaFxTool/utils/package-info.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright © 2017 公司名. All rights reserved. - * - * @Title: package-info.java - * @Prject: xJavaFxTool - * @Package: com.xwintop.xJavaFxTool.utils - * @Description: 工具类包 - * @author: xufeng - * @date: 2017年7月20日 上午9:08:01 - * @version: V1.0 - */ -package com.xwintop.xJavaFxTool.utils; \ No newline at end of file diff --git a/src/main/java/com/xwintop/xJavaFxTool/view/package-info.java b/src/main/java/com/xwintop/xJavaFxTool/view/package-info.java deleted file mode 100644 index f1169ecb..00000000 --- a/src/main/java/com/xwintop/xJavaFxTool/view/package-info.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright © 2017 公司名. All rights reserved. - * - * @Title: package-info.java - * @Prject: xJavaFxTool - * @Package: com.xwintop.xJavaFxTool.view - * @Description: 视图层包 - * @author: xufeng - * @date: 2017年7月20日 上午9:11:37 - * @version: V1.0 - */ -package com.xwintop.xJavaFxTool.view; \ No newline at end of file -- Gitee From 8dcff19772cdb278bf4ea7cee7fc747b6ddd1640 Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Sun, 29 Jan 2023 09:20:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xJavaFxTool/controller/IndexController.java | 5 +---- .../xJavaFxTool/newui/PluginCategoryController.java | 2 -- .../xwintop/xJavaFxTool/plugin/PluginClassLoader.java | 10 ---------- .../com/xwintop/xJavaFxTool/plugin/PluginManager.java | 2 +- .../com/xwintop/xJavaFxTool/services/IndexService.java | 2 -- .../java/com/xwintop/xJavaFxTool/utils/Config.java | 2 -- 6 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java index 7e228b33..46311284 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java +++ b/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java @@ -79,7 +79,7 @@ public class IndexController extends IndexView { } private void initView() { - if (Config.getBoolean(Config.Keys.NotepadEnabled, true)) { + if (Config.getBoolean(Config.Keys.NotepadEnabled, false)) { addNodepadAction(null); } this.indexService.addWebView(XJavaFxToolApplication.RESOURCE_BUNDLE.getString("feedback"), QQ_URL, null); @@ -222,9 +222,6 @@ public class IndexController extends IndexView { @FXML private void pluginManageAction() throws Exception { -// FXMLLoader fXMLLoader = PluginManageController.getFXMLLoader(); -// Parent root = fXMLLoader.load(); -// JavaFxViewUtil.openNewWindow(bundle.getString("plugin_manage"), root); new FxDialog() .setBodyFxml(PluginManageController.FXML) .setOwner(FxApp.primaryStage) diff --git a/src/main/java/com/xwintop/xJavaFxTool/newui/PluginCategoryController.java b/src/main/java/com/xwintop/xJavaFxTool/newui/PluginCategoryController.java index a32b87fa..28acc22c 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/newui/PluginCategoryController.java +++ b/src/main/java/com/xwintop/xJavaFxTool/newui/PluginCategoryController.java @@ -17,8 +17,6 @@ public class PluginCategoryController { return controller; } - /////////////////////////////////////////////////////////////// - public Label lblCategoryName; public FlowPane items; diff --git a/src/main/java/com/xwintop/xJavaFxTool/plugin/PluginClassLoader.java b/src/main/java/com/xwintop/xJavaFxTool/plugin/PluginClassLoader.java index 07b4c047..8b16b8e9 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/plugin/PluginClassLoader.java +++ b/src/main/java/com/xwintop/xJavaFxTool/plugin/PluginClassLoader.java @@ -15,16 +15,6 @@ public class PluginClassLoader extends URLClassLoader { } public static PluginClassLoader create(ClassLoader parent, File jarFile) { -// List uris = new ArrayList<>(new ClassGraph().getClasspathURIs()); -// uris.add(jarFile.toURI()); -// URL[] urls = uris.stream().map(uri -> { -// try { -// return uri.toURL(); -// } catch (MalformedURLException e) { -// throw new RuntimeException(e); -// } -// }).toArray(URL[]::new); - URL[] urls = null; try { urls = new URL[]{jarFile.toURI().toURL()}; diff --git a/src/main/java/com/xwintop/xJavaFxTool/plugin/PluginManager.java b/src/main/java/com/xwintop/xJavaFxTool/plugin/PluginManager.java index b91b6b8d..788d72d8 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/plugin/PluginManager.java +++ b/src/main/java/com/xwintop/xJavaFxTool/plugin/PluginManager.java @@ -39,7 +39,7 @@ public class PluginManager { this.loadLocalPluginConfiguration(); } - ////////////////////////////////////////////////////////////// 查询插件 + // 查询插件 public List getEnabledPluginList() { return this.pluginList.stream().filter(PluginJarInfo::getIsEnable).collect(Collectors.toList()); } diff --git a/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java b/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java index cf28f153..88b33363 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java @@ -65,8 +65,6 @@ public class IndexService { } public void addNodepadAction(ActionEvent event) { -// TextArea notepad = new TextArea(); -// addTabAction(event, notepad, indexController.getBundle().getString("addNodepad"), null); addWebView(indexController.getBundle().getString("addNodepad"),"/web/monaco-editor-0.33.0/index.html",null); } diff --git a/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java b/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java index e015844b..9b69d647 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java +++ b/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java @@ -18,8 +18,6 @@ public class Config { public static final String xJavaFxToolVersions = "V0.3.2";// xJavaFxTool版本信息 - /////////////////////////////////////////////////////////////// - public enum Keys { MainWindowWidth, MainWindowHeight, MainWindowTop, MainWindowLeft, Locale, NotepadEnabled, RememberWindowLocation, ConfirmExit, -- Gitee From 5b9b5e414919809104f2ceed1d8d6363ebe5bd67 Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Sun, 29 Jan 2023 20:48:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xwintop/xJavaFxTool/services/IndexService.java | 4 ++-- src/main/java/com/xwintop/xJavaFxTool/utils/Config.java | 5 +++-- .../xJavaFxTool/javafx/PluginProgectBuildTool.java | 9 +++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java b/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java index 88b33363..e18c1687 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java @@ -59,13 +59,13 @@ public class IndexService { XJavaFxSystemUtil.initSystemLocal(); // 初始化本地语言 new XJavaFxToolApplication().start(new Stage()); } catch (Exception e) { - e.printStackTrace(); + log.error("设置本地语言失败！", e); } }); } public void addNodepadAction(ActionEvent event) { - addWebView(indexController.getBundle().getString("addNodepad"),"/web/monaco-editor-0.33.0/index.html",null); + addWebView(indexController.getBundle().getString("addNodepad"), "/web/monaco-editor-0.33.0/index.html", null); } public void addLogConsoleAction(ActionEvent event) { diff --git a/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java b/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java index 9b69d647..a66061d9 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java +++ b/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java @@ -1,6 +1,7 @@ package com.xwintop.xJavaFxTool.utils; import com.xwintop.xcore.util.ConfigureUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.commons.lang3.math.NumberUtils; @@ -10,6 +11,7 @@ import java.util.Locale; /* * 存取框架配置 */ +@Slf4j public class Config { public static final String CONFIG_FILE_NAME = "systemConfigure.properties"; @@ -36,8 +38,7 @@ public class Config { conf.reload(); } } catch (Exception e) { - e.printStackTrace(); - + log.error("加载本地配置失败：", e); // 即使加载失败，也要返回一个内存中的 PropertiesConfiguration 对象，以免程序报错。 conf = new PropertiesConfiguration(); } diff --git a/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectBuildTool.java b/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectBuildTool.java index 8bc614fb..baf7d6f5 100644 --- a/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectBuildTool.java +++ b/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectBuildTool.java @@ -2,6 +2,7 @@ package com.xwintop.xJavaFxTool.javafx; import cn.hutool.core.text.UnicodeUtil; import cn.hutool.core.util.EscapeUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.junit.Test; @@ -15,11 +16,14 @@ import java.io.File; * @date: 2020/1/21 13:28 */ +@Slf4j public class PluginProgectBuildTool { private String projectPath = "C:/IDEA/xwintop/xJavaFxTool/src/main/"; + // private String projectPath = ""; private String resources = "resources/com/xwintop/xJavaFxTool/"; -// private String xmlPath = "assistTools/"; + + // private String xmlPath = "assistTools/"; // private String xmlPath = "codeTools/"; // private String xmlPath = "debugTools/"; // private String xmlPath = "developTools/"; @@ -28,6 +32,7 @@ public class PluginProgectBuildTool { // private String xmlPath = "littleTools/"; // private String xmlPath = "webTools/"; private String xmlPath = "javaFxTools/"; + private String srcPath = "java/com/xwintop/xJavaFxTool/"; private String pluginPath = "C:/IDEA/xJavaFxTool-plugin/"; @@ -116,7 +121,7 @@ public class PluginProgectBuildTool { FileUtils.copyFile(fromFile, toFile); } } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } } } -- Gitee