From c60bfdd598ea8735494b6cf13b1e173d7fedca80 Mon Sep 17 00:00:00 2001 From: gewuyou <1063891901@qq.com> Date: Sat, 9 Sep 2023 18:56:28 +0800 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E5=88=9D=E6=AD=A5=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/module-info.java | 10 +++++----- src/main/java/org/jcnc/jnotepad/LunchApp.java | 12 ++++++------ .../org/jcnc/jnotepad/app/config/AppConfig.java | 2 +- .../{ => common}/constants/AppConstants.java | 2 +- .../{ => common}/constants/TextConstants.java | 2 +- .../{ => common}/interfaces/BorderPaneAble.java | 2 +- .../{ => common}/interfaces/ControllerAble.java | 2 +- .../interfaces/HorizontalBoxAble.java | 2 +- .../{ => common}/interfaces/VerticalBoxAble.java | 2 +- .../{ => common}/manager/ThreadPoolManager.java | 4 ++-- .../controller/config/AppConfigController.java | 6 +++--- .../event/handler/menubar/NewFile.java | 10 +++++----- .../event/handler/menubar/OpenConfig.java | 4 ++-- .../event/handler/menubar/OpenFile.java | 16 ++++++++-------- .../event/handler/menubar/RenameFile.java | 12 ++++++------ .../event/handler/menubar/SaveAsFile.java | 2 +- .../event/handler/menubar/SaveFile.java | 14 +++++++------- .../event/handler/{tool => util}/SetBtn.java | 2 +- .../controller/i18n/LocalizationController.java | 6 +++--- .../jnotepad/controller/manager/Controller.java | 2 +- .../org/jcnc/jnotepad/plugin/ButtonPlugin.java | 2 +- .../org/jcnc/jnotepad/plugin/PluginDemo.java | 4 ++-- .../org/jcnc/jnotepad/plugin/PluginManager.java | 2 +- .../org/jcnc/jnotepad/ui/dialog/AppDialog.java | 2 +- .../jnotepad/ui/module/AbstractBorderPane.java | 2 +- .../ui/module/AbstractHorizontalBox.java | 2 +- .../jnotepad/ui/module/AbstractVerticalBox.java | 2 +- .../jnotepad/ui/module/LineNumberTextArea.java | 10 +++++----- .../ui/setstage/DeveloperDebugStage.java | 2 +- .../org/jcnc/jnotepad/ui/setstage/SetStage.java | 6 +++--- .../manager => ui/titlebar}/CustomTitleBar.java | 2 +- .../{tool => util}/EncodingDetector.java | 2 +- .../jcnc/jnotepad/{tool => util}/JsonUtil.java | 2 +- .../jcnc/jnotepad/{tool => util}/LogUtil.java | 2 +- .../jcnc/jnotepad/{tool => util}/PopUpUtil.java | 2 +- .../jnotepad/{tool => util}/SingletonUtil.java | 2 +- .../org/jcnc/jnotepad/{tool => util}/UiUtil.java | 4 ++-- .../{view => views}/manager/ViewManager.java | 4 ++-- .../{ => views}/root/RootBorderPane.java | 12 ++++++------ .../bottom/RootBottomSideBarVerticalBox.java | 4 ++-- .../root/center/main/MainBorderPane.java | 4 ++-- .../main/bottom/status/BottomStatusBox.java | 8 ++++---- .../root/center/main/center/tab/CenterTab.java | 4 ++-- .../center/main/center/tab/CenterTabPane.java | 8 ++++---- .../root/left/sidebar/tools/SidebarToolBar.java | 2 +- .../left/sidebar/tools/ToolHorizontalBox.java | 2 +- .../root/right/RootRightSideBarVerticalBox.java | 2 +- .../{ => views}/root/top/RootTopBorderPane.java | 4 ++-- .../{ => views}/root/top/menu/TopMenuBar.java | 14 +++++++------- 49 files changed, 116 insertions(+), 116 deletions(-) rename src/main/java/org/jcnc/jnotepad/{ => common}/constants/AppConstants.java (94%) rename src/main/java/org/jcnc/jnotepad/{ => common}/constants/TextConstants.java (97%) rename src/main/java/org/jcnc/jnotepad/{ => common}/interfaces/BorderPaneAble.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => common}/interfaces/ControllerAble.java (92%) rename src/main/java/org/jcnc/jnotepad/{ => common}/interfaces/HorizontalBoxAble.java (93%) rename src/main/java/org/jcnc/jnotepad/{ => common}/interfaces/VerticalBoxAble.java (93%) rename src/main/java/org/jcnc/jnotepad/{ => common}/manager/ThreadPoolManager.java (96%) rename src/main/java/org/jcnc/jnotepad/controller/event/handler/{tool => util}/SetBtn.java (90%) rename src/main/java/org/jcnc/jnotepad/{view/manager => ui/titlebar}/CustomTitleBar.java (98%) rename src/main/java/org/jcnc/jnotepad/{tool => util}/EncodingDetector.java (98%) rename src/main/java/org/jcnc/jnotepad/{tool => util}/JsonUtil.java (97%) rename src/main/java/org/jcnc/jnotepad/{tool => util}/LogUtil.java (95%) rename src/main/java/org/jcnc/jnotepad/{tool => util}/PopUpUtil.java (97%) rename src/main/java/org/jcnc/jnotepad/{tool => util}/SingletonUtil.java (97%) rename src/main/java/org/jcnc/jnotepad/{tool => util}/UiUtil.java (96%) rename src/main/java/org/jcnc/jnotepad/{view => views}/manager/ViewManager.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => views}/root/RootBorderPane.java (80%) rename src/main/java/org/jcnc/jnotepad/{ => views}/root/bottom/RootBottomSideBarVerticalBox.java (86%) rename src/main/java/org/jcnc/jnotepad/{ => views}/root/center/main/MainBorderPane.java (85%) rename src/main/java/org/jcnc/jnotepad/{ => views}/root/center/main/bottom/status/BottomStatusBox.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => views}/root/center/main/center/tab/CenterTab.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => views}/root/center/main/center/tab/CenterTabPane.java (89%) rename src/main/java/org/jcnc/jnotepad/{ => views}/root/left/sidebar/tools/SidebarToolBar.java (96%) rename src/main/java/org/jcnc/jnotepad/{ => views}/root/left/sidebar/tools/ToolHorizontalBox.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => views}/root/right/RootRightSideBarVerticalBox.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => views}/root/top/RootTopBorderPane.java (91%) rename src/main/java/org/jcnc/jnotepad/{ => views}/root/top/menu/TopMenuBar.java (95%) diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 228e229..63aaeef 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -18,16 +18,16 @@ module org.jcnc.jnotepad { exports org.jcnc.jnotepad; exports org.jcnc.jnotepad.app.config; exports org.jcnc.jnotepad.app.i18n; - exports org.jcnc.jnotepad.constants; + exports org.jcnc.jnotepad.common.constants; exports org.jcnc.jnotepad.controller.config; exports org.jcnc.jnotepad.controller.manager; exports org.jcnc.jnotepad.controller.i18n; - exports org.jcnc.jnotepad.controller.event.handler.tool; + exports org.jcnc.jnotepad.controller.event.handler.util; exports org.jcnc.jnotepad.controller.event.handler.menubar; - exports org.jcnc.jnotepad.tool; - exports org.jcnc.jnotepad.interfaces; + exports org.jcnc.jnotepad.util; + exports org.jcnc.jnotepad.common.interfaces; opens org.jcnc.jnotepad.app.config; - exports org.jcnc.jnotepad.root.center.main.bottom.status; + exports org.jcnc.jnotepad.views.root.center.main.bottom.status; exports org.jcnc.jnotepad.ui.dialog; } \ No newline at end of file diff --git a/src/main/java/org/jcnc/jnotepad/LunchApp.java b/src/main/java/org/jcnc/jnotepad/LunchApp.java index cbbe1eb..5b7afd4 100644 --- a/src/main/java/org/jcnc/jnotepad/LunchApp.java +++ b/src/main/java/org/jcnc/jnotepad/LunchApp.java @@ -7,13 +7,13 @@ import javafx.scene.layout.Pane; import javafx.stage.Stage; import javafx.stage.Window; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; -import org.jcnc.jnotepad.constants.AppConstants; -import org.jcnc.jnotepad.constants.TextConstants; +import org.jcnc.jnotepad.common.constants.AppConstants; +import org.jcnc.jnotepad.common.constants.TextConstants; +import org.jcnc.jnotepad.common.manager.ThreadPoolManager; import org.jcnc.jnotepad.controller.i18n.LocalizationController; -import org.jcnc.jnotepad.manager.ThreadPoolManager; -import org.jcnc.jnotepad.tool.SingletonUtil; -import org.jcnc.jnotepad.tool.UiUtil; -import org.jcnc.jnotepad.view.manager.ViewManager; +import org.jcnc.jnotepad.util.SingletonUtil; +import org.jcnc.jnotepad.util.UiUtil; +import org.jcnc.jnotepad.views.manager.ViewManager; import java.util.List; import java.util.Objects; diff --git a/src/main/java/org/jcnc/jnotepad/app/config/AppConfig.java b/src/main/java/org/jcnc/jnotepad/app/config/AppConfig.java index 05938af..0577198 100644 --- a/src/main/java/org/jcnc/jnotepad/app/config/AppConfig.java +++ b/src/main/java/org/jcnc/jnotepad/app/config/AppConfig.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.ArrayList; import java.util.List; -import static org.jcnc.jnotepad.constants.TextConstants.CHINESE; +import static org.jcnc.jnotepad.common.constants.TextConstants.CHINESE; /** * 数据模型类，用于表示 MyData 对象的数据结构。 diff --git a/src/main/java/org/jcnc/jnotepad/constants/AppConstants.java b/src/main/java/org/jcnc/jnotepad/common/constants/AppConstants.java similarity index 94% rename from src/main/java/org/jcnc/jnotepad/constants/AppConstants.java rename to src/main/java/org/jcnc/jnotepad/common/constants/AppConstants.java index b1fbeea..2e2d5e2 100644 --- a/src/main/java/org/jcnc/jnotepad/constants/AppConstants.java +++ b/src/main/java/org/jcnc/jnotepad/common/constants/AppConstants.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.constants; +package org.jcnc.jnotepad.common.constants; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; diff --git a/src/main/java/org/jcnc/jnotepad/constants/TextConstants.java b/src/main/java/org/jcnc/jnotepad/common/constants/TextConstants.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/constants/TextConstants.java rename to src/main/java/org/jcnc/jnotepad/common/constants/TextConstants.java index 87b67c8..535b59b 100644 --- a/src/main/java/org/jcnc/jnotepad/constants/TextConstants.java +++ b/src/main/java/org/jcnc/jnotepad/common/constants/TextConstants.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.constants; +package org.jcnc.jnotepad.common.constants; /** diff --git a/src/main/java/org/jcnc/jnotepad/interfaces/BorderPaneAble.java b/src/main/java/org/jcnc/jnotepad/common/interfaces/BorderPaneAble.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/interfaces/BorderPaneAble.java rename to src/main/java/org/jcnc/jnotepad/common/interfaces/BorderPaneAble.java index 40636e4..0e99611 100644 --- a/src/main/java/org/jcnc/jnotepad/interfaces/BorderPaneAble.java +++ b/src/main/java/org/jcnc/jnotepad/common/interfaces/BorderPaneAble.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.interfaces; +package org.jcnc.jnotepad.common.interfaces; import javafx.scene.Node; diff --git a/src/main/java/org/jcnc/jnotepad/interfaces/ControllerAble.java b/src/main/java/org/jcnc/jnotepad/common/interfaces/ControllerAble.java similarity index 92% rename from src/main/java/org/jcnc/jnotepad/interfaces/ControllerAble.java rename to src/main/java/org/jcnc/jnotepad/common/interfaces/ControllerAble.java index c8ba61c..24b951e 100644 --- a/src/main/java/org/jcnc/jnotepad/interfaces/ControllerAble.java +++ b/src/main/java/org/jcnc/jnotepad/common/interfaces/ControllerAble.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.interfaces; +package org.jcnc.jnotepad.common.interfaces; import java.util.List; diff --git a/src/main/java/org/jcnc/jnotepad/interfaces/HorizontalBoxAble.java b/src/main/java/org/jcnc/jnotepad/common/interfaces/HorizontalBoxAble.java similarity index 93% rename from src/main/java/org/jcnc/jnotepad/interfaces/HorizontalBoxAble.java rename to src/main/java/org/jcnc/jnotepad/common/interfaces/HorizontalBoxAble.java index 6b464bf..2bce9ea 100644 --- a/src/main/java/org/jcnc/jnotepad/interfaces/HorizontalBoxAble.java +++ b/src/main/java/org/jcnc/jnotepad/common/interfaces/HorizontalBoxAble.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.interfaces; +package org.jcnc.jnotepad.common.interfaces; import javafx.scene.Node; import javafx.scene.layout.HBox; diff --git a/src/main/java/org/jcnc/jnotepad/interfaces/VerticalBoxAble.java b/src/main/java/org/jcnc/jnotepad/common/interfaces/VerticalBoxAble.java similarity index 93% rename from src/main/java/org/jcnc/jnotepad/interfaces/VerticalBoxAble.java rename to src/main/java/org/jcnc/jnotepad/common/interfaces/VerticalBoxAble.java index 21d7f65..5f0e0c3 100644 --- a/src/main/java/org/jcnc/jnotepad/interfaces/VerticalBoxAble.java +++ b/src/main/java/org/jcnc/jnotepad/common/interfaces/VerticalBoxAble.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.interfaces; +package org.jcnc.jnotepad.common.interfaces; import javafx.scene.Node; import javafx.scene.layout.VBox; diff --git a/src/main/java/org/jcnc/jnotepad/manager/ThreadPoolManager.java b/src/main/java/org/jcnc/jnotepad/common/manager/ThreadPoolManager.java similarity index 96% rename from src/main/java/org/jcnc/jnotepad/manager/ThreadPoolManager.java rename to src/main/java/org/jcnc/jnotepad/common/manager/ThreadPoolManager.java index 3ad0921..709e7c8 100644 --- a/src/main/java/org/jcnc/jnotepad/manager/ThreadPoolManager.java +++ b/src/main/java/org/jcnc/jnotepad/common/manager/ThreadPoolManager.java @@ -1,6 +1,6 @@ -package org.jcnc.jnotepad.manager; +package org.jcnc.jnotepad.common.manager; -import org.jcnc.jnotepad.tool.LogUtil; +import org.jcnc.jnotepad.util.LogUtil; import org.slf4j.Logger; import java.util.concurrent.*; diff --git a/src/main/java/org/jcnc/jnotepad/controller/config/AppConfigController.java b/src/main/java/org/jcnc/jnotepad/controller/config/AppConfigController.java index a047692..3e76902 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/config/AppConfigController.java +++ b/src/main/java/org/jcnc/jnotepad/controller/config/AppConfigController.java @@ -2,9 +2,9 @@ package org.jcnc.jnotepad.controller.config; import org.jcnc.jnotepad.app.config.AppConfig; import org.jcnc.jnotepad.exception.AppException; -import org.jcnc.jnotepad.tool.JsonUtil; -import org.jcnc.jnotepad.tool.LogUtil; -import org.jcnc.jnotepad.tool.PopUpUtil; +import org.jcnc.jnotepad.util.JsonUtil; +import org.jcnc.jnotepad.util.LogUtil; +import org.jcnc.jnotepad.util.PopUpUtil; import org.slf4j.Logger; import java.io.BufferedWriter; diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/NewFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/NewFile.java index 6322bde..91214b8 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/NewFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/NewFile.java @@ -4,12 +4,12 @@ import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.scene.control.Tab; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; -import org.jcnc.jnotepad.constants.AppConstants; -import org.jcnc.jnotepad.constants.TextConstants; -import org.jcnc.jnotepad.root.center.main.bottom.status.BottomStatusBox; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTab; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTabPane; +import org.jcnc.jnotepad.common.constants.AppConstants; +import org.jcnc.jnotepad.common.constants.TextConstants; import org.jcnc.jnotepad.ui.module.LineNumberTextArea; +import org.jcnc.jnotepad.views.root.center.main.bottom.status.BottomStatusBox; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTab; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTabPane; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenConfig.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenConfig.java index 9b12eb2..548c479 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenConfig.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenConfig.java @@ -1,8 +1,8 @@ package org.jcnc.jnotepad.controller.event.handler.menubar; import javafx.event.ActionEvent; -import org.jcnc.jnotepad.tool.LogUtil; -import org.jcnc.jnotepad.tool.SingletonUtil; +import org.jcnc.jnotepad.util.LogUtil; +import org.jcnc.jnotepad.util.SingletonUtil; import java.io.File; diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenFile.java index 623c0c3..09a7f5f 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenFile.java @@ -7,15 +7,15 @@ import javafx.event.EventHandler; import javafx.scene.control.Tab; import javafx.stage.FileChooser; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; -import org.jcnc.jnotepad.constants.TextConstants; -import org.jcnc.jnotepad.manager.ThreadPoolManager; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTab; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTabPane; -import org.jcnc.jnotepad.tool.EncodingDetector; -import org.jcnc.jnotepad.tool.LogUtil; -import org.jcnc.jnotepad.tool.UiUtil; +import org.jcnc.jnotepad.common.constants.TextConstants; +import org.jcnc.jnotepad.common.manager.ThreadPoolManager; import org.jcnc.jnotepad.ui.dialog.factory.impl.BasicFileChooserFactory; import org.jcnc.jnotepad.ui.module.LineNumberTextArea; +import org.jcnc.jnotepad.util.EncodingDetector; +import org.jcnc.jnotepad.util.LogUtil; +import org.jcnc.jnotepad.util.UiUtil; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTab; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTabPane; import java.io.BufferedReader; import java.io.File; @@ -23,7 +23,7 @@ import java.io.FileReader; import java.io.IOException; import java.nio.charset.Charset; -import static org.jcnc.jnotepad.manager.ThreadPoolManager.threadContSelfSubtracting; +import static org.jcnc.jnotepad.common.manager.ThreadPoolManager.threadContSelfSubtracting; /** * 打开文件的事件处理程序。 diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/RenameFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/RenameFile.java index 41cd4c9..32cb018 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/RenameFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/RenameFile.java @@ -6,13 +6,13 @@ import javafx.scene.control.TextField; import javafx.scene.input.KeyCode; import javafx.stage.FileChooser; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; -import org.jcnc.jnotepad.constants.TextConstants; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTab; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTabPane; -import org.jcnc.jnotepad.tool.LogUtil; -import org.jcnc.jnotepad.tool.PopUpUtil; -import org.jcnc.jnotepad.tool.UiUtil; +import org.jcnc.jnotepad.common.constants.TextConstants; import org.jcnc.jnotepad.ui.dialog.factory.impl.BasicFileChooserFactory; +import org.jcnc.jnotepad.util.LogUtil; +import org.jcnc.jnotepad.util.PopUpUtil; +import org.jcnc.jnotepad.util.UiUtil; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTab; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTabPane; import org.slf4j.Logger; import java.io.File; diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/SaveAsFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/SaveAsFile.java index 7e8e6a3..fe1143c 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/SaveAsFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/SaveAsFile.java @@ -1,7 +1,7 @@ package org.jcnc.jnotepad.controller.event.handler.menubar; import javafx.event.ActionEvent; -import org.jcnc.jnotepad.tool.LogUtil; +import org.jcnc.jnotepad.util.LogUtil; /** diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/SaveFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/SaveFile.java index 1d45ca2..cb65d9b 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/SaveFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/SaveFile.java @@ -4,15 +4,15 @@ import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.stage.FileChooser; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; -import org.jcnc.jnotepad.constants.TextConstants; +import org.jcnc.jnotepad.common.constants.TextConstants; import org.jcnc.jnotepad.controller.i18n.LocalizationController; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTab; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTabPane; -import org.jcnc.jnotepad.root.top.menu.TopMenuBar; -import org.jcnc.jnotepad.tool.LogUtil; -import org.jcnc.jnotepad.tool.SingletonUtil; -import org.jcnc.jnotepad.tool.UiUtil; import org.jcnc.jnotepad.ui.dialog.factory.impl.BasicFileChooserFactory; +import org.jcnc.jnotepad.util.LogUtil; +import org.jcnc.jnotepad.util.SingletonUtil; +import org.jcnc.jnotepad.util.UiUtil; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTab; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTabPane; +import org.jcnc.jnotepad.views.root.top.menu.TopMenuBar; import org.slf4j.Logger; import java.io.File; diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/tool/SetBtn.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/util/SetBtn.java similarity index 90% rename from src/main/java/org/jcnc/jnotepad/controller/event/handler/tool/SetBtn.java rename to src/main/java/org/jcnc/jnotepad/controller/event/handler/util/SetBtn.java index d426114..4a7ddb2 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/tool/SetBtn.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/util/SetBtn.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.controller.event.handler.tool; +package org.jcnc.jnotepad.controller.event.handler.util; import javafx.event.ActionEvent; import javafx.event.EventHandler; diff --git a/src/main/java/org/jcnc/jnotepad/controller/i18n/LocalizationController.java b/src/main/java/org/jcnc/jnotepad/controller/i18n/LocalizationController.java index 7fe64f8..9e38dd1 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/i18n/LocalizationController.java +++ b/src/main/java/org/jcnc/jnotepad/controller/i18n/LocalizationController.java @@ -2,15 +2,15 @@ package org.jcnc.jnotepad.controller.i18n; import org.jcnc.jnotepad.LunchApp; import org.jcnc.jnotepad.controller.config.AppConfigController; -import org.jcnc.jnotepad.tool.SingletonUtil; +import org.jcnc.jnotepad.util.SingletonUtil; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; -import static org.jcnc.jnotepad.constants.TextConstants.CHINESE; -import static org.jcnc.jnotepad.constants.TextConstants.ENGLISH; +import static org.jcnc.jnotepad.common.constants.TextConstants.CHINESE; +import static org.jcnc.jnotepad.common.constants.TextConstants.ENGLISH; /** * 本地化控制器 diff --git a/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java b/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java index 2c8b103..0fe6a08 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java +++ b/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java @@ -1,8 +1,8 @@ package org.jcnc.jnotepad.controller.manager; +import org.jcnc.jnotepad.common.interfaces.ControllerAble; import org.jcnc.jnotepad.controller.event.handler.menubar.NewFile; import org.jcnc.jnotepad.controller.event.handler.menubar.OpenFile; -import org.jcnc.jnotepad.interfaces.ControllerAble; import java.io.File; import java.util.List; diff --git a/src/main/java/org/jcnc/jnotepad/plugin/ButtonPlugin.java b/src/main/java/org/jcnc/jnotepad/plugin/ButtonPlugin.java index 4a0da50..3e0266b 100644 --- a/src/main/java/org/jcnc/jnotepad/plugin/ButtonPlugin.java +++ b/src/main/java/org/jcnc/jnotepad/plugin/ButtonPlugin.java @@ -1,6 +1,6 @@ package org.jcnc.jnotepad.plugin; -import org.jcnc.jnotepad.tool.LogUtil; +import org.jcnc.jnotepad.util.LogUtil; /** * 新按钮插件 diff --git a/src/main/java/org/jcnc/jnotepad/plugin/PluginDemo.java b/src/main/java/org/jcnc/jnotepad/plugin/PluginDemo.java index 4a364d9..9d4fcb0 100644 --- a/src/main/java/org/jcnc/jnotepad/plugin/PluginDemo.java +++ b/src/main/java/org/jcnc/jnotepad/plugin/PluginDemo.java @@ -6,9 +6,9 @@ import javafx.scene.control.Label; import javafx.scene.layout.VBox; import javafx.stage.FileChooser; import javafx.stage.Stage; -import org.jcnc.jnotepad.tool.LogUtil; -import org.jcnc.jnotepad.tool.UiUtil; import org.jcnc.jnotepad.ui.dialog.factory.impl.BasicFileChooserFactory; +import org.jcnc.jnotepad.util.LogUtil; +import org.jcnc.jnotepad.util.UiUtil; import java.io.File; import java.util.List; diff --git a/src/main/java/org/jcnc/jnotepad/plugin/PluginManager.java b/src/main/java/org/jcnc/jnotepad/plugin/PluginManager.java index a1caa36..eb8f1e8 100644 --- a/src/main/java/org/jcnc/jnotepad/plugin/PluginManager.java +++ b/src/main/java/org/jcnc/jnotepad/plugin/PluginManager.java @@ -1,6 +1,6 @@ package org.jcnc.jnotepad.plugin; -import org.jcnc.jnotepad.tool.LogUtil; +import org.jcnc.jnotepad.util.LogUtil; import org.slf4j.Logger; import java.io.File; diff --git a/src/main/java/org/jcnc/jnotepad/ui/dialog/AppDialog.java b/src/main/java/org/jcnc/jnotepad/ui/dialog/AppDialog.java index 90b8ae4..a541f07 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/dialog/AppDialog.java +++ b/src/main/java/org/jcnc/jnotepad/ui/dialog/AppDialog.java @@ -11,7 +11,7 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; import javafx.stage.Modality; import javafx.stage.Stage; -import org.jcnc.jnotepad.tool.UiUtil; +import org.jcnc.jnotepad.util.UiUtil; import org.kordamp.ikonli.javafx.FontIcon; /** diff --git a/src/main/java/org/jcnc/jnotepad/ui/module/AbstractBorderPane.java b/src/main/java/org/jcnc/jnotepad/ui/module/AbstractBorderPane.java index 9a14b18..8a2f8b0 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/module/AbstractBorderPane.java +++ b/src/main/java/org/jcnc/jnotepad/ui/module/AbstractBorderPane.java @@ -2,7 +2,7 @@ package org.jcnc.jnotepad.ui.module; import javafx.scene.Node; import javafx.scene.layout.BorderPane; -import org.jcnc.jnotepad.interfaces.BorderPaneAble; +import org.jcnc.jnotepad.common.interfaces.BorderPaneAble; /** * 抽象边界面板类 diff --git a/src/main/java/org/jcnc/jnotepad/ui/module/AbstractHorizontalBox.java b/src/main/java/org/jcnc/jnotepad/ui/module/AbstractHorizontalBox.java index 8cb72e3..80da5be 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/module/AbstractHorizontalBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/module/AbstractHorizontalBox.java @@ -2,7 +2,7 @@ package org.jcnc.jnotepad.ui.module; import javafx.scene.Node; import javafx.scene.layout.HBox; -import org.jcnc.jnotepad.interfaces.HorizontalBoxAble; +import org.jcnc.jnotepad.common.interfaces.HorizontalBoxAble; /** * 抽象水平盒子类 diff --git a/src/main/java/org/jcnc/jnotepad/ui/module/AbstractVerticalBox.java b/src/main/java/org/jcnc/jnotepad/ui/module/AbstractVerticalBox.java index bdb2432..cb9d064 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/module/AbstractVerticalBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/module/AbstractVerticalBox.java @@ -2,7 +2,7 @@ package org.jcnc.jnotepad.ui.module; import javafx.scene.Node; import javafx.scene.layout.VBox; -import org.jcnc.jnotepad.interfaces.VerticalBoxAble; +import org.jcnc.jnotepad.common.interfaces.VerticalBoxAble; /** * 抽象垂直盒子类 diff --git a/src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java b/src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java index a917e21..fceda49 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java +++ b/src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java @@ -3,11 +3,11 @@ package org.jcnc.jnotepad.ui.module; import javafx.beans.property.StringProperty; import javafx.scene.control.TextArea; import javafx.scene.layout.BorderPane; -import org.jcnc.jnotepad.root.center.main.bottom.status.BottomStatusBox; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTab; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTabPane; -import org.jcnc.jnotepad.tool.LogUtil; -import org.jcnc.jnotepad.tool.SingletonUtil; +import org.jcnc.jnotepad.util.LogUtil; +import org.jcnc.jnotepad.util.SingletonUtil; +import org.jcnc.jnotepad.views.root.center.main.bottom.status.BottomStatusBox; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTab; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTabPane; import org.slf4j.Logger; import java.io.BufferedWriter; diff --git a/src/main/java/org/jcnc/jnotepad/ui/setstage/DeveloperDebugStage.java b/src/main/java/org/jcnc/jnotepad/ui/setstage/DeveloperDebugStage.java index b119b29..57e958f 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/setstage/DeveloperDebugStage.java +++ b/src/main/java/org/jcnc/jnotepad/ui/setstage/DeveloperDebugStage.java @@ -6,7 +6,7 @@ import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.layout.VBox; import javafx.stage.Stage; -import org.jcnc.jnotepad.tool.PopUpUtil; +import org.jcnc.jnotepad.util.PopUpUtil; /** * @author luke diff --git a/src/main/java/org/jcnc/jnotepad/ui/setstage/SetStage.java b/src/main/java/org/jcnc/jnotepad/ui/setstage/SetStage.java index a0aa1f5..2c6b2df 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/setstage/SetStage.java +++ b/src/main/java/org/jcnc/jnotepad/ui/setstage/SetStage.java @@ -12,12 +12,12 @@ import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import javafx.scene.paint.Color; import javafx.stage.Stage; -import org.jcnc.jnotepad.tool.UiUtil; import org.jcnc.jnotepad.ui.module.CustomSetButton; import org.jcnc.jnotepad.ui.module.SettingsComponent; +import org.jcnc.jnotepad.util.UiUtil; -import static org.jcnc.jnotepad.constants.AppConstants.SCREEN_LENGTH; -import static org.jcnc.jnotepad.constants.AppConstants.SCREEN_WIDTH; +import static org.jcnc.jnotepad.common.constants.AppConstants.SCREEN_LENGTH; +import static org.jcnc.jnotepad.common.constants.AppConstants.SCREEN_WIDTH; /** * SetStage类表示设置窗口的单例对象。此窗口用于显示不同的设置选项和其对应的布局。 diff --git a/src/main/java/org/jcnc/jnotepad/view/manager/CustomTitleBar.java b/src/main/java/org/jcnc/jnotepad/ui/titlebar/CustomTitleBar.java similarity index 98% rename from src/main/java/org/jcnc/jnotepad/view/manager/CustomTitleBar.java rename to src/main/java/org/jcnc/jnotepad/ui/titlebar/CustomTitleBar.java index 0102b28..b1aa68e 100644 --- a/src/main/java/org/jcnc/jnotepad/view/manager/CustomTitleBar.java +++ b/src/main/java/org/jcnc/jnotepad/ui/titlebar/CustomTitleBar.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.view.manager; +package org.jcnc.jnotepad.ui.titlebar; import javafx.animation.TranslateTransition; import javafx.geometry.Pos; diff --git a/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java b/src/main/java/org/jcnc/jnotepad/util/EncodingDetector.java similarity index 98% rename from src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java rename to src/main/java/org/jcnc/jnotepad/util/EncodingDetector.java index 5cde679..9511288 100644 --- a/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java +++ b/src/main/java/org/jcnc/jnotepad/util/EncodingDetector.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.tool; +package org.jcnc.jnotepad.util; import com.ibm.icu.text.CharsetDetector; import com.ibm.icu.text.CharsetMatch; diff --git a/src/main/java/org/jcnc/jnotepad/tool/JsonUtil.java b/src/main/java/org/jcnc/jnotepad/util/JsonUtil.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/tool/JsonUtil.java rename to src/main/java/org/jcnc/jnotepad/util/JsonUtil.java index 2b29cc9..6e29f38 100644 --- a/src/main/java/org/jcnc/jnotepad/tool/JsonUtil.java +++ b/src/main/java/org/jcnc/jnotepad/util/JsonUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.tool; +package org.jcnc.jnotepad.util; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.util.DefaultIndenter; diff --git a/src/main/java/org/jcnc/jnotepad/tool/LogUtil.java b/src/main/java/org/jcnc/jnotepad/util/LogUtil.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/tool/LogUtil.java rename to src/main/java/org/jcnc/jnotepad/util/LogUtil.java index bf0f270..34eb0d4 100644 --- a/src/main/java/org/jcnc/jnotepad/tool/LogUtil.java +++ b/src/main/java/org/jcnc/jnotepad/util/LogUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.tool; +package org.jcnc.jnotepad.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jcnc/jnotepad/tool/PopUpUtil.java b/src/main/java/org/jcnc/jnotepad/util/PopUpUtil.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/tool/PopUpUtil.java rename to src/main/java/org/jcnc/jnotepad/util/PopUpUtil.java index 1072630..a120bb5 100644 --- a/src/main/java/org/jcnc/jnotepad/tool/PopUpUtil.java +++ b/src/main/java/org/jcnc/jnotepad/util/PopUpUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.tool; +package org.jcnc.jnotepad.util; import org.jcnc.jnotepad.ui.dialog.AppDialog; diff --git a/src/main/java/org/jcnc/jnotepad/tool/SingletonUtil.java b/src/main/java/org/jcnc/jnotepad/util/SingletonUtil.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/tool/SingletonUtil.java rename to src/main/java/org/jcnc/jnotepad/util/SingletonUtil.java index cd09ade..dc52e33 100644 --- a/src/main/java/org/jcnc/jnotepad/tool/SingletonUtil.java +++ b/src/main/java/org/jcnc/jnotepad/util/SingletonUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.tool; +package org.jcnc.jnotepad.util; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; import org.jcnc.jnotepad.controller.config.AppConfigController; diff --git a/src/main/java/org/jcnc/jnotepad/tool/UiUtil.java b/src/main/java/org/jcnc/jnotepad/util/UiUtil.java similarity index 96% rename from src/main/java/org/jcnc/jnotepad/tool/UiUtil.java rename to src/main/java/org/jcnc/jnotepad/util/UiUtil.java index c06660c..808a66b 100644 --- a/src/main/java/org/jcnc/jnotepad/tool/UiUtil.java +++ b/src/main/java/org/jcnc/jnotepad/util/UiUtil.java @@ -1,10 +1,10 @@ -package org.jcnc.jnotepad.tool; +package org.jcnc.jnotepad.util; import javafx.scene.image.Image; import javafx.scene.paint.Color; import javafx.stage.Window; import org.jcnc.jnotepad.LunchApp; -import org.jcnc.jnotepad.constants.AppConstants; +import org.jcnc.jnotepad.common.constants.AppConstants; import org.kordamp.ikonli.javafx.FontIcon; import java.util.Objects; diff --git a/src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java b/src/main/java/org/jcnc/jnotepad/views/manager/ViewManager.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java rename to src/main/java/org/jcnc/jnotepad/views/manager/ViewManager.java index d4cb939..ffe07a4 100644 --- a/src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java +++ b/src/main/java/org/jcnc/jnotepad/views/manager/ViewManager.java @@ -1,9 +1,9 @@ -package org.jcnc.jnotepad.view.manager; +package org.jcnc.jnotepad.views.manager; import javafx.scene.Scene; import javafx.scene.layout.BorderPane; import org.jcnc.jnotepad.exception.AppException; -import org.jcnc.jnotepad.root.RootBorderPane; +import org.jcnc.jnotepad.views.root.RootBorderPane; /** * 视图管理器类，用于管理记事本应用程序的视图组件。 diff --git a/src/main/java/org/jcnc/jnotepad/root/RootBorderPane.java b/src/main/java/org/jcnc/jnotepad/views/root/RootBorderPane.java similarity index 80% rename from src/main/java/org/jcnc/jnotepad/root/RootBorderPane.java rename to src/main/java/org/jcnc/jnotepad/views/root/RootBorderPane.java index cb64913..bb190dc 100644 --- a/src/main/java/org/jcnc/jnotepad/root/RootBorderPane.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/RootBorderPane.java @@ -1,11 +1,11 @@ -package org.jcnc.jnotepad.root; +package org.jcnc.jnotepad.views.root; -import org.jcnc.jnotepad.root.bottom.RootBottomSideBarVerticalBox; -import org.jcnc.jnotepad.root.center.main.MainBorderPane; -import org.jcnc.jnotepad.root.left.sidebar.tools.ToolHorizontalBox; -import org.jcnc.jnotepad.root.right.RootRightSideBarVerticalBox; -import org.jcnc.jnotepad.root.top.RootTopBorderPane; import org.jcnc.jnotepad.ui.module.AbstractBorderPane; +import org.jcnc.jnotepad.views.root.bottom.RootBottomSideBarVerticalBox; +import org.jcnc.jnotepad.views.root.center.main.MainBorderPane; +import org.jcnc.jnotepad.views.root.left.sidebar.tools.ToolHorizontalBox; +import org.jcnc.jnotepad.views.root.right.RootRightSideBarVerticalBox; +import org.jcnc.jnotepad.views.root.top.RootTopBorderPane; /** * RootBorderPane 表示 JNotepad 应用程序的根布局。 diff --git a/src/main/java/org/jcnc/jnotepad/root/bottom/RootBottomSideBarVerticalBox.java b/src/main/java/org/jcnc/jnotepad/views/root/bottom/RootBottomSideBarVerticalBox.java similarity index 86% rename from src/main/java/org/jcnc/jnotepad/root/bottom/RootBottomSideBarVerticalBox.java rename to src/main/java/org/jcnc/jnotepad/views/root/bottom/RootBottomSideBarVerticalBox.java index c875249..0e649d6 100644 --- a/src/main/java/org/jcnc/jnotepad/root/bottom/RootBottomSideBarVerticalBox.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/bottom/RootBottomSideBarVerticalBox.java @@ -1,7 +1,7 @@ -package org.jcnc.jnotepad.root.bottom; +package org.jcnc.jnotepad.views.root.bottom; -import org.jcnc.jnotepad.root.center.main.bottom.status.BottomStatusBox; import org.jcnc.jnotepad.ui.module.AbstractVerticalBox; +import org.jcnc.jnotepad.views.root.center.main.bottom.status.BottomStatusBox; /** * 底部根侧边栏垂直布局 diff --git a/src/main/java/org/jcnc/jnotepad/root/center/main/MainBorderPane.java b/src/main/java/org/jcnc/jnotepad/views/root/center/main/MainBorderPane.java similarity index 85% rename from src/main/java/org/jcnc/jnotepad/root/center/main/MainBorderPane.java rename to src/main/java/org/jcnc/jnotepad/views/root/center/main/MainBorderPane.java index 2ded77f..95e9e27 100644 --- a/src/main/java/org/jcnc/jnotepad/root/center/main/MainBorderPane.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/center/main/MainBorderPane.java @@ -1,7 +1,7 @@ -package org.jcnc.jnotepad.root.center.main; +package org.jcnc.jnotepad.views.root.center.main; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTabPane; import org.jcnc.jnotepad.ui.module.AbstractBorderPane; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTabPane; /** * 主界面边界布局 diff --git a/src/main/java/org/jcnc/jnotepad/root/center/main/bottom/status/BottomStatusBox.java b/src/main/java/org/jcnc/jnotepad/views/root/center/main/bottom/status/BottomStatusBox.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/root/center/main/bottom/status/BottomStatusBox.java rename to src/main/java/org/jcnc/jnotepad/views/root/center/main/bottom/status/BottomStatusBox.java index ebd603b..eeee545 100644 --- a/src/main/java/org/jcnc/jnotepad/root/center/main/bottom/status/BottomStatusBox.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/center/main/bottom/status/BottomStatusBox.java @@ -1,14 +1,14 @@ -package org.jcnc.jnotepad.root.center.main.bottom.status; +package org.jcnc.jnotepad.views.root.center.main.bottom.status; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.Label; import javafx.scene.control.TextArea; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; -import org.jcnc.jnotepad.constants.TextConstants; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTab; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTabPane; +import org.jcnc.jnotepad.common.constants.TextConstants; import org.jcnc.jnotepad.ui.module.AbstractHorizontalBox; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTab; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTabPane; import java.nio.charset.Charset; diff --git a/src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/CenterTab.java b/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTab.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/CenterTab.java rename to src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTab.java index a424ec3..cf3ab61 100644 --- a/src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/CenterTab.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTab.java @@ -1,8 +1,8 @@ -package org.jcnc.jnotepad.root.center.main.center.tab; +package org.jcnc.jnotepad.views.root.center.main.center.tab; import javafx.scene.control.Tab; -import org.jcnc.jnotepad.tool.SingletonUtil; import org.jcnc.jnotepad.ui.module.LineNumberTextArea; +import org.jcnc.jnotepad.util.SingletonUtil; import java.io.File; import java.nio.charset.Charset; diff --git a/src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/CenterTabPane.java b/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTabPane.java similarity index 89% rename from src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/CenterTabPane.java rename to src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTabPane.java index df1fd1e..4e24790 100644 --- a/src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/CenterTabPane.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTabPane.java @@ -1,9 +1,9 @@ -package org.jcnc.jnotepad.root.center.main.center.tab; +package org.jcnc.jnotepad.views.root.center.main.center.tab; import javafx.scene.control.TabPane; -import org.jcnc.jnotepad.root.center.main.bottom.status.BottomStatusBox; -import org.jcnc.jnotepad.root.top.menu.TopMenuBar; -import org.jcnc.jnotepad.tool.SingletonUtil; +import org.jcnc.jnotepad.util.SingletonUtil; +import org.jcnc.jnotepad.views.root.center.main.bottom.status.BottomStatusBox; +import org.jcnc.jnotepad.views.root.top.menu.TopMenuBar; /** * 标签页布局组件封装。 diff --git a/src/main/java/org/jcnc/jnotepad/root/left/sidebar/tools/SidebarToolBar.java b/src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/SidebarToolBar.java similarity index 96% rename from src/main/java/org/jcnc/jnotepad/root/left/sidebar/tools/SidebarToolBar.java rename to src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/SidebarToolBar.java index 7b06885..929374b 100644 --- a/src/main/java/org/jcnc/jnotepad/root/left/sidebar/tools/SidebarToolBar.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/SidebarToolBar.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.root.left.sidebar.tools; +package org.jcnc.jnotepad.views.root.left.sidebar.tools; import javafx.scene.control.Button; import javafx.scene.image.Image; diff --git a/src/main/java/org/jcnc/jnotepad/root/left/sidebar/tools/ToolHorizontalBox.java b/src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/ToolHorizontalBox.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/root/left/sidebar/tools/ToolHorizontalBox.java rename to src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/ToolHorizontalBox.java index 291de95..0292664 100644 --- a/src/main/java/org/jcnc/jnotepad/root/left/sidebar/tools/ToolHorizontalBox.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/ToolHorizontalBox.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.root.left.sidebar.tools; +package org.jcnc.jnotepad.views.root.left.sidebar.tools; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; diff --git a/src/main/java/org/jcnc/jnotepad/root/right/RootRightSideBarVerticalBox.java b/src/main/java/org/jcnc/jnotepad/views/root/right/RootRightSideBarVerticalBox.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/root/right/RootRightSideBarVerticalBox.java rename to src/main/java/org/jcnc/jnotepad/views/root/right/RootRightSideBarVerticalBox.java index 377a2cd..1d81e15 100644 --- a/src/main/java/org/jcnc/jnotepad/root/right/RootRightSideBarVerticalBox.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/right/RootRightSideBarVerticalBox.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.root.right; +package org.jcnc.jnotepad.views.root.right; import org.jcnc.jnotepad.ui.module.AbstractVerticalBox; diff --git a/src/main/java/org/jcnc/jnotepad/root/top/RootTopBorderPane.java b/src/main/java/org/jcnc/jnotepad/views/root/top/RootTopBorderPane.java similarity index 91% rename from src/main/java/org/jcnc/jnotepad/root/top/RootTopBorderPane.java rename to src/main/java/org/jcnc/jnotepad/views/root/top/RootTopBorderPane.java index 4339071..064daa9 100644 --- a/src/main/java/org/jcnc/jnotepad/root/top/RootTopBorderPane.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/top/RootTopBorderPane.java @@ -1,7 +1,7 @@ -package org.jcnc.jnotepad.root.top; +package org.jcnc.jnotepad.views.root.top; -import org.jcnc.jnotepad.root.top.menu.TopMenuBar; import org.jcnc.jnotepad.ui.module.AbstractBorderPane; +import org.jcnc.jnotepad.views.root.top.menu.TopMenuBar; /** * RootTopBorderPane 类表示 JNotepad 应用程序的顶部边界面板。 diff --git a/src/main/java/org/jcnc/jnotepad/root/top/menu/TopMenuBar.java b/src/main/java/org/jcnc/jnotepad/views/root/top/menu/TopMenuBar.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/root/top/menu/TopMenuBar.java rename to src/main/java/org/jcnc/jnotepad/views/root/top/menu/TopMenuBar.java index a59eab2..0c35f11 100644 --- a/src/main/java/org/jcnc/jnotepad/root/top/menu/TopMenuBar.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/top/menu/TopMenuBar.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.root.top.menu; +package org.jcnc.jnotepad.views.root.top.menu; import javafx.event.ActionEvent; import javafx.scene.control.*; @@ -8,18 +8,18 @@ import org.jcnc.jnotepad.app.config.AppConfig; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; import org.jcnc.jnotepad.controller.config.AppConfigController; import org.jcnc.jnotepad.controller.event.handler.menubar.*; -import org.jcnc.jnotepad.controller.event.handler.tool.SetBtn; +import org.jcnc.jnotepad.controller.event.handler.util.SetBtn; import org.jcnc.jnotepad.controller.i18n.LocalizationController; import org.jcnc.jnotepad.plugin.PluginDemo; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTab; -import org.jcnc.jnotepad.root.center.main.center.tab.CenterTabPane; -import org.jcnc.jnotepad.root.left.sidebar.tools.SidebarToolBar; -import org.jcnc.jnotepad.tool.LogUtil; +import org.jcnc.jnotepad.util.LogUtil; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTab; +import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTabPane; +import org.jcnc.jnotepad.views.root.left.sidebar.tools.SidebarToolBar; import org.slf4j.Logger; import java.util.*; -import static org.jcnc.jnotepad.constants.TextConstants.*; +import static org.jcnc.jnotepad.common.constants.TextConstants.*; /** * 封装菜单栏组件。