From b77eb84bde2b21e1699ac2ce9456a7a47b7615ae Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Tue, 30 Aug 2022 09:30:39 +0800 Subject: [PATCH 01/18] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=AF=B9jdk17?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 43e5d864..70a0086a 100755 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,8 @@ UTF-8 true - 1.8 - 1.8 + 17 + 17 @@ -40,7 +40,7 @@ com.gitee.xwintop xcore - 0.0.8 + 0.0.8-jdk17 org.projectlombok -- Gitee From 70b67c4714e62bc6131bcc212286c2b63cd76652 Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Tue, 30 Aug 2022 09:30:39 +0800 Subject: [PATCH 02/18] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=AF=B9jdk17?= =?UTF-8?q?=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 43e5d864..70a0086a 100755 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,8 @@ UTF-8 true - 1.8 - 1.8 + 17 + 17 @@ -40,7 +40,7 @@ com.gitee.xwintop xcore - 0.0.8 + 0.0.8-jdk17 org.projectlombok -- Gitee From 0227f8ec435135cf84cf65641c624b39656cbd71 Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Sat, 24 Sep 2022 19:11:45 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0jpro=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 42 ++++++++++++++++--- .../controller/IndexController.java | 2 +- .../xJavaFxTool/services/IndexService.java | 23 ++++++++-- .../xwintop/xJavaFxTool/fxmlView/Index.fxml | 2 +- 4 files changed, 57 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 70a0086a..d79fbcc5 100755 --- a/pom.xml +++ b/pom.xml @@ -19,15 +19,20 @@ true 17 17 + 2022.1.3 + + + + + + + + - aliyunmaven - https://maven.aliyun.com/repository/public - - - jitpack.io - https://jitpack.io + jpro - sandec repository + https://sandec.jfrog.io/ui/native/repo @@ -48,9 +53,34 @@ 1.18.24 provided + + com.sandec.jpro + jpro-webapi + ${jpro.version} + compile + + + + jpro - sandec repository + https://sandec.jfrog.io/ui/native/repo + + + + com.sandec.jpro + jpro-maven-plugin + ${jpro.version} + + false + + + + com.xwintop.xJavaFxTool.XJavaFxToolApplication + / + + org.apache.maven.plugins maven-assembly-plugin diff --git a/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java index 7e228b33..422576ea 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java +++ b/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java @@ -83,7 +83,7 @@ public class IndexController extends IndexView { addNodepadAction(null); } this.indexService.addWebView(XJavaFxToolApplication.RESOURCE_BUNDLE.getString("feedback"), QQ_URL, null); - this.tongjiWebView.getEngine().load(STATISTICS_URL); +// this.tongjiWebView.getEngine().load(STATISTICS_URL); this.tabPaneMain.getSelectionModel().select(0); } diff --git a/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java b/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java index cf28f153..c46444ee 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java @@ -1,5 +1,6 @@ package com.xwintop.xJavaFxTool.services; +import com.jpro.webapi.HTMLView; import com.xwintop.xJavaFxTool.AppException; import com.xwintop.xJavaFxTool.XJavaFxToolApplication; import com.xwintop.xJavaFxTool.common.logback.ConsoleLogAppender; @@ -10,6 +11,7 @@ import com.xwintop.xJavaFxTool.utils.Config; import com.xwintop.xJavaFxTool.utils.XJavaFxSystemUtil; import com.xwintop.xcore.javafx.dialog.FxAlerts; import com.xwintop.xcore.util.javafx.AlertUtil; +import com.xwintop.xcore.util.javafx.JavaFxSystemUtil; import com.xwintop.xcore.util.javafx.JavaFxViewUtil; import javafx.application.Platform; import javafx.event.ActionEvent; @@ -17,6 +19,7 @@ import javafx.event.Event; import javafx.event.EventHandler; import javafx.fxml.FXMLLoader; import javafx.scene.Node; +import javafx.scene.Scene; import javafx.scene.control.Tab; import javafx.scene.control.TabPane; import javafx.scene.control.TextArea; @@ -26,11 +29,15 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.Region; import javafx.scene.web.WebEngine; import javafx.scene.web.WebView; +import javafx.stage.Modality; import javafx.stage.Stage; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; +import java.io.IOException; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -192,16 +199,24 @@ public class IndexService { } public static Tab loadWebViewAsTab(PluginJarInfo plugin, TabPane tabPane, boolean singleWindowBoot) { - WebView browser = new WebView(); - WebEngine webEngine = browser.getEngine(); +// WebView browser = new WebView(); +// WebEngine webEngine = browser.getEngine(); String url = plugin.getPagePath(); String title = plugin.getTitle(); + HTMLView browser = null; if (url.startsWith("http")) { - webEngine.load(url); +// webEngine.load(url); + String contentIframe2 = ""; + browser = new HTMLView(contentIframe2); } else { PluginContainer pluginContainer = new PluginContainer(plugin); - webEngine.load(pluginContainer.getResource(url).toExternalForm()); +// webEngine.load(pluginContainer.getResource(url).toExternalForm()); + try { + browser = new HTMLView(IOUtils.toString(pluginContainer.getResource(url).openStream(),"utf-8")); + } catch (IOException e) { + throw new RuntimeException(e); + } } if (singleWindowBoot) { diff --git a/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml b/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml index cfad9491..40bc8788 100644 --- a/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml +++ b/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml @@ -69,7 +69,7 @@ - + -- Gitee From ff1b95af54d9c7b08bd29aee27399f78181416ed Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Mon, 30 Jan 2023 15:13:42 +0800 Subject: [PATCH 04/18] =?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 --- src/main/resources/application.yaml | 5 ----- .../xJavaFxTool/javafx/PluginProgectPomBuildTool.java | 2 +- .../com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 src/main/resources/application.yaml diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml deleted file mode 100644 index 4e536d40..00000000 --- a/src/main/resources/application.yaml +++ /dev/null @@ -1,5 +0,0 @@ -server: - port: 10820 -spring: - jmx: - enabled: false diff --git a/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectPomBuildTool.java b/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectPomBuildTool.java index 0fd25e1f..eace52eb 100644 --- a/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectPomBuildTool.java +++ b/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectPomBuildTool.java @@ -116,7 +116,7 @@ public class PluginProgectPomBuildTool { " try {\n" + " launch(args);\n" + " } catch (Exception e) {\n" + - " e.printStackTrace();\n" + + " log.error(e.getMessage(), e);\n" + " }\n" + " }\n" + "\n" + diff --git a/src/test/java/com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java b/src/test/java/com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java index 9081f8b7..b410d53b 100644 --- a/src/test/java/com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java +++ b/src/test/java/com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java @@ -8,7 +8,6 @@ import org.junit.Test; public class TableBeanTool { @Test public void buildTableBean(){ -// Class beanClass = EmailToolTableBean.class; Class beanClass = this.getClass(); Field[] fields = FieldUtils.getAllFields(beanClass); StringBuffer soutStringBuffer = new StringBuffer();//输出字符串 -- Gitee From 6976b0f3eb182cea4e2fe8240a21e800a464a39e Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Tue, 31 Jan 2023 17:00:00 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xwintop/xJavaFxTool/utils/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java b/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java index a66061d9..179a1240 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java +++ b/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java @@ -18,7 +18,7 @@ public class Config { public static Locale defaultLocale = Locale.getDefault();// 设置系统语言 - public static final String xJavaFxToolVersions = "V0.3.2";// xJavaFxTool版本信息 + public static final String xJavaFxToolVersions = "V0.3.3";// xJavaFxTool版本信息 public enum Keys { MainWindowWidth, MainWindowHeight, MainWindowTop, MainWindowLeft, -- Gitee From 2e15adecacbd9d8557fc137cb8c274daf4f97e0f Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Sat, 24 Sep 2022 19:15:53 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ffd58352..87543174 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ xJavaFxTool是使用javaFx开发的实用小工具集，利用业余时间把工 由于SpringBoot的火热，项目已经出SpringBoot-javafx版本，[xJavaFxTool-spring](https://gitee.com/xwintop/xJavaFxTool-spring) 欢迎参考，谢谢。 #### 下载地址： +- 在线体验地址：[http://xjavafxtool.xwintop.com](http://xjavafxtool.xwintop.com) 在线版功能有缺失，仅供体验，请下载安装包本地安装部署使用 - 可直接运行的jar包(本地需要有jdk17环境)[xJavaFxTool-0.3.2.jar](https://gitee.com/xwintop/xJavaFxTool/attach_files/1022632/download/xJavaFxTool-0.3.2.jar) - Windows x64安装包(兼容windows7、8、10、11等系统)[xJavaFxTool-0.3.2-windows-x64.exe](https://gitee.com/xwintop/xJavaFxTool/attach_files/1022629/download/xJavaFxTool_0.3.2-windows-x64.exe) - Linux x64 [xJavaFxTool-0.3.2-linux-x64.zip](https://gitee.com/xwintop/xJavaFxTool/attach_files/1022631/download/xJavaFxTool-0.3.2-linux-x64.zip) -- Gitee From c5d57819c2ca751cf29b9914c16973c2b9dead12 Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Thu, 19 Jan 2023 11:20:33 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 58 +++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 87543174..4efee92e 100644 --- a/README.md +++ b/README.md @@ -134,35 +134,35 @@ xJavaFxTool ├─ pom.xml maven配置文件 ├─ README.md 说明文件 ├─ src -│  ├─ main -│  │  ├─ java -│  │  │  └─ com -│  │  │  └─ xwintop -│  │  │  └─ xJavaFxTool -│  │  │  ├─ common 第三方工具类 -│  │  │  ├─ controller javafx控制层 -│  │  │  │  └─ index 首页控制层 -│  │  │  ├─ model 基础bean类层 -│  │  │  ├─ services 工具服务层 -│  │  │  │  └─ index 首页工具服务层 -│  │  │  ├─ utils 系统工具类 -│  │  │  └─ view javafx视图层 -│  │  │  └─ index 首页工具视图层 -│  │  └─ resources -│  │  ├─ com -│  │  │  └─ xwintop -│  │  │  └─ xJavaFxTool -│  │  │  └─ fxmlView .fxml文件 -│  │  ├─ config 配置文件 -│  │  │  └─ toolFxmlLoaderConfiguration.xml 系统菜单加载配置文件 -│  │  ├─ css 样式资源 -│  │  ├─ images 图片资源 -│  │  ├─ locale 国际化 -│  │  ├─ banner.txt 启动banner图片 -│  │  └─ logback.xml logback日志配置文件 -│  └─ test 测试类 -│  ├─ java -│  └─ resources +│ ├─ main +│ │ ├─ java +│ │ │ └─ com +│ │ │ └─ xwintop +│ │ │ └─ xJavaFxTool +│ │ │ ├─ common 第三方工具类 +│ │ │ ├─ controller javafx控制层 +│ │ │ │ └─ index 首页控制层 +│ │ │ ├─ model 基础bean类层 +│ │ │ ├─ services 工具服务层 +│ │ │ │ └─ index 首页工具服务层 +│ │ │ ├─ utils 系统工具类 +│ │ │ └─ view javafx视图层 +│ │ │ └─ index 首页工具视图层 +│ │ └─ resources +│ │ ├─ com +│ │ │ └─ xwintop +│ │ │ └─ xJavaFxTool +│ │ │ └─ fxmlView .fxml文件 +│ │ ├─ config 配置文件 +│ │ │ └─ toolFxmlLoaderConfiguration.xml 系统菜单加载配置文件 +│ │ ├─ css 样式资源 +│ │ ├─ images 图片资源 +│ │ ├─ locale 国际化 +│ │ ├─ banner.txt 启动banner图片 +│ │ └─ logback.xml logback日志配置文件 +│ └─ test 测试类 +│ ├─ java +│ └─ resources ``` -- Gitee From 30a31c9028edbb76733ec5814e4790062957ecc4 Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Fri, 27 Jan 2023 23:19:15 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme=E6=96=87?= =?UTF-8?q?=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 bbe072c7ac3c3963957652395b49934fa7164b2f Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Sat, 28 Jan 2023 09:39:16 +0800 Subject: [PATCH 09/18] =?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 53658f7e1c5b0d434fdc55a70cc73f2f526e142d Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Sun, 29 Jan 2023 09:20:08 +0800 Subject: [PATCH 10/18] =?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 422576ea..008f5c87 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 c46444ee..15e180f4 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java @@ -72,8 +72,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 703f7d20fd0887c3256d7db5cf071489e2c99956 Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Sun, 29 Jan 2023 20:48:22 +0800 Subject: [PATCH 11/18] =?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 15e180f4..789d1326 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java @@ -66,13 +66,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 From 0fa2a81bf34fc6af2b95bc4ed2e006183e19fe48 Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Mon, 30 Jan 2023 15:13:42 +0800 Subject: [PATCH 12/18] =?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 --- src/main/resources/application.yaml | 5 ----- .../xJavaFxTool/javafx/PluginProgectPomBuildTool.java | 2 +- .../com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 src/main/resources/application.yaml diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml deleted file mode 100644 index 4e536d40..00000000 --- a/src/main/resources/application.yaml +++ /dev/null @@ -1,5 +0,0 @@ -server: - port: 10820 -spring: - jmx: - enabled: false diff --git a/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectPomBuildTool.java b/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectPomBuildTool.java index 0fd25e1f..eace52eb 100644 --- a/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectPomBuildTool.java +++ b/src/test/java/com/xwintop/xJavaFxTool/javafx/PluginProgectPomBuildTool.java @@ -116,7 +116,7 @@ public class PluginProgectPomBuildTool { " try {\n" + " launch(args);\n" + " } catch (Exception e) {\n" + - " e.printStackTrace();\n" + + " log.error(e.getMessage(), e);\n" + " }\n" + " }\n" + "\n" + diff --git a/src/test/java/com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java b/src/test/java/com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java index 9081f8b7..b410d53b 100644 --- a/src/test/java/com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java +++ b/src/test/java/com/xwintop/xJavaFxTool/javafx/tool/TableBeanTool.java @@ -8,7 +8,6 @@ import org.junit.Test; public class TableBeanTool { @Test public void buildTableBean(){ -// Class beanClass = EmailToolTableBean.class; Class beanClass = this.getClass(); Field[] fields = FieldUtils.getAllFields(beanClass); StringBuffer soutStringBuffer = new StringBuffer();//输出字符串 -- Gitee From 7f429619ea132b464aeccafd40869f49d259510a Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Tue, 31 Jan 2023 17:00:00 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xwintop/xJavaFxTool/utils/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java b/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java index a66061d9..179a1240 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java +++ b/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java @@ -18,7 +18,7 @@ public class Config { public static Locale defaultLocale = Locale.getDefault();// 设置系统语言 - public static final String xJavaFxToolVersions = "V0.3.2";// xJavaFxTool版本信息 + public static final String xJavaFxToolVersions = "V0.3.3";// xJavaFxTool版本信息 public enum Keys { MainWindowWidth, MainWindowHeight, MainWindowTop, MainWindowLeft, -- Gitee From eb278a4f8614a93fa65d63eb1f16188da75af06f Mon Sep 17 00:00:00 2001 From: xufeng <1277032935@qq.com> Date: Wed, 1 Feb 2023 16:38:47 +0800 Subject: [PATCH 14/18] =?UTF-8?q?1.=E7=A7=BB=E5=8A=A8=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=8C=85=E8=B7=AF=E5=BE=84=EF=BC=9B2.=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=85=B3=E9=97=ADtab=E6=97=B6=E8=B7=B3=E8=BD=AC=E8=87=B3?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- .../controller/IndexController.java | 4 ++-- .../plugin}/PluginCategoryController.java | 4 ++-- .../plugin}/PluginItemController.java | 4 ++-- .../xJavaFxTool/services/IndexService.java | 20 +++++++++---------- .../xwintop/xJavaFxTool/fxmlView/Index.fxml | 2 +- .../fxmlView/{newui => plugin}/main.css | 0 .../{newui => plugin}/plugin-category.fxml | 2 +- .../{newui => plugin}/plugin-item.fxml | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) rename src/main/java/com/xwintop/xJavaFxTool/{newui => controller/plugin}/PluginCategoryController.java (85%) rename src/main/java/com/xwintop/xJavaFxTool/{newui => controller/plugin}/PluginItemController.java (97%) rename src/main/resources/com/xwintop/xJavaFxTool/fxmlView/{newui => plugin}/main.css (100%) rename src/main/resources/com/xwintop/xJavaFxTool/fxmlView/{newui => plugin}/plugin-category.fxml (81%) rename src/main/resources/com/xwintop/xJavaFxTool/fxmlView/{newui => plugin}/plugin-item.fxml (87%) diff --git a/pom.xml b/pom.xml index d79fbcc5..b7c92e6b 100755 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,8 @@ UTF-8 true - 17 - 17 + 8 + 8 2022.1.3 @@ -45,7 +45,7 @@ com.gitee.xwintop xcore - 0.0.8-jdk17 + 0.0.8 org.projectlombok diff --git a/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java index 008f5c87..fb3356e6 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java +++ b/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java @@ -5,8 +5,8 @@ import com.xwintop.xJavaFxTool.controller.index.PluginManageController; import com.xwintop.xJavaFxTool.event.AppEvents; import com.xwintop.xJavaFxTool.event.PluginEvent; import com.xwintop.xJavaFxTool.model.PluginJarInfo; -import com.xwintop.xJavaFxTool.newui.PluginCategoryController; -import com.xwintop.xJavaFxTool.newui.PluginItemController; +import com.xwintop.xJavaFxTool.controller.plugin.PluginCategoryController; +import com.xwintop.xJavaFxTool.controller.plugin.PluginItemController; import com.xwintop.xJavaFxTool.plugin.PluginManager; import com.xwintop.xJavaFxTool.plugin.PluginParser; import com.xwintop.xJavaFxTool.services.IndexService; diff --git a/src/main/java/com/xwintop/xJavaFxTool/newui/PluginCategoryController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/plugin/PluginCategoryController.java similarity index 85% rename from src/main/java/com/xwintop/xJavaFxTool/newui/PluginCategoryController.java rename to src/main/java/com/xwintop/xJavaFxTool/controller/plugin/PluginCategoryController.java index 28acc22c..22aba720 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/newui/PluginCategoryController.java +++ b/src/main/java/com/xwintop/xJavaFxTool/controller/plugin/PluginCategoryController.java @@ -1,4 +1,4 @@ -package com.xwintop.xJavaFxTool.newui; +package com.xwintop.xJavaFxTool.controller.plugin; import com.xwintop.xcore.javafx.helper.FxmlHelper; import javafx.fxml.FXMLLoader; @@ -10,7 +10,7 @@ public class PluginCategoryController { public static PluginCategoryController newInstance(String categoryName) { FXMLLoader fxmlLoader = FxmlHelper.loadFromResource( - "/com/xwintop/xJavaFxTool/fxmlView/newui/plugin-category.fxml" + "/com/xwintop/xJavaFxTool/fxmlView/plugin/plugin-category.fxml" ); PluginCategoryController controller = fxmlLoader.getController(); controller.lblCategoryName.setText(categoryName); diff --git a/src/main/java/com/xwintop/xJavaFxTool/newui/PluginItemController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/plugin/PluginItemController.java similarity index 97% rename from src/main/java/com/xwintop/xJavaFxTool/newui/PluginItemController.java rename to src/main/java/com/xwintop/xJavaFxTool/controller/plugin/PluginItemController.java index 108948e5..e1c19ce8 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/newui/PluginItemController.java +++ b/src/main/java/com/xwintop/xJavaFxTool/controller/plugin/PluginItemController.java @@ -1,4 +1,4 @@ -package com.xwintop.xJavaFxTool.newui; +package com.xwintop.xJavaFxTool.controller.plugin; import com.xwintop.xJavaFxTool.controller.IndexController; import com.xwintop.xJavaFxTool.model.PluginJarInfo; @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; @Data @Slf4j public class PluginItemController { - public static final String FXML_PATH = "/com/xwintop/xJavaFxTool/fxmlView/newui/plugin-item.fxml"; + public static final String FXML_PATH = "/com/xwintop/xJavaFxTool/fxmlView/plugin/plugin-item.fxml"; public static PluginItemController newInstance(PluginJarInfo pluginJarInfo) { FXMLLoader fxmlLoader = FxmlHelper.loadFromResource(FXML_PATH); diff --git a/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java b/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java index 789d1326..18e0465c 100644 --- a/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java +++ b/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java @@ -11,7 +11,6 @@ import com.xwintop.xJavaFxTool.utils.Config; import com.xwintop.xJavaFxTool.utils.XJavaFxSystemUtil; import com.xwintop.xcore.javafx.dialog.FxAlerts; import com.xwintop.xcore.util.javafx.AlertUtil; -import com.xwintop.xcore.util.javafx.JavaFxSystemUtil; import com.xwintop.xcore.util.javafx.JavaFxViewUtil; import javafx.application.Platform; import javafx.event.ActionEvent; @@ -19,7 +18,6 @@ import javafx.event.Event; import javafx.event.EventHandler; import javafx.fxml.FXMLLoader; import javafx.scene.Node; -import javafx.scene.Scene; import javafx.scene.control.Tab; import javafx.scene.control.TabPane; import javafx.scene.control.TextArea; @@ -27,13 +25,9 @@ import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.layout.BorderPane; import javafx.scene.layout.Region; -import javafx.scene.web.WebEngine; -import javafx.scene.web.WebView; -import javafx.stage.Modality; import javafx.stage.Stage; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -98,7 +92,10 @@ public class IndexService { indexController.getTabPaneMain().getSelectionModel().select(tab); } if (closeRequest != null) { - tab.setOnCloseRequest(closeRequest); + tab.setOnCloseRequest(event1 -> { + closeRequest.handle(event1); + indexController.getTabPaneMain().getSelectionModel().select(0); + }); } } } @@ -135,7 +132,10 @@ public class IndexService { } if (tab != null) { - tab.setOnClosed(event -> this.jarInfoMap.remove(pluginJarInfo)); + tab.setOnClosed(event -> { + this.jarInfoMap.remove(pluginJarInfo); + indexController.getTabPaneMain().getSelectionModel().select(0); + }); jarInfoMap.put(pluginJarInfo, tab); } } @@ -205,13 +205,13 @@ public class IndexService { HTMLView browser = null; if (url.startsWith("http")) { // webEngine.load(url); - String contentIframe2 = ""; + String contentIframe2 = ""; browser = new HTMLView(contentIframe2); } else { PluginContainer pluginContainer = new PluginContainer(plugin); // webEngine.load(pluginContainer.getResource(url).toExternalForm()); try { - browser = new HTMLView(IOUtils.toString(pluginContainer.getResource(url).openStream(),"utf-8")); + browser = new HTMLView(IOUtils.toString(pluginContainer.getResource(url).openStream(), "utf-8")); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml b/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml index 40bc8788..633a616e 100644 --- a/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml +++ b/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/Index.fxml @@ -4,7 +4,7 @@ -