From f34869c757bace73a167b2a19c937264836d9013 Mon Sep 17 00:00:00 2001
From: zhouzongqing <1558175113@qq.com>
Date: Fri, 29 Nov 2024 15:44:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=8F=92?=
=?UTF-8?q?=E4=BB=B6fxml=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fxmlView/littleTools/HbaseTool.fxml | 139 ------------------
.../config/toolFxmlLoaderConfiguration.xml | 2 +-
.../config/toolFxmlLoaderConfiguration.xml | 2 +-
3 files changed, 2 insertions(+), 141 deletions(-)
delete mode 100644 debugTools/x-HbaseTool/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/littleTools/HbaseTool.fxml
diff --git a/debugTools/x-HbaseTool/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/littleTools/HbaseTool.fxml b/debugTools/x-HbaseTool/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/littleTools/HbaseTool.fxml
deleted file mode 100644
index a75dfd7f..00000000
--- a/debugTools/x-HbaseTool/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/littleTools/HbaseTool.fxml
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/debugTools/x-HbaseTool/src/main/resources/config/toolFxmlLoaderConfiguration.xml b/debugTools/x-HbaseTool/src/main/resources/config/toolFxmlLoaderConfiguration.xml
index 94dde598..876064d4 100644
--- a/debugTools/x-HbaseTool/src/main/resources/config/toolFxmlLoaderConfiguration.xml
+++ b/debugTools/x-HbaseTool/src/main/resources/config/toolFxmlLoaderConfiguration.xml
@@ -2,7 +2,7 @@
- /com/xwintop/xJavaFxTool/fxmlView/javaFxTools/HbaseTool.fxml
+ /com/xwintop/xJavaFxTool/fxmlView/debugTools/HbaseTool.fxml
locale.HbaseTool
Title
diff --git a/games/x-pet/src/main/resources/config/toolFxmlLoaderConfiguration.xml b/games/x-pet/src/main/resources/config/toolFxmlLoaderConfiguration.xml
index 5d213eec..216b6108 100644
--- a/games/x-pet/src/main/resources/config/toolFxmlLoaderConfiguration.xml
+++ b/games/x-pet/src/main/resources/config/toolFxmlLoaderConfiguration.xml
@@ -2,7 +2,7 @@
- /com/xwintop/xJavaFxTool/fxmlView/javaFxTools/pet.fxml
+ /com/xwintop/xJavaFxTool/fxmlView/games/pet.fxml
locale.pet
Title
--
Gitee
From 8b7010858d7faa77390edf50b039314cd07496e5 Mon Sep 17 00:00:00 2001
From: zhouzongqing <1558175113@qq.com>
Date: Fri, 29 Nov 2024 16:26:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8DHdfsTool=E6=8F=92?=
=?UTF-8?q?=E4=BB=B6=E7=A9=BA=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/littleTools/HdfsToolController.java | 7 ++++---
.../xJavaFxTool/services/littleTools/HdfsToolService.java | 5 ++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/littleTools/x-HdfsTool/src/main/java/com/xwintop/xJavaFxTool/controller/littleTools/HdfsToolController.java b/littleTools/x-HdfsTool/src/main/java/com/xwintop/xJavaFxTool/controller/littleTools/HdfsToolController.java
index d93c6e8a..db9b4d49 100644
--- a/littleTools/x-HdfsTool/src/main/java/com/xwintop/xJavaFxTool/controller/littleTools/HdfsToolController.java
+++ b/littleTools/x-HdfsTool/src/main/java/com/xwintop/xJavaFxTool/controller/littleTools/HdfsToolController.java
@@ -12,6 +12,7 @@ import javafx.event.Event;
import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.*;
+import javafx.scene.image.ImageView;
import javafx.scene.input.MouseButton;
import javafx.util.Callback;
import lombok.Getter;
@@ -68,7 +69,7 @@ public class HdfsToolController extends HdfsToolView {
JavaFxViewUtil.setSpinnerValueFactory(fileSizeFromSpinner, 0, Integer.MAX_VALUE, 0);
JavaFxViewUtil.setSpinnerValueFactory(fileSizeToSpinner, 0, Integer.MAX_VALUE, 0);
try {
- hdfsListTreeView.setRoot(new TreeItem<>(HdfsToolService.getTreeItemMap("/"), BeanUtil.toBean(directorySvgGlyph, Node.class)));
+ hdfsListTreeView.setRoot(new TreeItem<>(HdfsToolService.getTreeItemMap("/"), BeanUtil.toBean(directorySvgGlyph, ImageView.class)));
} catch (Exception e) {
log.error("设置图标失败", e);
}
@@ -86,9 +87,9 @@ public class HdfsToolController extends HdfsToolView {
if (item != null) {
try {
if ("true".equals(searchResultTableData.get(this.getIndex()).get("isDirectory"))) {
- this.setGraphic(BeanUtil.toBean(directorySvgGlyph, Node.class));
+ this.setGraphic(BeanUtil.toBean(directorySvgGlyph, ImageView.class));
} else {
- this.setGraphic(BeanUtil.toBean(fileSvgGlyph, Node.class));
+ this.setGraphic(BeanUtil.toBean(fileSvgGlyph, ImageView.class));
}
} catch (Exception e) {
log.warn("设置图标失败：" + item, e);
diff --git a/littleTools/x-HdfsTool/src/main/java/com/xwintop/xJavaFxTool/services/littleTools/HdfsToolService.java b/littleTools/x-HdfsTool/src/main/java/com/xwintop/xJavaFxTool/services/littleTools/HdfsToolService.java
index 066c2c2e..8e67a4bd 100644
--- a/littleTools/x-HdfsTool/src/main/java/com/xwintop/xJavaFxTool/services/littleTools/HdfsToolService.java
+++ b/littleTools/x-HdfsTool/src/main/java/com/xwintop/xJavaFxTool/services/littleTools/HdfsToolService.java
@@ -7,7 +7,6 @@ import com.xwintop.xcore.util.javafx.AlertUtil;
import com.xwintop.xcore.util.javafx.FileChooserUtil;
import com.xwintop.xcore.util.javafx.TooltipUtil;
import javafx.embed.swing.SwingFXUtils;
-import javafx.scene.Node;
import javafx.scene.control.TreeItem;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
@@ -105,9 +104,9 @@ public class HdfsToolService {
String fileName = f.getPath().getName();
TreeItem> treeItem2 = new TreeItem<>(getTreeItemMap(fileName));
if (f.isDirectory()) {
- treeItem2.setGraphic(BeanUtil.toBean(hdfsToolController.getDirectorySvgGlyph(), Node.class));
+ treeItem2.setGraphic(BeanUtil.toBean(hdfsToolController.getDirectorySvgGlyph(), ImageView.class));
} else {
- treeItem2.setGraphic(BeanUtil.toBean(hdfsToolController.getFileSvgGlyph(), Node.class));
+ treeItem2.setGraphic(BeanUtil.toBean(hdfsToolController.getFileSvgGlyph(), ImageView.class));
}
treeItem2.getValue().put("fileSize", f.getLen());
treeItem.getChildren().add(treeItem2);
--
Gitee
From 22c328e0e020d9ebb2e825425f086dfdbf190c91 Mon Sep 17 00:00:00 2001
From: zhouzongqing <1558175113@qq.com>
Date: Fri, 29 Nov 2024 16:53:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?:zap:=20=E5=BC=80=E5=90=AF=E5=BC=82?=
=?UTF-8?q?=E6=AD=A5=E7=BA=BF=E7=A8=8B=E6=A3=80=E6=9F=A5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/xwintop/xJavaFxTool/XJavaFxToolApplication.java | 9 ++++++++-
.../main/java/com/xwintop/xcore/util/VersionChecker.java | 4 ++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/xJavaFxTool/src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolApplication.java b/xJavaFxTool/src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolApplication.java
index 9d636be6..e942ab3e 100644
--- a/xJavaFxTool/src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolApplication.java
+++ b/xJavaFxTool/src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolApplication.java
@@ -32,6 +32,7 @@ import javax.imageio.ImageIO;
import java.awt.*;
import java.io.IOException;
import java.util.ResourceBundle;
+import java.util.concurrent.CompletableFuture;
/**
* JavaFX 入口，从 Java 9+ 开始入口类不应再包含 main 方法。
@@ -70,7 +71,13 @@ public class XJavaFxToolApplication extends Application {
loadClassicUI(primaryStage);
StageUtils.loadPrimaryStageBound(primaryStage);
- primaryStage.setOnShown(windowEvent -> VersionChecker.checkerVersion("https://gitee.com/api/v5/repos/xwintop/xJavaFxTool/releases/latest", "https://gitee.com/xwintop/xJavaFxTool/releases", Config.xJavaFxToolVersions.substring(1)));
+ primaryStage.setOnShown(windowEvent ->
+ CompletableFuture.runAsync(() ->
+ VersionChecker.checkerVersion("https://gitee.com/api/v5/repos/xwintop/xJavaFxTool/releases/latest",
+ "https://gitee.com/xwintop/xJavaFxTool/releases",
+ Config.xJavaFxToolVersions.substring(1))
+ )
+ );
primaryStage.show();
}
diff --git a/xcore/src/main/java/com/xwintop/xcore/util/VersionChecker.java b/xcore/src/main/java/com/xwintop/xcore/util/VersionChecker.java
index f5dde631..30809897 100644
--- a/xcore/src/main/java/com/xwintop/xcore/util/VersionChecker.java
+++ b/xcore/src/main/java/com/xwintop/xcore/util/VersionChecker.java
@@ -42,9 +42,9 @@ public class VersionChecker {
}
public static void hasNewVersion(String url, String localVersion, BiConsumer runnable) {
- String json = HttpUtil.get(url);
- JSONObject jsonObject = JSON.parseObject(json);
try {
+ String json = HttpUtil.get(url);
+ JSONObject jsonObject = JSON.parseObject(json);
final String latestVersion = jsonObject.getString("tag_name");
final String features = jsonObject.getString("body");
compareAndRun(latestVersion, features, localVersion, runnable);
--
Gitee