From b2fbaa599b2c9c42318ed3283dbf7387038d9fd7 Mon Sep 17 00:00:00 2001 From: "XUFENG-PC\\xufeng" <1277032935@qq.com> Date: Mon, 20 Apr 2020 09:36:33 +0800 Subject: [PATCH 01/17] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9xcore?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- javaFxTools/x-JavaFxXmlToObjectCode/pom.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/javaFxTools/x-JavaFxXmlToObjectCode/pom.xml b/javaFxTools/x-JavaFxXmlToObjectCode/pom.xml index f0c475b..ccc5f30 100644 --- a/javaFxTools/x-JavaFxXmlToObjectCode/pom.xml +++ b/javaFxTools/x-JavaFxXmlToObjectCode/pom.xml @@ -45,10 +45,15 @@ com.xwintop xcore - 0.0.4-SNAPSHOT + 0.0.5 + provided + + + org.projectlombok + lombok + 1.18.6 provided - -- Gitee From b76df7580debf5ee0063f59bc6d4b11b3252db53 Mon Sep 17 00:00:00 2001 From: "XUFENG-PC\\xufeng" <1277032935@qq.com> Date: Mon, 20 Apr 2020 11:33:03 +0800 Subject: [PATCH 02/17] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=94=9F=E6=88=90=E5=B7=A5=E5=85=B7=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=8D=95=E4=B8=AA=E6=96=87=E4=BB=B6=E6=97=B6=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E9=97=B4=E9=9A=94=E7=AC=A6=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- littleTools/x-FileBuildTool/README.md | 2 ++ littleTools/x-FileBuildTool/pom.xml | 12 ++++++------ .../services/littleTools/FileBuildToolService.java | 2 +- .../view/littleTools/FileBuildToolView.java | 2 ++ .../fxmlView/littleTools/FileBuildTool.fxml | 2 ++ 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/littleTools/x-FileBuildTool/README.md b/littleTools/x-FileBuildTool/README.md index 59e0e7d..0811f94 100644 --- a/littleTools/x-FileBuildTool/README.md +++ b/littleTools/x-FileBuildTool/README.md @@ -5,3 +5,5 @@ FileBuildTool 文件生成工具 #### 版本记录 - 0.0.1 2020-04-19 1. 完成基本功能配置(根据模版批量生成文件) +- 0.0.2 + 1. 添加生成单文件时自定义间隔符 diff --git a/littleTools/x-FileBuildTool/pom.xml b/littleTools/x-FileBuildTool/pom.xml index 83b478e..e99224f 100644 --- a/littleTools/x-FileBuildTool/pom.xml +++ b/littleTools/x-FileBuildTool/pom.xml @@ -44,20 +44,20 @@ com.xwintop xcore - 0.0.3-SNAPSHOT + 0.0.5 provided - org.apache.commons - commons-csv - 1.8 + org.projectlombok + lombok + 1.18.6 + provided org.apache.commons - commons-text + commons-csv 1.8 - diff --git a/littleTools/x-FileBuildTool/src/main/java/com/xwintop/xJavaFxTool/services/littleTools/FileBuildToolService.java b/littleTools/x-FileBuildTool/src/main/java/com/xwintop/xJavaFxTool/services/littleTools/FileBuildToolService.java index 82ecda5..69ba2ba 100644 --- a/littleTools/x-FileBuildTool/src/main/java/com/xwintop/xJavaFxTool/services/littleTools/FileBuildToolService.java +++ b/littleTools/x-FileBuildTool/src/main/java/com/xwintop/xJavaFxTool/services/littleTools/FileBuildToolService.java @@ -60,7 +60,7 @@ public class FileBuildToolService { } showFileContent(fileName1, content); } else { - stringBuffer.append(content).append("\n\n"); + stringBuffer.append(content).append(StringUtils.defaultIfEmpty(fileBuildToolController.getOneFileSpaceTextField().getText(), "").replace("\\n","\n").replace("\\r","\r")); } } if (!isMoreFile) { diff --git a/littleTools/x-FileBuildTool/src/main/java/com/xwintop/xJavaFxTool/view/littleTools/FileBuildToolView.java b/littleTools/x-FileBuildTool/src/main/java/com/xwintop/xJavaFxTool/view/littleTools/FileBuildToolView.java index e73b8b9..0b81023 100644 --- a/littleTools/x-FileBuildTool/src/main/java/com/xwintop/xJavaFxTool/view/littleTools/FileBuildToolView.java +++ b/littleTools/x-FileBuildTool/src/main/java/com/xwintop/xJavaFxTool/view/littleTools/FileBuildToolView.java @@ -27,6 +27,8 @@ public abstract class FileBuildToolView implements Initializable { @FXML protected TextField fileNameTextField; @FXML + protected TextField oneFileSpaceTextField; + @FXML protected TextField outputFilePathTextField; @FXML protected Button outputFilePathButton; diff --git a/littleTools/x-FileBuildTool/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/littleTools/FileBuildTool.fxml b/littleTools/x-FileBuildTool/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/littleTools/FileBuildTool.fxml index 4672636..d4f2910 100644 --- a/littleTools/x-FileBuildTool/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/littleTools/FileBuildTool.fxml +++ b/littleTools/x-FileBuildTool/src/main/resources/com/xwintop/xJavaFxTool/fxmlView/littleTools/FileBuildTool.fxml @@ -22,6 +22,8 @@