From 36ac4c87f12adec89b1c28bfe43e42093bc6189c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E8=BD=B2?= Date: Wed, 11 Oct 2023 02:43:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/module-info.java | 30 +++++++++---------- .../java/org/jcnc/jnotepad/JnotepadApp.java | 2 +- .../config/BaseConfigController.java | 6 ++-- .../bottom/AbstractFunctionChildrenBox.java | 2 +- .../core/views/top/menu/AbstractTopMenu.java | 4 +-- .../common/constants/AppConstants.java | 2 +- .../constants/SplitPaneItemConstants.java | 2 +- .../common/constants/TextConstants.java | 2 +- .../manager/ApplicationCacheManager.java | 2 +- .../common/manager/ThreadPoolManager.java | 4 +-- .../jcnc/jnotepad/app/config/AppConfig.java | 4 +-- .../app/manager/ApplicationManager.java | 20 ++++++------- .../{ => app}/util/ClipboardUtil.java | 2 +- .../{ => app}/util/EncodingDetector.java | 2 +- .../jnotepad/{ => app}/util/FileUtil.java | 2 +- .../jnotepad/{ => app}/util/JsonUtil.java | 2 +- .../jcnc/jnotepad/{ => app}/util/LogUtil.java | 2 +- .../{ => app}/util/NotificationUtil.java | 4 +-- .../jnotepad/{ => app}/util/PopUpUtil.java | 6 ++-- .../jnotepad/{ => app}/util/ResourceUtil.java | 2 +- .../jcnc/jnotepad/{ => app}/util/TabUtil.java | 24 +++++++-------- .../jcnc/jnotepad/{ => app}/util/UiUtil.java | 4 +-- .../controller/ResourceController.java | 2 +- .../controller/cache/CacheController.java | 6 ++-- .../config/AppConfigController.java | 4 +-- .../config/PluginConfigController.java | 2 +- .../config/UserConfigController.java | 4 +-- .../event/handler/menuitem/NewFile.java | 2 +- .../event/handler/menuitem/OpenConfig.java | 4 +-- .../event/handler/menuitem/OpenFile.java | 10 +++---- .../event/handler/menuitem/RenameFile.java | 4 +-- .../event/handler/menuitem/SaveAsFile.java | 6 ++-- .../event/handler/menuitem/SaveFile.java | 4 +-- .../event/handler/toolbar/DirTreeBtn.java | 2 +- .../event/handler/toolbar/OpenDirectory.java | 12 ++++---- .../event/handler/toolbar/RunBtn.java | 2 +- .../event/handler/toolbar/SetBtn.java | 2 +- .../i18n/LocalizationController.java | 4 +-- .../controller/manager/Controller.java | 8 ++--- .../{ => controller}/plugin/PluginLoader.java | 12 ++++---- .../plugin/PluginManagerInterface.java | 12 ++++---- .../plugin/interfaces/Plugin.java | 2 +- .../plugin/manager/PluginManager.java | 10 +++---- .../model/entity/PluginDescriptor.java | 2 +- .../component/module/TextCodeArea.java | 2 +- .../module/base/AbstractBorderPane.java | 4 +-- .../module/base/AbstractHorizontalBox.java | 4 +-- .../module/base/AbstractVerticalBox.java | 4 +-- .../module/hbox/CustomTitleBarBox.java | 2 +- .../module/interfaces/BorderPaneAble.java | 2 +- .../module/interfaces/ControllerAble.java | 2 +- .../module/interfaces/HorizontalBoxAble.java | 2 +- .../module/interfaces/VerticalBoxAble.java | 2 +- .../component/module/vbox/BuildPanel.java | 8 ++--- .../vbox/components/CmdTerminalBox.java | 4 +-- .../module/vbox/components/DebugBox.java | 4 +-- .../module/vbox/components/RunBox.java | 4 +-- .../stage/dialog/AppDialogBuilder.java | 6 ++-- .../stage/dialog/AppDialogStage.java | 4 +-- .../factory/DirectoryChooserFactory.java | 2 +- .../dialog/factory/FileChooserFactory.java | 2 +- .../impl/BasicDirectoryChooserFactory.java | 4 +-- .../factory/impl/BasicFileChooserFactory.java | 4 +-- .../dialog/interfaces/DialogButtonAction.java | 4 +-- .../stage/setting/CustomSetButton.java | 2 +- .../component/stage/setting/SetDevBox.java | 2 +- .../component/stage/setting/SetStage.java | 18 +++++------ .../topmenu/builder/StageButtonBuilder.java | 2 +- .../topmenu/help/DeveloperDebugPaneStage.java | 10 +++---- .../stage/topmenu/help/HelpPaneStage.java | 12 ++++---- .../stage/topmenu/plugin/CustomSplitPane.java | 2 +- .../topmenu/plugin/PluginManagementPane.java | 12 ++++---- .../views/manager/BottomStatusBoxManager.java | 12 ++++---- .../views/manager/BuildPanelManager.java | 6 ++-- .../views/manager/CenterTabPaneManager.java | 16 +++++----- .../manager/DirectorySidebarManager.java | 12 ++++---- .../views/manager/MainBorderPaneManager.java | 12 ++++---- .../views/manager/RootBorderPaneManager.java | 14 ++++----- .../RootBottomSideBarVerticalBoxManager.java | 8 ++--- .../{ => ui}/views/manager/RootManager.java | 4 +-- .../RootRightSideBarVerticalBoxManager.java | 4 +-- .../manager/RootTopBorderPaneManager.java | 6 ++-- .../views/manager/SidebarToolBarManager.java | 6 ++-- .../views/manager/TopMenuBarManager.java | 8 ++--- .../{ => ui}/views/root/RootBorderPane.java | 4 +-- .../bottom/RootBottomSideBarVerticalBox.java | 4 +-- .../root/bottom/function/FunctionBox.java | 2 +- .../root/bottom/status/BottomStatusBox.java | 4 +-- .../root/center/main/MainBorderPane.java | 4 +-- .../directory/DirectorySidebarPane.java | 4 +-- .../center/main/center/tab/CenterTab.java | 14 ++++----- .../center/main/center/tab/CenterTabPane.java | 2 +- .../left/sidebar/tools/SidebarToolBar.java | 2 +- .../left/sidebar/tools/ToolVerticalBox.java | 4 +-- .../right/RootRightSideBarVerticalBox.java | 4 +-- .../views/root/top/RootTopBorderPane.java | 4 +-- .../views/root/top/menubar/TopMenuBar.java | 6 ++-- .../root/top/menubar/menu/FileTopMenu.java | 4 +-- .../root/top/menubar/menu/HelpTopMenu.java | 8 ++--- .../top/menubar/menu/LanguageTopMenu.java | 4 +-- .../root/top/menubar/menu/PluginTopMenu.java | 6 ++-- .../root/top/menubar/menu/RunTopMenu.java | 16 +++++----- .../root/top/menubar/menu/SettingTopMenu.java | 8 ++--- 103 files changed, 294 insertions(+), 294 deletions(-) rename src/main/java/org/jcnc/jnotepad/{ => app}/common/constants/AppConstants.java (97%) rename src/main/java/org/jcnc/jnotepad/{ => app}/common/constants/SplitPaneItemConstants.java (93%) rename src/main/java/org/jcnc/jnotepad/{ => app}/common/constants/TextConstants.java (98%) rename src/main/java/org/jcnc/jnotepad/{ => app}/common/manager/ApplicationCacheManager.java (94%) rename src/main/java/org/jcnc/jnotepad/{ => app}/common/manager/ThreadPoolManager.java (96%) rename src/main/java/org/jcnc/jnotepad/{ => app}/util/ClipboardUtil.java (96%) rename src/main/java/org/jcnc/jnotepad/{ => app}/util/EncodingDetector.java (98%) rename src/main/java/org/jcnc/jnotepad/{ => app}/util/FileUtil.java (99%) rename src/main/java/org/jcnc/jnotepad/{ => app}/util/JsonUtil.java (98%) rename src/main/java/org/jcnc/jnotepad/{ => app}/util/LogUtil.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => app}/util/NotificationUtil.java (97%) rename src/main/java/org/jcnc/jnotepad/{ => app}/util/PopUpUtil.java (96%) rename src/main/java/org/jcnc/jnotepad/{ => app}/util/ResourceUtil.java (98%) rename src/main/java/org/jcnc/jnotepad/{ => app}/util/TabUtil.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => app}/util/UiUtil.java (98%) rename src/main/java/org/jcnc/jnotepad/{ => controller}/plugin/PluginLoader.java (97%) rename src/main/java/org/jcnc/jnotepad/{ => controller}/plugin/PluginManagerInterface.java (92%) rename src/main/java/org/jcnc/jnotepad/{ => controller}/plugin/interfaces/Plugin.java (84%) rename src/main/java/org/jcnc/jnotepad/{ => controller}/plugin/manager/PluginManager.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/TextCodeArea.java (99%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/base/AbstractBorderPane.java (90%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/base/AbstractHorizontalBox.java (91%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/base/AbstractVerticalBox.java (91%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/hbox/CustomTitleBarBox.java (98%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/interfaces/BorderPaneAble.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/interfaces/ControllerAble.java (92%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/interfaces/HorizontalBoxAble.java (93%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/interfaces/VerticalBoxAble.java (93%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/vbox/BuildPanel.java (87%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/vbox/components/CmdTerminalBox.java (97%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/vbox/components/DebugBox.java (85%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/module/vbox/components/RunBox.java (84%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/dialog/AppDialogBuilder.java (97%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/dialog/AppDialogStage.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/dialog/factory/DirectoryChooserFactory.java (93%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/dialog/factory/FileChooserFactory.java (94%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/dialog/factory/impl/BasicDirectoryChooserFactory.java (90%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/dialog/factory/impl/BasicFileChooserFactory.java (94%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/dialog/interfaces/DialogButtonAction.java (72%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/setting/CustomSetButton.java (79%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/setting/SetDevBox.java (97%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/setting/SetStage.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/topmenu/builder/StageButtonBuilder.java (92%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/topmenu/help/DeveloperDebugPaneStage.java (94%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/topmenu/help/HelpPaneStage.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/topmenu/plugin/CustomSplitPane.java (96%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/component/stage/topmenu/plugin/PluginManagementPane.java (97%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/manager/BottomStatusBoxManager.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/manager/BuildPanelManager.java (89%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/manager/CenterTabPaneManager.java (95%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/manager/DirectorySidebarManager.java (92%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/manager/MainBorderPaneManager.java (81%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/manager/RootBorderPaneManager.java (74%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/manager/RootBottomSideBarVerticalBoxManager.java (81%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/manager/RootManager.java (98%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/manager/RootRightSideBarVerticalBoxManager.java (85%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/manager/RootTopBorderPaneManager.java (80%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/manager/SidebarToolBarManager.java (94%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/manager/TopMenuBarManager.java (94%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/RootBorderPane.java (85%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/bottom/RootBottomSideBarVerticalBox.java (87%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/bottom/function/FunctionBox.java (92%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/bottom/status/BottomStatusBox.java (87%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/center/main/MainBorderPane.java (80%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/center/main/center/directory/DirectorySidebarPane.java (89%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/center/main/center/tab/CenterTab.java (93%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/center/main/center/tab/CenterTabPane.java (84%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/left/sidebar/tools/SidebarToolBar.java (96%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/left/sidebar/tools/ToolVerticalBox.java (86%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/right/RootRightSideBarVerticalBox.java (85%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/top/RootTopBorderPane.java (85%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/top/menubar/TopMenuBar.java (96%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/top/menubar/menu/FileTopMenu.java (93%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/top/menubar/menu/HelpTopMenu.java (83%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/top/menubar/menu/LanguageTopMenu.java (96%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/top/menubar/menu/PluginTopMenu.java (86%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/top/menubar/menu/RunTopMenu.java (89%) rename src/main/java/org/jcnc/jnotepad/{ => ui}/views/root/top/menubar/menu/SettingTopMenu.java (90%) diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 40812fd..2c2066c 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -24,30 +24,30 @@ module org.jcnc.jnotepad { exports org.jcnc.jnotepad.model.enums; exports org.jcnc.jnotepad.app.config; exports org.jcnc.jnotepad.app.i18n; - exports org.jcnc.jnotepad.common.constants; + exports org.jcnc.jnotepad.app.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.toolbar; exports org.jcnc.jnotepad.controller.event.handler.menuitem; - exports org.jcnc.jnotepad.component.module.interfaces; + exports org.jcnc.jnotepad.ui.component.module.interfaces; opens org.jcnc.jnotepad.app.config; - exports org.jcnc.jnotepad.plugin.interfaces; - exports org.jcnc.jnotepad.views.root.bottom.function; + exports org.jcnc.jnotepad.controller.plugin.interfaces; + exports org.jcnc.jnotepad.ui.views.root.bottom.function; - exports org.jcnc.jnotepad.component.module; + exports org.jcnc.jnotepad.ui.component.module; exports org.jcnc.jnotepad.model.entity; - exports org.jcnc.jnotepad.views.root.bottom; - exports org.jcnc.jnotepad.views.root.bottom.status; + exports org.jcnc.jnotepad.ui.views.root.bottom; + exports org.jcnc.jnotepad.ui.views.root.bottom.status; exports org.jcnc.jnotepad.api.core.views.sidebar.bottom; exports org.jcnc.jnotepad.api.core.controller.config; - exports org.jcnc.jnotepad.component.module.base; - exports org.jcnc.jnotepad.component.stage.setting; - exports org.jcnc.jnotepad.component.module.vbox; - exports org.jcnc.jnotepad.component.module.hbox; - exports org.jcnc.jnotepad.component.stage.topmenu.help; - exports org.jcnc.jnotepad.component.stage.topmenu.plugin; - exports org.jcnc.jnotepad.component.module.vbox.components; - exports org.jcnc.jnotepad.views.root.center.main.center.tab; + exports org.jcnc.jnotepad.ui.component.module.base; + exports org.jcnc.jnotepad.ui.component.stage.setting; + exports org.jcnc.jnotepad.ui.component.module.vbox; + exports org.jcnc.jnotepad.ui.component.module.hbox; + exports org.jcnc.jnotepad.ui.component.stage.topmenu.help; + exports org.jcnc.jnotepad.ui.component.stage.topmenu.plugin; + exports org.jcnc.jnotepad.ui.component.module.vbox.components; + exports org.jcnc.jnotepad.ui.views.root.center.main.center.tab; } \ No newline at end of file diff --git a/src/main/java/org/jcnc/jnotepad/JnotepadApp.java b/src/main/java/org/jcnc/jnotepad/JnotepadApp.java index d2ccd29..8d2abe2 100644 --- a/src/main/java/org/jcnc/jnotepad/JnotepadApp.java +++ b/src/main/java/org/jcnc/jnotepad/JnotepadApp.java @@ -3,7 +3,7 @@ package org.jcnc.jnotepad; import javafx.application.Application; import javafx.stage.Stage; import org.jcnc.jnotepad.app.manager.ApplicationManager; -import org.jcnc.jnotepad.util.LogUtil; +import org.jcnc.jnotepad.app.util.LogUtil; /** diff --git a/src/main/java/org/jcnc/jnotepad/api/core/controller/config/BaseConfigController.java b/src/main/java/org/jcnc/jnotepad/api/core/controller/config/BaseConfigController.java index 174c16d..5d04c42 100644 --- a/src/main/java/org/jcnc/jnotepad/api/core/controller/config/BaseConfigController.java +++ b/src/main/java/org/jcnc/jnotepad/api/core/controller/config/BaseConfigController.java @@ -1,10 +1,10 @@ package org.jcnc.jnotepad.api.core.controller.config; import org.jcnc.jnotepad.api.core.controller.interfaces.ConfigController; +import org.jcnc.jnotepad.app.util.JsonUtil; +import org.jcnc.jnotepad.app.util.LogUtil; +import org.jcnc.jnotepad.app.util.PopUpUtil; import org.jcnc.jnotepad.controller.exception.AppException; -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/api/core/views/sidebar/bottom/AbstractFunctionChildrenBox.java b/src/main/java/org/jcnc/jnotepad/api/core/views/sidebar/bottom/AbstractFunctionChildrenBox.java index 59e3fba..7e61c8a 100644 --- a/src/main/java/org/jcnc/jnotepad/api/core/views/sidebar/bottom/AbstractFunctionChildrenBox.java +++ b/src/main/java/org/jcnc/jnotepad/api/core/views/sidebar/bottom/AbstractFunctionChildrenBox.java @@ -3,7 +3,7 @@ package org.jcnc.jnotepad.api.core.views.sidebar.bottom; import javafx.scene.control.Label; import javafx.scene.control.Menu; import javafx.scene.control.MenuBar; -import org.jcnc.jnotepad.views.root.bottom.function.FunctionBox; +import org.jcnc.jnotepad.ui.views.root.bottom.function.FunctionBox; /** * 子功能栏抽象类 diff --git a/src/main/java/org/jcnc/jnotepad/api/core/views/top/menu/AbstractTopMenu.java b/src/main/java/org/jcnc/jnotepad/api/core/views/top/menu/AbstractTopMenu.java index 3b9b06d..d2154bc 100644 --- a/src/main/java/org/jcnc/jnotepad/api/core/views/top/menu/AbstractTopMenu.java +++ b/src/main/java/org/jcnc/jnotepad/api/core/views/top/menu/AbstractTopMenu.java @@ -8,8 +8,8 @@ import javafx.scene.control.Menu; import javafx.scene.control.MenuItem; import javafx.scene.control.RadioMenuItem; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; -import org.jcnc.jnotepad.util.LogUtil; -import org.jcnc.jnotepad.views.root.top.menubar.TopMenuBar; +import org.jcnc.jnotepad.app.util.LogUtil; +import org.jcnc.jnotepad.ui.views.root.top.menubar.TopMenuBar; import org.slf4j.Logger; import java.util.Map; diff --git a/src/main/java/org/jcnc/jnotepad/common/constants/AppConstants.java b/src/main/java/org/jcnc/jnotepad/app/common/constants/AppConstants.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/common/constants/AppConstants.java rename to src/main/java/org/jcnc/jnotepad/app/common/constants/AppConstants.java index 3c50b82..ebc7d32 100644 --- a/src/main/java/org/jcnc/jnotepad/common/constants/AppConstants.java +++ b/src/main/java/org/jcnc/jnotepad/app/common/constants/AppConstants.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.common.constants; +package org.jcnc.jnotepad.app.common.constants; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; diff --git a/src/main/java/org/jcnc/jnotepad/common/constants/SplitPaneItemConstants.java b/src/main/java/org/jcnc/jnotepad/app/common/constants/SplitPaneItemConstants.java similarity index 93% rename from src/main/java/org/jcnc/jnotepad/common/constants/SplitPaneItemConstants.java rename to src/main/java/org/jcnc/jnotepad/app/common/constants/SplitPaneItemConstants.java index c6e2e20..44c5ccf 100644 --- a/src/main/java/org/jcnc/jnotepad/common/constants/SplitPaneItemConstants.java +++ b/src/main/java/org/jcnc/jnotepad/app/common/constants/SplitPaneItemConstants.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.common.constants; +package org.jcnc.jnotepad.app.common.constants; /** * SplitPane常量类 diff --git a/src/main/java/org/jcnc/jnotepad/common/constants/TextConstants.java b/src/main/java/org/jcnc/jnotepad/app/common/constants/TextConstants.java similarity index 98% rename from src/main/java/org/jcnc/jnotepad/common/constants/TextConstants.java rename to src/main/java/org/jcnc/jnotepad/app/common/constants/TextConstants.java index 098964a..a881d26 100644 --- a/src/main/java/org/jcnc/jnotepad/common/constants/TextConstants.java +++ b/src/main/java/org/jcnc/jnotepad/app/common/constants/TextConstants.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.common.constants; +package org.jcnc.jnotepad.app.common.constants; /** * 文本常量类，包含多处使用的文本常量。 diff --git a/src/main/java/org/jcnc/jnotepad/common/manager/ApplicationCacheManager.java b/src/main/java/org/jcnc/jnotepad/app/common/manager/ApplicationCacheManager.java similarity index 94% rename from src/main/java/org/jcnc/jnotepad/common/manager/ApplicationCacheManager.java rename to src/main/java/org/jcnc/jnotepad/app/common/manager/ApplicationCacheManager.java index 19bcaab..7a88c5a 100644 --- a/src/main/java/org/jcnc/jnotepad/common/manager/ApplicationCacheManager.java +++ b/src/main/java/org/jcnc/jnotepad/app/common/manager/ApplicationCacheManager.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.common.manager; +package org.jcnc.jnotepad.app.common.manager; import org.jcnc.jnotepad.api.core.manager.AbstractCacheManager; diff --git a/src/main/java/org/jcnc/jnotepad/common/manager/ThreadPoolManager.java b/src/main/java/org/jcnc/jnotepad/app/common/manager/ThreadPoolManager.java similarity index 96% rename from src/main/java/org/jcnc/jnotepad/common/manager/ThreadPoolManager.java rename to src/main/java/org/jcnc/jnotepad/app/common/manager/ThreadPoolManager.java index bab3a57..fcf5bbd 100644 --- a/src/main/java/org/jcnc/jnotepad/common/manager/ThreadPoolManager.java +++ b/src/main/java/org/jcnc/jnotepad/app/common/manager/ThreadPoolManager.java @@ -1,6 +1,6 @@ -package org.jcnc.jnotepad.common.manager; +package org.jcnc.jnotepad.app.common.manager; -import org.jcnc.jnotepad.util.LogUtil; +import org.jcnc.jnotepad.app.util.LogUtil; import org.slf4j.Logger; import java.util.concurrent.*; 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 ad46c98..c12acc9 100644 --- a/src/main/java/org/jcnc/jnotepad/app/config/AppConfig.java +++ b/src/main/java/org/jcnc/jnotepad/app/config/AppConfig.java @@ -8,8 +8,8 @@ import java.util.Collections; import java.util.Optional; import java.util.Set; -import static org.jcnc.jnotepad.common.constants.AppConstants.DEFAULT_PROPERTY; -import static org.jcnc.jnotepad.common.constants.AppConstants.PROGRAM_FILE_DIRECTORY; +import static org.jcnc.jnotepad.app.common.constants.AppConstants.DEFAULT_PROPERTY; +import static org.jcnc.jnotepad.app.common.constants.AppConstants.PROGRAM_FILE_DIRECTORY; /** * 应用程序配置文件 diff --git a/src/main/java/org/jcnc/jnotepad/app/manager/ApplicationManager.java b/src/main/java/org/jcnc/jnotepad/app/manager/ApplicationManager.java index 6ba75f4..d0aba5a 100644 --- a/src/main/java/org/jcnc/jnotepad/app/manager/ApplicationManager.java +++ b/src/main/java/org/jcnc/jnotepad/app/manager/ApplicationManager.java @@ -8,22 +8,22 @@ import javafx.scene.layout.Pane; import javafx.stage.Stage; import javafx.stage.Window; import org.jcnc.jnotepad.JnotepadApp; +import org.jcnc.jnotepad.app.common.constants.AppConstants; +import org.jcnc.jnotepad.app.common.constants.TextConstants; +import org.jcnc.jnotepad.app.common.manager.ThreadPoolManager; import org.jcnc.jnotepad.app.config.AppConfig; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; -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.app.util.FileUtil; +import org.jcnc.jnotepad.app.util.LogUtil; +import org.jcnc.jnotepad.app.util.UiUtil; import org.jcnc.jnotepad.controller.ResourceController; import org.jcnc.jnotepad.controller.cache.CacheController; import org.jcnc.jnotepad.controller.config.AppConfigController; import org.jcnc.jnotepad.controller.config.PluginConfigController; import org.jcnc.jnotepad.controller.exception.AppException; import org.jcnc.jnotepad.controller.manager.Controller; -import org.jcnc.jnotepad.plugin.manager.PluginManager; -import org.jcnc.jnotepad.util.FileUtil; -import org.jcnc.jnotepad.util.LogUtil; -import org.jcnc.jnotepad.util.UiUtil; -import org.jcnc.jnotepad.views.manager.*; +import org.jcnc.jnotepad.controller.plugin.manager.PluginManager; +import org.jcnc.jnotepad.ui.views.manager.*; import java.io.File; import java.io.IOException; @@ -34,8 +34,8 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.ExecutorService; -import static org.jcnc.jnotepad.common.constants.AppConstants.DEFAULT_PROPERTY; -import static org.jcnc.jnotepad.common.constants.AppConstants.PROGRAM_FILE_DIRECTORY; +import static org.jcnc.jnotepad.app.common.constants.AppConstants.DEFAULT_PROPERTY; +import static org.jcnc.jnotepad.app.common.constants.AppConstants.PROGRAM_FILE_DIRECTORY; /** * 应用程序管理类 diff --git a/src/main/java/org/jcnc/jnotepad/util/ClipboardUtil.java b/src/main/java/org/jcnc/jnotepad/app/util/ClipboardUtil.java similarity index 96% rename from src/main/java/org/jcnc/jnotepad/util/ClipboardUtil.java rename to src/main/java/org/jcnc/jnotepad/app/util/ClipboardUtil.java index 4e95321..dd42114 100644 --- a/src/main/java/org/jcnc/jnotepad/util/ClipboardUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/util/ClipboardUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.util; +package org.jcnc.jnotepad.app.util; import javafx.scene.input.Clipboard; import javafx.scene.input.ClipboardContent; diff --git a/src/main/java/org/jcnc/jnotepad/util/EncodingDetector.java b/src/main/java/org/jcnc/jnotepad/app/util/EncodingDetector.java similarity index 98% rename from src/main/java/org/jcnc/jnotepad/util/EncodingDetector.java rename to src/main/java/org/jcnc/jnotepad/app/util/EncodingDetector.java index 9511288..620fbfa 100644 --- a/src/main/java/org/jcnc/jnotepad/util/EncodingDetector.java +++ b/src/main/java/org/jcnc/jnotepad/app/util/EncodingDetector.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.util; +package org.jcnc.jnotepad.app.util; import com.ibm.icu.text.CharsetDetector; import com.ibm.icu.text.CharsetMatch; diff --git a/src/main/java/org/jcnc/jnotepad/util/FileUtil.java b/src/main/java/org/jcnc/jnotepad/app/util/FileUtil.java similarity index 99% rename from src/main/java/org/jcnc/jnotepad/util/FileUtil.java rename to src/main/java/org/jcnc/jnotepad/app/util/FileUtil.java index f17542f..8f6b6ad 100644 --- a/src/main/java/org/jcnc/jnotepad/util/FileUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/util/FileUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.util; +package org.jcnc.jnotepad.app.util; import javafx.scene.Node; import org.jcnc.jnotepad.controller.event.handler.menuitem.OpenFile; diff --git a/src/main/java/org/jcnc/jnotepad/util/JsonUtil.java b/src/main/java/org/jcnc/jnotepad/app/util/JsonUtil.java similarity index 98% rename from src/main/java/org/jcnc/jnotepad/util/JsonUtil.java rename to src/main/java/org/jcnc/jnotepad/app/util/JsonUtil.java index 7960f5e..9ec43db 100644 --- a/src/main/java/org/jcnc/jnotepad/util/JsonUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/util/JsonUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.util; +package org.jcnc.jnotepad.app.util; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/src/main/java/org/jcnc/jnotepad/util/LogUtil.java b/src/main/java/org/jcnc/jnotepad/app/util/LogUtil.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/util/LogUtil.java rename to src/main/java/org/jcnc/jnotepad/app/util/LogUtil.java index 34eb0d4..04e8ce6 100644 --- a/src/main/java/org/jcnc/jnotepad/util/LogUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/util/LogUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.util; +package org.jcnc.jnotepad.app.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jcnc/jnotepad/util/NotificationUtil.java b/src/main/java/org/jcnc/jnotepad/app/util/NotificationUtil.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/util/NotificationUtil.java rename to src/main/java/org/jcnc/jnotepad/app/util/NotificationUtil.java index 3c5bf4f..2528eb4 100644 --- a/src/main/java/org/jcnc/jnotepad/util/NotificationUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/util/NotificationUtil.java @@ -1,9 +1,9 @@ -package org.jcnc.jnotepad.util; +package org.jcnc.jnotepad.app.util; import atlantafx.base.controls.Notification; import atlantafx.base.theme.Styles; import javafx.scene.layout.StackPane; -import org.jcnc.jnotepad.views.manager.RootManager; +import org.jcnc.jnotepad.ui.views.manager.RootManager; import org.kordamp.ikonli.javafx.FontIcon; import java.util.Collections; diff --git a/src/main/java/org/jcnc/jnotepad/util/PopUpUtil.java b/src/main/java/org/jcnc/jnotepad/app/util/PopUpUtil.java similarity index 96% rename from src/main/java/org/jcnc/jnotepad/util/PopUpUtil.java rename to src/main/java/org/jcnc/jnotepad/app/util/PopUpUtil.java index d205ea8..a1a58e8 100644 --- a/src/main/java/org/jcnc/jnotepad/util/PopUpUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/util/PopUpUtil.java @@ -1,8 +1,8 @@ -package org.jcnc.jnotepad.util; +package org.jcnc.jnotepad.app.util; -import org.jcnc.jnotepad.component.stage.dialog.AppDialogBuilder; -import org.jcnc.jnotepad.component.stage.dialog.interfaces.DialogButtonAction; import org.jcnc.jnotepad.model.enums.DialogType; +import org.jcnc.jnotepad.ui.component.stage.dialog.AppDialogBuilder; +import org.jcnc.jnotepad.ui.component.stage.dialog.interfaces.DialogButtonAction; /** * 弹窗工具类 diff --git a/src/main/java/org/jcnc/jnotepad/util/ResourceUtil.java b/src/main/java/org/jcnc/jnotepad/app/util/ResourceUtil.java similarity index 98% rename from src/main/java/org/jcnc/jnotepad/util/ResourceUtil.java rename to src/main/java/org/jcnc/jnotepad/app/util/ResourceUtil.java index ee7f7c0..d0da3d5 100644 --- a/src/main/java/org/jcnc/jnotepad/util/ResourceUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/util/ResourceUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.util; +package org.jcnc.jnotepad.app.util; import org.jcnc.jnotepad.JnotepadApp; diff --git a/src/main/java/org/jcnc/jnotepad/util/TabUtil.java b/src/main/java/org/jcnc/jnotepad/app/util/TabUtil.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/util/TabUtil.java rename to src/main/java/org/jcnc/jnotepad/app/util/TabUtil.java index b083441..627a8d8 100644 --- a/src/main/java/org/jcnc/jnotepad/util/TabUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/util/TabUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.util; +package org.jcnc.jnotepad.app.util; import javafx.scene.control.Tab; import javafx.scene.control.TextField; @@ -6,22 +6,22 @@ import javafx.scene.input.KeyCode; import javafx.stage.FileChooser; import org.jcnc.jnotepad.api.core.views.menu.builder.ContextMenuBuilder; import org.jcnc.jnotepad.api.core.views.menu.builder.MenuBuilder; +import org.jcnc.jnotepad.app.common.constants.AppConstants; +import org.jcnc.jnotepad.app.common.constants.TextConstants; +import org.jcnc.jnotepad.app.common.manager.ApplicationCacheManager; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; -import org.jcnc.jnotepad.common.constants.AppConstants; -import org.jcnc.jnotepad.common.constants.TextConstants; -import org.jcnc.jnotepad.common.manager.ApplicationCacheManager; -import org.jcnc.jnotepad.component.module.TextCodeArea; -import org.jcnc.jnotepad.component.stage.dialog.factory.impl.BasicFileChooserFactory; import org.jcnc.jnotepad.controller.config.UserConfigController; import org.jcnc.jnotepad.controller.event.handler.menuitem.OpenFile; import org.jcnc.jnotepad.controller.i18n.LocalizationController; import org.jcnc.jnotepad.model.entity.Cache; import org.jcnc.jnotepad.model.enums.CacheExpirationTime; -import org.jcnc.jnotepad.views.manager.BottomStatusBoxManager; -import org.jcnc.jnotepad.views.manager.CenterTabPaneManager; -import org.jcnc.jnotepad.views.manager.TopMenuBarManager; -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.ui.component.module.TextCodeArea; +import org.jcnc.jnotepad.ui.component.stage.dialog.factory.impl.BasicFileChooserFactory; +import org.jcnc.jnotepad.ui.views.manager.BottomStatusBoxManager; +import org.jcnc.jnotepad.ui.views.manager.CenterTabPaneManager; +import org.jcnc.jnotepad.ui.views.manager.TopMenuBarManager; +import org.jcnc.jnotepad.ui.views.root.center.main.center.tab.CenterTab; +import org.jcnc.jnotepad.ui.views.root.center.main.center.tab.CenterTabPane; import org.slf4j.Logger; import java.io.File; @@ -29,8 +29,8 @@ import java.nio.charset.Charset; import java.util.Comparator; import java.util.List; +import static org.jcnc.jnotepad.app.util.FileUtil.getFileText; import static org.jcnc.jnotepad.controller.config.UserConfigController.CONFIG_NAME; -import static org.jcnc.jnotepad.util.FileUtil.getFileText; /** * 标签页工具 diff --git a/src/main/java/org/jcnc/jnotepad/util/UiUtil.java b/src/main/java/org/jcnc/jnotepad/app/util/UiUtil.java similarity index 98% rename from src/main/java/org/jcnc/jnotepad/util/UiUtil.java rename to src/main/java/org/jcnc/jnotepad/app/util/UiUtil.java index 7cfe1c0..8411829 100644 --- a/src/main/java/org/jcnc/jnotepad/util/UiUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/util/UiUtil.java @@ -1,12 +1,12 @@ -package org.jcnc.jnotepad.util; +package org.jcnc.jnotepad.app.util; import atlantafx.base.theme.Styles; import javafx.scene.Node; import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.stage.Window; +import org.jcnc.jnotepad.app.common.constants.AppConstants; import org.jcnc.jnotepad.app.manager.ApplicationManager; -import org.jcnc.jnotepad.common.constants.AppConstants; import org.kordamp.ikonli.javafx.FontIcon; import java.util.HashMap; diff --git a/src/main/java/org/jcnc/jnotepad/controller/ResourceController.java b/src/main/java/org/jcnc/jnotepad/controller/ResourceController.java index 8ac7794..a545c26 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/ResourceController.java +++ b/src/main/java/org/jcnc/jnotepad/controller/ResourceController.java @@ -1,7 +1,7 @@ package org.jcnc.jnotepad.controller; import org.jcnc.jnotepad.controller.i18n.LocalizationController; -import org.jcnc.jnotepad.plugin.PluginLoader; +import org.jcnc.jnotepad.controller.plugin.PluginLoader; /** * 资源控制器 diff --git a/src/main/java/org/jcnc/jnotepad/controller/cache/CacheController.java b/src/main/java/org/jcnc/jnotepad/controller/cache/CacheController.java index 28cd7d0..77fbd42 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/cache/CacheController.java +++ b/src/main/java/org/jcnc/jnotepad/controller/cache/CacheController.java @@ -1,11 +1,11 @@ package org.jcnc.jnotepad.controller.cache; import com.fasterxml.jackson.core.type.TypeReference; -import org.jcnc.jnotepad.common.manager.ApplicationCacheManager; +import org.jcnc.jnotepad.app.common.manager.ApplicationCacheManager; +import org.jcnc.jnotepad.app.util.JsonUtil; +import org.jcnc.jnotepad.app.util.LogUtil; import org.jcnc.jnotepad.controller.config.AppConfigController; import org.jcnc.jnotepad.model.entity.Cache; -import org.jcnc.jnotepad.util.JsonUtil; -import org.jcnc.jnotepad.util.LogUtil; import org.slf4j.Logger; import java.io.File; 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 293432f..fb40bcb 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/config/AppConfigController.java +++ b/src/main/java/org/jcnc/jnotepad/controller/config/AppConfigController.java @@ -5,8 +5,8 @@ import org.jcnc.jnotepad.app.config.AppConfig; import java.nio.file.Paths; -import static org.jcnc.jnotepad.common.constants.AppConstants.DEFAULT_PROPERTY; -import static org.jcnc.jnotepad.common.constants.AppConstants.PROGRAM_FILE_DIRECTORY; +import static org.jcnc.jnotepad.app.common.constants.AppConstants.DEFAULT_PROPERTY; +import static org.jcnc.jnotepad.app.common.constants.AppConstants.PROGRAM_FILE_DIRECTORY; /** * 应用程序配置文件控制器 diff --git a/src/main/java/org/jcnc/jnotepad/controller/config/PluginConfigController.java b/src/main/java/org/jcnc/jnotepad/controller/config/PluginConfigController.java index f65146d..bce610f 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/config/PluginConfigController.java +++ b/src/main/java/org/jcnc/jnotepad/controller/config/PluginConfigController.java @@ -7,7 +7,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import static org.jcnc.jnotepad.common.constants.AppConstants.PROGRAM_FILE_DIRECTORY; +import static org.jcnc.jnotepad.app.common.constants.AppConstants.PROGRAM_FILE_DIRECTORY; /** * 插件控制器 diff --git a/src/main/java/org/jcnc/jnotepad/controller/config/UserConfigController.java b/src/main/java/org/jcnc/jnotepad/controller/config/UserConfigController.java index 3bbb9bd..2d2b4bf 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/config/UserConfigController.java +++ b/src/main/java/org/jcnc/jnotepad/controller/config/UserConfigController.java @@ -8,8 +8,8 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import static org.jcnc.jnotepad.common.constants.AppConstants.PROGRAM_FILE_DIRECTORY; -import static org.jcnc.jnotepad.common.constants.TextConstants.CHINESE; +import static org.jcnc.jnotepad.app.common.constants.AppConstants.PROGRAM_FILE_DIRECTORY; +import static org.jcnc.jnotepad.app.common.constants.TextConstants.CHINESE; /** * 应用程序配置控制器 diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/NewFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/NewFile.java index 6c9b0b4..27722cd 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/NewFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/NewFile.java @@ -3,7 +3,7 @@ package org.jcnc.jnotepad.controller.event.handler.menuitem; import javafx.event.ActionEvent; import javafx.event.EventHandler; -import static org.jcnc.jnotepad.util.TabUtil.addNewFileTab; +import static org.jcnc.jnotepad.app.util.TabUtil.addNewFileTab; /** * 新建文件事件的事件处理程序。 diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/OpenConfig.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/OpenConfig.java index b73c3f7..0f7a95a 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/OpenConfig.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/OpenConfig.java @@ -1,12 +1,12 @@ package org.jcnc.jnotepad.controller.event.handler.menuitem; import javafx.event.ActionEvent; +import org.jcnc.jnotepad.app.util.LogUtil; import org.jcnc.jnotepad.controller.config.UserConfigController; -import org.jcnc.jnotepad.util.LogUtil; import java.io.File; -import static org.jcnc.jnotepad.util.TabUtil.openFileToTab; +import static org.jcnc.jnotepad.app.util.TabUtil.openFileToTab; /** * 打开配置文件事件处理程序。 diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/OpenFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/OpenFile.java index 580ffce..2fdcbc0 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/OpenFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/OpenFile.java @@ -3,17 +3,17 @@ package org.jcnc.jnotepad.controller.event.handler.menuitem; import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.stage.FileChooser; +import org.jcnc.jnotepad.app.common.constants.TextConstants; +import org.jcnc.jnotepad.app.common.manager.ApplicationCacheManager; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; -import org.jcnc.jnotepad.common.constants.TextConstants; -import org.jcnc.jnotepad.common.manager.ApplicationCacheManager; -import org.jcnc.jnotepad.component.stage.dialog.factory.impl.BasicFileChooserFactory; +import org.jcnc.jnotepad.app.util.UiUtil; import org.jcnc.jnotepad.model.entity.Cache; import org.jcnc.jnotepad.model.enums.CacheExpirationTime; -import org.jcnc.jnotepad.util.UiUtil; +import org.jcnc.jnotepad.ui.component.stage.dialog.factory.impl.BasicFileChooserFactory; import java.io.File; -import static org.jcnc.jnotepad.util.TabUtil.openFileToTab; +import static org.jcnc.jnotepad.app.util.TabUtil.openFileToTab; /** diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/RenameFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/RenameFile.java index a636d64..7fdde7c 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/RenameFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/RenameFile.java @@ -2,9 +2,9 @@ package org.jcnc.jnotepad.controller.event.handler.menuitem; import javafx.event.ActionEvent; import javafx.event.EventHandler; -import org.jcnc.jnotepad.views.manager.CenterTabPaneManager; +import org.jcnc.jnotepad.ui.views.manager.CenterTabPaneManager; -import static org.jcnc.jnotepad.util.TabUtil.rename; +import static org.jcnc.jnotepad.app.util.TabUtil.rename; /** * 重命名文件事件处理器。 diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/SaveAsFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/SaveAsFile.java index eb754d2..a0a7bc9 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/SaveAsFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/SaveAsFile.java @@ -1,10 +1,10 @@ package org.jcnc.jnotepad.controller.event.handler.menuitem; import javafx.event.ActionEvent; -import org.jcnc.jnotepad.util.LogUtil; -import org.jcnc.jnotepad.views.manager.CenterTabPaneManager; +import org.jcnc.jnotepad.app.util.LogUtil; +import org.jcnc.jnotepad.ui.views.manager.CenterTabPaneManager; -import static org.jcnc.jnotepad.util.TabUtil.saveAsFile; +import static org.jcnc.jnotepad.app.util.TabUtil.saveAsFile; /** * 保存文件事件处理器。 diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/SaveFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/SaveFile.java index a57f382..7e186d9 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/SaveFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuitem/SaveFile.java @@ -2,9 +2,9 @@ package org.jcnc.jnotepad.controller.event.handler.menuitem; import javafx.event.ActionEvent; import javafx.event.EventHandler; -import org.jcnc.jnotepad.views.manager.CenterTabPaneManager; +import org.jcnc.jnotepad.ui.views.manager.CenterTabPaneManager; -import static org.jcnc.jnotepad.util.TabUtil.saveFile; +import static org.jcnc.jnotepad.app.util.TabUtil.saveFile; /** * 保存文件事件处理程序。 diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/DirTreeBtn.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/DirTreeBtn.java index 27066f3..b994a42 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/DirTreeBtn.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/DirTreeBtn.java @@ -2,7 +2,7 @@ package org.jcnc.jnotepad.controller.event.handler.toolbar; import javafx.event.ActionEvent; import javafx.event.EventHandler; -import org.jcnc.jnotepad.views.manager.DirectorySidebarManager; +import org.jcnc.jnotepad.ui.views.manager.DirectorySidebarManager; /** diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/OpenDirectory.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/OpenDirectory.java index 977131f..f863134 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/OpenDirectory.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/OpenDirectory.java @@ -3,16 +3,16 @@ package org.jcnc.jnotepad.controller.event.handler.toolbar; import javafx.event.ActionEvent; import javafx.event.EventHandler; +import org.jcnc.jnotepad.app.common.constants.TextConstants; +import org.jcnc.jnotepad.app.common.manager.ApplicationCacheManager; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; -import org.jcnc.jnotepad.common.constants.TextConstants; -import org.jcnc.jnotepad.common.manager.ApplicationCacheManager; -import org.jcnc.jnotepad.component.stage.dialog.factory.impl.BasicDirectoryChooserFactory; +import org.jcnc.jnotepad.app.util.FileUtil; +import org.jcnc.jnotepad.app.util.UiUtil; import org.jcnc.jnotepad.model.entity.Cache; import org.jcnc.jnotepad.model.entity.DirFileModel; import org.jcnc.jnotepad.model.enums.CacheExpirationTime; -import org.jcnc.jnotepad.util.FileUtil; -import org.jcnc.jnotepad.util.UiUtil; -import org.jcnc.jnotepad.views.manager.DirectorySidebarManager; +import org.jcnc.jnotepad.ui.component.stage.dialog.factory.impl.BasicDirectoryChooserFactory; +import org.jcnc.jnotepad.ui.views.manager.DirectorySidebarManager; import java.io.File; diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/RunBtn.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/RunBtn.java index 2548596..0150bc3 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/RunBtn.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/RunBtn.java @@ -3,7 +3,7 @@ package org.jcnc.jnotepad.controller.event.handler.toolbar; import javafx.event.ActionEvent; import javafx.event.EventHandler; -import org.jcnc.jnotepad.views.manager.BuildPanelManager; +import org.jcnc.jnotepad.ui.views.manager.BuildPanelManager; /** * 终端处理器 diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/SetBtn.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/SetBtn.java index f5e60f5..a92166f 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/SetBtn.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/toolbar/SetBtn.java @@ -2,7 +2,7 @@ package org.jcnc.jnotepad.controller.event.handler.toolbar; import javafx.event.ActionEvent; import javafx.event.EventHandler; -import org.jcnc.jnotepad.component.stage.setting.SetStage; +import org.jcnc.jnotepad.ui.component.stage.setting.SetStage; /** * 设置按钮事件的事件处理程序。 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 715cd9e..343c117 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/i18n/LocalizationController.java +++ b/src/main/java/org/jcnc/jnotepad/controller/i18n/LocalizationController.java @@ -9,8 +9,8 @@ import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; -import static org.jcnc.jnotepad.common.constants.TextConstants.CHINESE; -import static org.jcnc.jnotepad.common.constants.TextConstants.ENGLISH; +import static org.jcnc.jnotepad.app.common.constants.TextConstants.CHINESE; +import static org.jcnc.jnotepad.app.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 3be9d5a..648bfc1 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java +++ b/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java @@ -1,15 +1,15 @@ package org.jcnc.jnotepad.controller.manager; -import org.jcnc.jnotepad.common.manager.ApplicationCacheManager; -import org.jcnc.jnotepad.component.module.interfaces.ControllerAble; +import org.jcnc.jnotepad.app.common.manager.ApplicationCacheManager; +import org.jcnc.jnotepad.ui.component.module.interfaces.ControllerAble; import java.io.File; import java.util.Collections; import java.util.List; import java.util.Optional; -import static org.jcnc.jnotepad.util.TabUtil.addNewFileTab; -import static org.jcnc.jnotepad.util.TabUtil.openFileToTab; +import static org.jcnc.jnotepad.app.util.TabUtil.addNewFileTab; +import static org.jcnc.jnotepad.app.util.TabUtil.openFileToTab; /** * 控制器类，实现 ControllerAble 接口，用于管理文本编辑器的各种操作和事件处理。 diff --git a/src/main/java/org/jcnc/jnotepad/plugin/PluginLoader.java b/src/main/java/org/jcnc/jnotepad/controller/plugin/PluginLoader.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/plugin/PluginLoader.java rename to src/main/java/org/jcnc/jnotepad/controller/plugin/PluginLoader.java index 865d271..23927dc 100644 --- a/src/main/java/org/jcnc/jnotepad/plugin/PluginLoader.java +++ b/src/main/java/org/jcnc/jnotepad/controller/plugin/PluginLoader.java @@ -1,13 +1,13 @@ -package org.jcnc.jnotepad.plugin; +package org.jcnc.jnotepad.controller.plugin; -import org.jcnc.jnotepad.common.manager.ThreadPoolManager; +import org.jcnc.jnotepad.app.common.manager.ThreadPoolManager; +import org.jcnc.jnotepad.app.util.JsonUtil; +import org.jcnc.jnotepad.app.util.LogUtil; import org.jcnc.jnotepad.controller.config.PluginConfigController; import org.jcnc.jnotepad.controller.exception.AppException; +import org.jcnc.jnotepad.controller.plugin.interfaces.Plugin; +import org.jcnc.jnotepad.controller.plugin.manager.PluginManager; import org.jcnc.jnotepad.model.entity.PluginDescriptor; -import org.jcnc.jnotepad.plugin.interfaces.Plugin; -import org.jcnc.jnotepad.plugin.manager.PluginManager; -import org.jcnc.jnotepad.util.JsonUtil; -import org.jcnc.jnotepad.util.LogUtil; import org.slf4j.Logger; import java.io.*; diff --git a/src/main/java/org/jcnc/jnotepad/plugin/PluginManagerInterface.java b/src/main/java/org/jcnc/jnotepad/controller/plugin/PluginManagerInterface.java similarity index 92% rename from src/main/java/org/jcnc/jnotepad/plugin/PluginManagerInterface.java rename to src/main/java/org/jcnc/jnotepad/controller/plugin/PluginManagerInterface.java index 8011ca7..7a376b6 100644 --- a/src/main/java/org/jcnc/jnotepad/plugin/PluginManagerInterface.java +++ b/src/main/java/org/jcnc/jnotepad/controller/plugin/PluginManagerInterface.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.plugin; +package org.jcnc.jnotepad.controller.plugin; import javafx.scene.Scene; import javafx.scene.control.Button; @@ -6,11 +6,11 @@ import javafx.scene.control.Label; import javafx.scene.layout.VBox; import javafx.stage.FileChooser; import javafx.stage.Stage; -import org.jcnc.jnotepad.component.stage.dialog.factory.impl.BasicFileChooserFactory; -import org.jcnc.jnotepad.plugin.manager.PluginManager; -import org.jcnc.jnotepad.util.LogUtil; -import org.jcnc.jnotepad.util.PopUpUtil; -import org.jcnc.jnotepad.util.UiUtil; +import org.jcnc.jnotepad.app.util.LogUtil; +import org.jcnc.jnotepad.app.util.PopUpUtil; +import org.jcnc.jnotepad.app.util.UiUtil; +import org.jcnc.jnotepad.controller.plugin.manager.PluginManager; +import org.jcnc.jnotepad.ui.component.stage.dialog.factory.impl.BasicFileChooserFactory; import org.slf4j.Logger; import java.io.File; diff --git a/src/main/java/org/jcnc/jnotepad/plugin/interfaces/Plugin.java b/src/main/java/org/jcnc/jnotepad/controller/plugin/interfaces/Plugin.java similarity index 84% rename from src/main/java/org/jcnc/jnotepad/plugin/interfaces/Plugin.java rename to src/main/java/org/jcnc/jnotepad/controller/plugin/interfaces/Plugin.java index daab29f..c06e46a 100644 --- a/src/main/java/org/jcnc/jnotepad/plugin/interfaces/Plugin.java +++ b/src/main/java/org/jcnc/jnotepad/controller/plugin/interfaces/Plugin.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.plugin.interfaces; +package org.jcnc.jnotepad.controller.plugin.interfaces; /** diff --git a/src/main/java/org/jcnc/jnotepad/plugin/manager/PluginManager.java b/src/main/java/org/jcnc/jnotepad/controller/plugin/manager/PluginManager.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/plugin/manager/PluginManager.java rename to src/main/java/org/jcnc/jnotepad/controller/plugin/manager/PluginManager.java index 70e3a51..4bb8935 100644 --- a/src/main/java/org/jcnc/jnotepad/plugin/manager/PluginManager.java +++ b/src/main/java/org/jcnc/jnotepad/controller/plugin/manager/PluginManager.java @@ -1,11 +1,11 @@ -package org.jcnc.jnotepad.plugin.manager; +package org.jcnc.jnotepad.controller.plugin.manager; +import org.jcnc.jnotepad.app.common.manager.ThreadPoolManager; import org.jcnc.jnotepad.app.manager.ApplicationManager; -import org.jcnc.jnotepad.common.manager.ThreadPoolManager; +import org.jcnc.jnotepad.app.util.LogUtil; +import org.jcnc.jnotepad.app.util.PopUpUtil; import org.jcnc.jnotepad.controller.config.PluginConfigController; import org.jcnc.jnotepad.model.entity.PluginDescriptor; -import org.jcnc.jnotepad.util.LogUtil; -import org.jcnc.jnotepad.util.PopUpUtil; import org.slf4j.Logger; import java.io.File; @@ -18,7 +18,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; -import static org.jcnc.jnotepad.plugin.PluginLoader.readPlugin; +import static org.jcnc.jnotepad.controller.plugin.PluginLoader.readPlugin; /** * 插件管理器 diff --git a/src/main/java/org/jcnc/jnotepad/model/entity/PluginDescriptor.java b/src/main/java/org/jcnc/jnotepad/model/entity/PluginDescriptor.java index b7e4f71..c339d88 100644 --- a/src/main/java/org/jcnc/jnotepad/model/entity/PluginDescriptor.java +++ b/src/main/java/org/jcnc/jnotepad/model/entity/PluginDescriptor.java @@ -1,7 +1,7 @@ package org.jcnc.jnotepad.model.entity; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.jcnc.jnotepad.plugin.interfaces.Plugin; +import org.jcnc.jnotepad.controller.plugin.interfaces.Plugin; import java.util.Objects; diff --git a/src/main/java/org/jcnc/jnotepad/component/module/TextCodeArea.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/TextCodeArea.java similarity index 99% rename from src/main/java/org/jcnc/jnotepad/component/module/TextCodeArea.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/TextCodeArea.java index 3a36ae3..c5ac2f4 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/TextCodeArea.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/TextCodeArea.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.module; +package org.jcnc.jnotepad.ui.component.module; import javafx.application.Platform; import javafx.geometry.Insets; diff --git a/src/main/java/org/jcnc/jnotepad/component/module/base/AbstractBorderPane.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/base/AbstractBorderPane.java similarity index 90% rename from src/main/java/org/jcnc/jnotepad/component/module/base/AbstractBorderPane.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/base/AbstractBorderPane.java index 78c0e06..934c3a6 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/base/AbstractBorderPane.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/base/AbstractBorderPane.java @@ -1,8 +1,8 @@ -package org.jcnc.jnotepad.component.module.base; +package org.jcnc.jnotepad.ui.component.module.base; import javafx.scene.Node; import javafx.scene.layout.BorderPane; -import org.jcnc.jnotepad.component.module.interfaces.BorderPaneAble; +import org.jcnc.jnotepad.ui.component.module.interfaces.BorderPaneAble; /** * 抽象边界面板类。 diff --git a/src/main/java/org/jcnc/jnotepad/component/module/base/AbstractHorizontalBox.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/base/AbstractHorizontalBox.java similarity index 91% rename from src/main/java/org/jcnc/jnotepad/component/module/base/AbstractHorizontalBox.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/base/AbstractHorizontalBox.java index 367f3f9..93b7e05 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/base/AbstractHorizontalBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/base/AbstractHorizontalBox.java @@ -1,8 +1,8 @@ -package org.jcnc.jnotepad.component.module.base; +package org.jcnc.jnotepad.ui.component.module.base; import javafx.scene.Node; import javafx.scene.layout.HBox; -import org.jcnc.jnotepad.component.module.interfaces.HorizontalBoxAble; +import org.jcnc.jnotepad.ui.component.module.interfaces.HorizontalBoxAble; /** * 抽象水平盒子类。 diff --git a/src/main/java/org/jcnc/jnotepad/component/module/base/AbstractVerticalBox.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/base/AbstractVerticalBox.java similarity index 91% rename from src/main/java/org/jcnc/jnotepad/component/module/base/AbstractVerticalBox.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/base/AbstractVerticalBox.java index 0e86bfd..a460894 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/base/AbstractVerticalBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/base/AbstractVerticalBox.java @@ -1,8 +1,8 @@ -package org.jcnc.jnotepad.component.module.base; +package org.jcnc.jnotepad.ui.component.module.base; import javafx.scene.Node; import javafx.scene.layout.VBox; -import org.jcnc.jnotepad.component.module.interfaces.VerticalBoxAble; +import org.jcnc.jnotepad.ui.component.module.interfaces.VerticalBoxAble; /** * 抽象垂直盒子类。 diff --git a/src/main/java/org/jcnc/jnotepad/component/module/hbox/CustomTitleBarBox.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/hbox/CustomTitleBarBox.java similarity index 98% rename from src/main/java/org/jcnc/jnotepad/component/module/hbox/CustomTitleBarBox.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/hbox/CustomTitleBarBox.java index 56436a8..534da1f 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/hbox/CustomTitleBarBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/hbox/CustomTitleBarBox.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.module.hbox; +package org.jcnc.jnotepad.ui.component.module.hbox; import javafx.animation.TranslateTransition; import javafx.geometry.Pos; diff --git a/src/main/java/org/jcnc/jnotepad/component/module/interfaces/BorderPaneAble.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/interfaces/BorderPaneAble.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/component/module/interfaces/BorderPaneAble.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/interfaces/BorderPaneAble.java index 2f1a476..1c9946f 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/interfaces/BorderPaneAble.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/interfaces/BorderPaneAble.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.module.interfaces; +package org.jcnc.jnotepad.ui.component.module.interfaces; import javafx.scene.Node; diff --git a/src/main/java/org/jcnc/jnotepad/component/module/interfaces/ControllerAble.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/interfaces/ControllerAble.java similarity index 92% rename from src/main/java/org/jcnc/jnotepad/component/module/interfaces/ControllerAble.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/interfaces/ControllerAble.java index 14d77ea..a8054c5 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/interfaces/ControllerAble.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/interfaces/ControllerAble.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.module.interfaces; +package org.jcnc.jnotepad.ui.component.module.interfaces; /** * 控制器接口类。 diff --git a/src/main/java/org/jcnc/jnotepad/component/module/interfaces/HorizontalBoxAble.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/interfaces/HorizontalBoxAble.java similarity index 93% rename from src/main/java/org/jcnc/jnotepad/component/module/interfaces/HorizontalBoxAble.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/interfaces/HorizontalBoxAble.java index 6949451..cc2f441 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/interfaces/HorizontalBoxAble.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/interfaces/HorizontalBoxAble.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.module.interfaces; +package org.jcnc.jnotepad.ui.component.module.interfaces; import javafx.scene.Node; import javafx.scene.layout.HBox; diff --git a/src/main/java/org/jcnc/jnotepad/component/module/interfaces/VerticalBoxAble.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/interfaces/VerticalBoxAble.java similarity index 93% rename from src/main/java/org/jcnc/jnotepad/component/module/interfaces/VerticalBoxAble.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/interfaces/VerticalBoxAble.java index ab4130a..1808bb7 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/interfaces/VerticalBoxAble.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/interfaces/VerticalBoxAble.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.module.interfaces; +package org.jcnc.jnotepad.ui.component.module.interfaces; import javafx.scene.Node; import javafx.scene.layout.VBox; diff --git a/src/main/java/org/jcnc/jnotepad/component/module/vbox/BuildPanel.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/BuildPanel.java similarity index 87% rename from src/main/java/org/jcnc/jnotepad/component/module/vbox/BuildPanel.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/BuildPanel.java index 20147a2..19eb2ae 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/vbox/BuildPanel.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/BuildPanel.java @@ -1,10 +1,10 @@ -package org.jcnc.jnotepad.component.module.vbox; +package org.jcnc.jnotepad.ui.component.module.vbox; import javafx.scene.control.Tab; import javafx.scene.control.TabPane; -import org.jcnc.jnotepad.component.module.vbox.components.CmdTerminalBox; -import org.jcnc.jnotepad.component.module.vbox.components.DebugBox; -import org.jcnc.jnotepad.component.module.vbox.components.RunBox; +import org.jcnc.jnotepad.ui.component.module.vbox.components.CmdTerminalBox; +import org.jcnc.jnotepad.ui.component.module.vbox.components.DebugBox; +import org.jcnc.jnotepad.ui.component.module.vbox.components.RunBox; /** * 底部运行、调试和命令终端面板。 diff --git a/src/main/java/org/jcnc/jnotepad/component/module/vbox/components/CmdTerminalBox.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/CmdTerminalBox.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/component/module/vbox/components/CmdTerminalBox.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/CmdTerminalBox.java index 4f7f599..a03da92 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/vbox/components/CmdTerminalBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/CmdTerminalBox.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.module.vbox.components; +package org.jcnc.jnotepad.ui.component.module.vbox.components; import javafx.animation.KeyFrame; import javafx.animation.Timeline; @@ -10,7 +10,7 @@ import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; import javafx.util.Duration; import org.fxmisc.richtext.StyleClassedTextArea; -import org.jcnc.jnotepad.util.LogUtil; +import org.jcnc.jnotepad.app.util.LogUtil; import java.io.*; import java.nio.charset.Charset; diff --git a/src/main/java/org/jcnc/jnotepad/component/module/vbox/components/DebugBox.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/DebugBox.java similarity index 85% rename from src/main/java/org/jcnc/jnotepad/component/module/vbox/components/DebugBox.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/DebugBox.java index a48f353..9be0a3f 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/vbox/components/DebugBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/DebugBox.java @@ -1,6 +1,6 @@ -package org.jcnc.jnotepad.component.module.vbox.components; +package org.jcnc.jnotepad.ui.component.module.vbox.components; -import org.jcnc.jnotepad.component.module.TextCodeArea; +import org.jcnc.jnotepad.ui.component.module.TextCodeArea; /** * 调试信息显示界面。 diff --git a/src/main/java/org/jcnc/jnotepad/component/module/vbox/components/RunBox.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/RunBox.java similarity index 84% rename from src/main/java/org/jcnc/jnotepad/component/module/vbox/components/RunBox.java rename to src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/RunBox.java index 3fb466a..01fe3ad 100644 --- a/src/main/java/org/jcnc/jnotepad/component/module/vbox/components/RunBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/RunBox.java @@ -1,6 +1,6 @@ -package org.jcnc.jnotepad.component.module.vbox.components; +package org.jcnc.jnotepad.ui.component.module.vbox.components; -import org.jcnc.jnotepad.component.module.TextCodeArea; +import org.jcnc.jnotepad.ui.component.module.TextCodeArea; /** * 运行信息显示界面。 diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/AppDialogBuilder.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/AppDialogBuilder.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/component/stage/dialog/AppDialogBuilder.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/AppDialogBuilder.java index ec46440..8e31859 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/AppDialogBuilder.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/AppDialogBuilder.java @@ -1,13 +1,13 @@ -package org.jcnc.jnotepad.component.stage.dialog; +package org.jcnc.jnotepad.ui.component.stage.dialog; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.image.Image; import javafx.stage.Modality; import javafx.stage.Stage; -import org.jcnc.jnotepad.component.stage.dialog.interfaces.DialogButtonAction; +import org.jcnc.jnotepad.app.util.UiUtil; import org.jcnc.jnotepad.model.enums.DialogType; -import org.jcnc.jnotepad.util.UiUtil; +import org.jcnc.jnotepad.ui.component.stage.dialog.interfaces.DialogButtonAction; import org.kordamp.ikonli.javafx.FontIcon; /** diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/AppDialogStage.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/AppDialogStage.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/component/stage/dialog/AppDialogStage.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/AppDialogStage.java index b5cb9f3..b0ef87b 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/AppDialogStage.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/AppDialogStage.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.stage.dialog; +package org.jcnc.jnotepad.ui.component.stage.dialog; import javafx.scene.Scene; import javafx.scene.control.Button; @@ -7,7 +7,7 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; import javafx.stage.Stage; -import org.jcnc.jnotepad.component.stage.dialog.interfaces.DialogButtonAction; +import org.jcnc.jnotepad.ui.component.stage.dialog.interfaces.DialogButtonAction; /** * 应用对话框 diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/factory/DirectoryChooserFactory.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/factory/DirectoryChooserFactory.java similarity index 93% rename from src/main/java/org/jcnc/jnotepad/component/stage/dialog/factory/DirectoryChooserFactory.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/factory/DirectoryChooserFactory.java index 104f4b2..0958a10 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/factory/DirectoryChooserFactory.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/factory/DirectoryChooserFactory.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.stage.dialog.factory; +package org.jcnc.jnotepad.ui.component.stage.dialog.factory; import javafx.stage.DirectoryChooser; diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/factory/FileChooserFactory.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/factory/FileChooserFactory.java similarity index 94% rename from src/main/java/org/jcnc/jnotepad/component/stage/dialog/factory/FileChooserFactory.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/factory/FileChooserFactory.java index 954c797..77f815f 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/factory/FileChooserFactory.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/factory/FileChooserFactory.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.stage.dialog.factory; +package org.jcnc.jnotepad.ui.component.stage.dialog.factory; import javafx.stage.FileChooser; diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/factory/impl/BasicDirectoryChooserFactory.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/factory/impl/BasicDirectoryChooserFactory.java similarity index 90% rename from src/main/java/org/jcnc/jnotepad/component/stage/dialog/factory/impl/BasicDirectoryChooserFactory.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/factory/impl/BasicDirectoryChooserFactory.java index 9e07fc1..7870fcf 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/factory/impl/BasicDirectoryChooserFactory.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/factory/impl/BasicDirectoryChooserFactory.java @@ -1,7 +1,7 @@ -package org.jcnc.jnotepad.component.stage.dialog.factory.impl; +package org.jcnc.jnotepad.ui.component.stage.dialog.factory.impl; import javafx.stage.DirectoryChooser; -import org.jcnc.jnotepad.component.stage.dialog.factory.DirectoryChooserFactory; +import org.jcnc.jnotepad.ui.component.stage.dialog.factory.DirectoryChooserFactory; import java.io.File; diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/factory/impl/BasicFileChooserFactory.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/factory/impl/BasicFileChooserFactory.java similarity index 94% rename from src/main/java/org/jcnc/jnotepad/component/stage/dialog/factory/impl/BasicFileChooserFactory.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/factory/impl/BasicFileChooserFactory.java index c84b86f..c8152d3 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/factory/impl/BasicFileChooserFactory.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/factory/impl/BasicFileChooserFactory.java @@ -1,7 +1,7 @@ -package org.jcnc.jnotepad.component.stage.dialog.factory.impl; +package org.jcnc.jnotepad.ui.component.stage.dialog.factory.impl; import javafx.stage.FileChooser; -import org.jcnc.jnotepad.component.stage.dialog.factory.FileChooserFactory; +import org.jcnc.jnotepad.ui.component.stage.dialog.factory.FileChooserFactory; import java.io.File; import java.util.List; diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/interfaces/DialogButtonAction.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/interfaces/DialogButtonAction.java similarity index 72% rename from src/main/java/org/jcnc/jnotepad/component/stage/dialog/interfaces/DialogButtonAction.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/interfaces/DialogButtonAction.java index f4bb4e4..8a27e43 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/dialog/interfaces/DialogButtonAction.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/interfaces/DialogButtonAction.java @@ -1,6 +1,6 @@ -package org.jcnc.jnotepad.component.stage.dialog.interfaces; +package org.jcnc.jnotepad.ui.component.stage.dialog.interfaces; -import org.jcnc.jnotepad.component.stage.dialog.AppDialogStage; +import org.jcnc.jnotepad.ui.component.stage.dialog.AppDialogStage; /** * 对话框按钮点击事件接口 diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/setting/CustomSetButton.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/setting/CustomSetButton.java similarity index 79% rename from src/main/java/org/jcnc/jnotepad/component/stage/setting/CustomSetButton.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/setting/CustomSetButton.java index 8432ca7..b349004 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/setting/CustomSetButton.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/setting/CustomSetButton.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.stage.setting; +package org.jcnc.jnotepad.ui.component.stage.setting; import javafx.scene.control.Button; diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/setting/SetDevBox.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/setting/SetDevBox.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/component/stage/setting/SetDevBox.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/setting/SetDevBox.java index 990c849..123464b 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/setting/SetDevBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/setting/SetDevBox.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.stage.setting; +package org.jcnc.jnotepad.ui.component.stage.setting; import javafx.event.ActionEvent; import javafx.event.EventHandler; diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/setting/SetStage.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/setting/SetStage.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/component/stage/setting/SetStage.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/setting/SetStage.java index b6aa98b..6136f49 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/setting/SetStage.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/setting/SetStage.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.stage.setting; +package org.jcnc.jnotepad.ui.component.stage.setting; import atlantafx.base.controls.CustomTextField; import atlantafx.base.theme.Styles; @@ -16,24 +16,24 @@ import javafx.scene.text.Font; import javafx.scene.text.Text; import javafx.stage.Modality; import javafx.stage.Stage; +import org.jcnc.jnotepad.app.common.constants.TextConstants; +import org.jcnc.jnotepad.app.common.manager.ApplicationCacheManager; import org.jcnc.jnotepad.app.config.AppConfig; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; import org.jcnc.jnotepad.app.manager.ApplicationManager; -import org.jcnc.jnotepad.common.constants.TextConstants; -import org.jcnc.jnotepad.common.manager.ApplicationCacheManager; -import org.jcnc.jnotepad.component.stage.dialog.factory.impl.BasicDirectoryChooserFactory; +import org.jcnc.jnotepad.app.util.PopUpUtil; +import org.jcnc.jnotepad.app.util.UiUtil; import org.jcnc.jnotepad.controller.config.AppConfigController; import org.jcnc.jnotepad.controller.event.handler.toolbar.OpenDirectory; +import org.jcnc.jnotepad.controller.plugin.PluginManagerInterface; import org.jcnc.jnotepad.model.entity.Cache; import org.jcnc.jnotepad.model.enums.CacheExpirationTime; -import org.jcnc.jnotepad.plugin.PluginManagerInterface; -import org.jcnc.jnotepad.util.PopUpUtil; -import org.jcnc.jnotepad.util.UiUtil; +import org.jcnc.jnotepad.ui.component.stage.dialog.factory.impl.BasicDirectoryChooserFactory; import java.io.File; -import static org.jcnc.jnotepad.common.constants.AppConstants.SCREEN_LENGTH; -import static org.jcnc.jnotepad.common.constants.AppConstants.SCREEN_WIDTH; +import static org.jcnc.jnotepad.app.common.constants.AppConstants.SCREEN_LENGTH; +import static org.jcnc.jnotepad.app.common.constants.AppConstants.SCREEN_WIDTH; /** * SetStage类表示设置窗口的单例对象。此窗口用于显示不同的设置选项和其对应的布局。 diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/topmenu/builder/StageButtonBuilder.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/builder/StageButtonBuilder.java similarity index 92% rename from src/main/java/org/jcnc/jnotepad/component/stage/topmenu/builder/StageButtonBuilder.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/builder/StageButtonBuilder.java index 22e022b..01b7ec7 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/topmenu/builder/StageButtonBuilder.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/builder/StageButtonBuilder.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.stage.topmenu.builder; +package org.jcnc.jnotepad.ui.component.stage.topmenu.builder; import javafx.event.ActionEvent; import javafx.event.EventHandler; diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/topmenu/help/DeveloperDebugPaneStage.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/DeveloperDebugPaneStage.java similarity index 94% rename from src/main/java/org/jcnc/jnotepad/component/stage/topmenu/help/DeveloperDebugPaneStage.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/DeveloperDebugPaneStage.java index 7735781..972048d 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/topmenu/help/DeveloperDebugPaneStage.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/DeveloperDebugPaneStage.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.stage.topmenu.help; +package org.jcnc.jnotepad.ui.component.stage.topmenu.help; import javafx.geometry.Insets; import javafx.scene.Scene; @@ -10,10 +10,10 @@ import javafx.scene.layout.VBox; import javafx.stage.Stage; import org.jcnc.jnotepad.api.core.component.stage.AbstractPaneStage; import org.jcnc.jnotepad.app.manager.ApplicationManager; -import org.jcnc.jnotepad.component.stage.topmenu.builder.StageButtonBuilder; -import org.jcnc.jnotepad.util.LogUtil; -import org.jcnc.jnotepad.util.PopUpUtil; -import org.jcnc.jnotepad.util.UiUtil; +import org.jcnc.jnotepad.app.util.LogUtil; +import org.jcnc.jnotepad.app.util.PopUpUtil; +import org.jcnc.jnotepad.app.util.UiUtil; +import org.jcnc.jnotepad.ui.component.stage.topmenu.builder.StageButtonBuilder; import org.slf4j.Logger; /** diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/topmenu/help/HelpPaneStage.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/HelpPaneStage.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/component/stage/topmenu/help/HelpPaneStage.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/HelpPaneStage.java index 7ac86ad..cb41527 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/topmenu/help/HelpPaneStage.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/HelpPaneStage.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.stage.topmenu.help; +package org.jcnc.jnotepad.ui.component.stage.topmenu.help; import atlantafx.base.theme.Styles; import javafx.event.ActionEvent; @@ -16,12 +16,12 @@ import javafx.scene.layout.VBox; import javafx.stage.Modality; import javafx.stage.Stage; import org.jcnc.jnotepad.api.core.component.stage.AbstractPaneStage; -import org.jcnc.jnotepad.util.ClipboardUtil; -import org.jcnc.jnotepad.util.LogUtil; -import org.jcnc.jnotepad.util.NotificationUtil; -import org.jcnc.jnotepad.util.UiUtil; +import org.jcnc.jnotepad.app.util.ClipboardUtil; +import org.jcnc.jnotepad.app.util.LogUtil; +import org.jcnc.jnotepad.app.util.NotificationUtil; +import org.jcnc.jnotepad.app.util.UiUtil; -import static org.jcnc.jnotepad.common.constants.AppConstants.*; +import static org.jcnc.jnotepad.app.common.constants.AppConstants.*; /** * 帮助页面 diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/topmenu/plugin/CustomSplitPane.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/plugin/CustomSplitPane.java similarity index 96% rename from src/main/java/org/jcnc/jnotepad/component/stage/topmenu/plugin/CustomSplitPane.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/plugin/CustomSplitPane.java index 42a6e36..4018f0a 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/topmenu/plugin/CustomSplitPane.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/plugin/CustomSplitPane.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.stage.topmenu.plugin; +package org.jcnc.jnotepad.ui.component.stage.topmenu.plugin; import javafx.geometry.Orientation; import javafx.scene.control.SplitPane; diff --git a/src/main/java/org/jcnc/jnotepad/component/stage/topmenu/plugin/PluginManagementPane.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/plugin/PluginManagementPane.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/component/stage/topmenu/plugin/PluginManagementPane.java rename to src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/plugin/PluginManagementPane.java index fa39582..26c6571 100644 --- a/src/main/java/org/jcnc/jnotepad/component/stage/topmenu/plugin/PluginManagementPane.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/plugin/PluginManagementPane.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.component.stage.topmenu.plugin; +package org.jcnc.jnotepad.ui.component.stage.topmenu.plugin; import atlantafx.base.controls.Tile; import atlantafx.base.controls.ToggleSwitch; @@ -26,12 +26,12 @@ import javafx.stage.Stage; import org.commonmark.parser.Parser; import org.commonmark.renderer.html.HtmlRenderer; import org.jcnc.jnotepad.api.core.component.stage.AbstractPaneStage; -import org.jcnc.jnotepad.component.stage.setting.CustomSetButton; +import org.jcnc.jnotepad.app.util.LogUtil; +import org.jcnc.jnotepad.app.util.PopUpUtil; +import org.jcnc.jnotepad.app.util.UiUtil; +import org.jcnc.jnotepad.controller.plugin.manager.PluginManager; import org.jcnc.jnotepad.model.entity.PluginDescriptor; -import org.jcnc.jnotepad.plugin.manager.PluginManager; -import org.jcnc.jnotepad.util.LogUtil; -import org.jcnc.jnotepad.util.PopUpUtil; -import org.jcnc.jnotepad.util.UiUtil; +import org.jcnc.jnotepad.ui.component.stage.setting.CustomSetButton; import org.slf4j.Logger; import java.awt.*; diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/BottomStatusBoxManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/BottomStatusBoxManager.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/views/manager/BottomStatusBoxManager.java rename to src/main/java/org/jcnc/jnotepad/ui/views/manager/BottomStatusBoxManager.java index 4874082..afb5bed 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/BottomStatusBoxManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/BottomStatusBoxManager.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.views.manager; +package org.jcnc.jnotepad.ui.views.manager; import javafx.beans.value.ChangeListener; import javafx.collections.ObservableList; @@ -10,12 +10,12 @@ import javafx.scene.control.Label; import javafx.scene.control.Tab; import javafx.scene.layout.HBox; import org.jcnc.jnotepad.api.core.views.manager.builder.BottomStatusBoxButtonBuilder; +import org.jcnc.jnotepad.app.common.constants.TextConstants; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; -import org.jcnc.jnotepad.common.constants.TextConstants; -import org.jcnc.jnotepad.component.module.TextCodeArea; -import org.jcnc.jnotepad.views.root.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.jcnc.jnotepad.ui.component.module.TextCodeArea; +import org.jcnc.jnotepad.ui.views.root.bottom.status.BottomStatusBox; +import org.jcnc.jnotepad.ui.views.root.center.main.center.tab.CenterTab; +import org.jcnc.jnotepad.ui.views.root.center.main.center.tab.CenterTabPane; import org.kordamp.ikonli.javafx.FontIcon; import java.nio.charset.Charset; diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/BuildPanelManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/BuildPanelManager.java similarity index 89% rename from src/main/java/org/jcnc/jnotepad/views/manager/BuildPanelManager.java rename to src/main/java/org/jcnc/jnotepad/ui/views/manager/BuildPanelManager.java index 199fb73..4ba4cb2 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/BuildPanelManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/BuildPanelManager.java @@ -1,8 +1,8 @@ -package org.jcnc.jnotepad.views.manager; +package org.jcnc.jnotepad.ui.views.manager; import javafx.scene.control.SplitPane; -import org.jcnc.jnotepad.component.module.TextCodeArea; -import org.jcnc.jnotepad.views.root.center.main.MainBorderPane; +import org.jcnc.jnotepad.ui.component.module.TextCodeArea; +import org.jcnc.jnotepad.ui.views.root.center.main.MainBorderPane; /** * 构建底部三大菜单管理类 diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/CenterTabPaneManager.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java rename to src/main/java/org/jcnc/jnotepad/ui/views/manager/CenterTabPaneManager.java index d7e6584..9913f90 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/CenterTabPaneManager.java @@ -1,18 +1,18 @@ -package org.jcnc.jnotepad.views.manager; +package org.jcnc.jnotepad.ui.views.manager; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; import javafx.scene.control.Tab; import javafx.stage.Stage; -import org.jcnc.jnotepad.common.manager.ApplicationCacheManager; -import org.jcnc.jnotepad.component.module.TextCodeArea; +import org.jcnc.jnotepad.app.common.manager.ApplicationCacheManager; +import org.jcnc.jnotepad.app.util.FileUtil; +import org.jcnc.jnotepad.app.util.PopUpUtil; import org.jcnc.jnotepad.controller.config.UserConfigController; import org.jcnc.jnotepad.model.enums.CacheExpirationTime; -import org.jcnc.jnotepad.util.FileUtil; -import org.jcnc.jnotepad.util.PopUpUtil; -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.menubar.TopMenuBar; +import org.jcnc.jnotepad.ui.component.module.TextCodeArea; +import org.jcnc.jnotepad.ui.views.root.center.main.center.tab.CenterTab; +import org.jcnc.jnotepad.ui.views.root.center.main.center.tab.CenterTabPane; +import org.jcnc.jnotepad.ui.views.root.top.menubar.TopMenuBar; import java.io.File; import java.util.ArrayList; diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/DirectorySidebarManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/DirectorySidebarManager.java similarity index 92% rename from src/main/java/org/jcnc/jnotepad/views/manager/DirectorySidebarManager.java rename to src/main/java/org/jcnc/jnotepad/ui/views/manager/DirectorySidebarManager.java index bc2b104..4aaaa4e 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/DirectorySidebarManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/DirectorySidebarManager.java @@ -1,15 +1,15 @@ -package org.jcnc.jnotepad.views.manager; +package org.jcnc.jnotepad.ui.views.manager; import javafx.beans.value.ChangeListener; import javafx.scene.control.SplitPane; import javafx.scene.control.TreeItem; -import org.jcnc.jnotepad.common.constants.SplitPaneItemConstants; -import org.jcnc.jnotepad.common.manager.ApplicationCacheManager; +import org.jcnc.jnotepad.app.common.constants.SplitPaneItemConstants; +import org.jcnc.jnotepad.app.common.manager.ApplicationCacheManager; +import org.jcnc.jnotepad.app.util.FileUtil; import org.jcnc.jnotepad.controller.event.handler.toolbar.OpenDirectory; import org.jcnc.jnotepad.model.entity.DirFileModel; -import org.jcnc.jnotepad.util.FileUtil; -import org.jcnc.jnotepad.views.root.center.main.MainBorderPane; -import org.jcnc.jnotepad.views.root.center.main.center.directory.DirectorySidebarPane; +import org.jcnc.jnotepad.ui.views.root.center.main.MainBorderPane; +import org.jcnc.jnotepad.ui.views.root.center.main.center.directory.DirectorySidebarPane; import java.io.File; import java.util.List; diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/MainBorderPaneManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/MainBorderPaneManager.java similarity index 81% rename from src/main/java/org/jcnc/jnotepad/views/manager/MainBorderPaneManager.java rename to src/main/java/org/jcnc/jnotepad/ui/views/manager/MainBorderPaneManager.java index 13a5eb7..aff2c01 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/MainBorderPaneManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/MainBorderPaneManager.java @@ -1,12 +1,12 @@ -package org.jcnc.jnotepad.views.manager; +package org.jcnc.jnotepad.ui.views.manager; import javafx.geometry.Orientation; import javafx.scene.control.SplitPane; -import org.jcnc.jnotepad.common.constants.SplitPaneItemConstants; -import org.jcnc.jnotepad.component.module.vbox.BuildPanel; -import org.jcnc.jnotepad.views.root.center.main.MainBorderPane; -import org.jcnc.jnotepad.views.root.center.main.center.directory.DirectorySidebarPane; -import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTabPane; +import org.jcnc.jnotepad.app.common.constants.SplitPaneItemConstants; +import org.jcnc.jnotepad.ui.component.module.vbox.BuildPanel; +import org.jcnc.jnotepad.ui.views.root.center.main.MainBorderPane; +import org.jcnc.jnotepad.ui.views.root.center.main.center.directory.DirectorySidebarPane; +import org.jcnc.jnotepad.ui.views.root.center.main.center.tab.CenterTabPane; /** * 主界面边界布局 diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/RootBorderPaneManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/RootBorderPaneManager.java similarity index 74% rename from src/main/java/org/jcnc/jnotepad/views/manager/RootBorderPaneManager.java rename to src/main/java/org/jcnc/jnotepad/ui/views/manager/RootBorderPaneManager.java index 005e4a2..82fa0c7 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/RootBorderPaneManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/RootBorderPaneManager.java @@ -1,11 +1,11 @@ -package org.jcnc.jnotepad.views.manager; +package org.jcnc.jnotepad.ui.views.manager; -import org.jcnc.jnotepad.views.root.RootBorderPane; -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.ToolVerticalBox; -import org.jcnc.jnotepad.views.root.right.RootRightSideBarVerticalBox; -import org.jcnc.jnotepad.views.root.top.RootTopBorderPane; +import org.jcnc.jnotepad.ui.views.root.RootBorderPane; +import org.jcnc.jnotepad.ui.views.root.bottom.RootBottomSideBarVerticalBox; +import org.jcnc.jnotepad.ui.views.root.center.main.MainBorderPane; +import org.jcnc.jnotepad.ui.views.root.left.sidebar.tools.ToolVerticalBox; +import org.jcnc.jnotepad.ui.views.root.right.RootRightSideBarVerticalBox; +import org.jcnc.jnotepad.ui.views.root.top.RootTopBorderPane; /** * 应用程序的根布局管理类 diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/RootBottomSideBarVerticalBoxManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/RootBottomSideBarVerticalBoxManager.java similarity index 81% rename from src/main/java/org/jcnc/jnotepad/views/manager/RootBottomSideBarVerticalBoxManager.java rename to src/main/java/org/jcnc/jnotepad/ui/views/manager/RootBottomSideBarVerticalBoxManager.java index 107b4ab..0120c8d 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/RootBottomSideBarVerticalBoxManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/RootBottomSideBarVerticalBoxManager.java @@ -1,9 +1,9 @@ -package org.jcnc.jnotepad.views.manager; +package org.jcnc.jnotepad.ui.views.manager; import javafx.scene.layout.VBox; -import org.jcnc.jnotepad.views.root.bottom.RootBottomSideBarVerticalBox; -import org.jcnc.jnotepad.views.root.bottom.function.FunctionBox; -import org.jcnc.jnotepad.views.root.bottom.status.BottomStatusBox; +import org.jcnc.jnotepad.ui.views.root.bottom.RootBottomSideBarVerticalBox; +import org.jcnc.jnotepad.ui.views.root.bottom.function.FunctionBox; +import org.jcnc.jnotepad.ui.views.root.bottom.status.BottomStatusBox; /** * 底部根侧边栏垂直布局管理类 diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/RootManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/RootManager.java similarity index 98% rename from src/main/java/org/jcnc/jnotepad/views/manager/RootManager.java rename to src/main/java/org/jcnc/jnotepad/ui/views/manager/RootManager.java index fc6b5bc..5e0fb37 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/RootManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/RootManager.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.views.manager; +package org.jcnc.jnotepad.ui.views.manager; import atlantafx.base.controls.Notification; import atlantafx.base.util.Animations; @@ -12,7 +12,7 @@ import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; import javafx.util.Duration; import org.jcnc.jnotepad.controller.exception.AppException; -import org.jcnc.jnotepad.views.root.RootBorderPane; +import org.jcnc.jnotepad.ui.views.root.RootBorderPane; /** * 根布局管理器类，用于管理记事本应用程序的根布局组件。 diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/RootRightSideBarVerticalBoxManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/RootRightSideBarVerticalBoxManager.java similarity index 85% rename from src/main/java/org/jcnc/jnotepad/views/manager/RootRightSideBarVerticalBoxManager.java rename to src/main/java/org/jcnc/jnotepad/ui/views/manager/RootRightSideBarVerticalBoxManager.java index e06a904..a7cbe4b 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/RootRightSideBarVerticalBoxManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/RootRightSideBarVerticalBoxManager.java @@ -1,6 +1,6 @@ -package org.jcnc.jnotepad.views.manager; +package org.jcnc.jnotepad.ui.views.manager; -import org.jcnc.jnotepad.views.root.right.RootRightSideBarVerticalBox; +import org.jcnc.jnotepad.ui.views.root.right.RootRightSideBarVerticalBox; /** * 右侧边栏的垂直布局容器管理类 diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/RootTopBorderPaneManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/RootTopBorderPaneManager.java similarity index 80% rename from src/main/java/org/jcnc/jnotepad/views/manager/RootTopBorderPaneManager.java rename to src/main/java/org/jcnc/jnotepad/ui/views/manager/RootTopBorderPaneManager.java index 0d8308c..f0921fe 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/RootTopBorderPaneManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/RootTopBorderPaneManager.java @@ -1,7 +1,7 @@ -package org.jcnc.jnotepad.views.manager; +package org.jcnc.jnotepad.ui.views.manager; -import org.jcnc.jnotepad.views.root.top.RootTopBorderPane; -import org.jcnc.jnotepad.views.root.top.menubar.TopMenuBar; +import org.jcnc.jnotepad.ui.views.root.top.RootTopBorderPane; +import org.jcnc.jnotepad.ui.views.root.top.menubar.TopMenuBar; /** * 顶部边界面板管理类 diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/SidebarToolBarManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/SidebarToolBarManager.java similarity index 94% rename from src/main/java/org/jcnc/jnotepad/views/manager/SidebarToolBarManager.java rename to src/main/java/org/jcnc/jnotepad/ui/views/manager/SidebarToolBarManager.java index cad62de..ec4f214 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/SidebarToolBarManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/SidebarToolBarManager.java @@ -1,13 +1,13 @@ -package org.jcnc.jnotepad.views.manager; +package org.jcnc.jnotepad.ui.views.manager; import javafx.scene.Node; import org.jcnc.jnotepad.api.core.views.manager.AbstractManager; import org.jcnc.jnotepad.api.core.views.manager.builder.SideBarButtonBuilder; +import org.jcnc.jnotepad.app.util.UiUtil; import org.jcnc.jnotepad.controller.event.handler.toolbar.DirTreeBtn; import org.jcnc.jnotepad.controller.event.handler.toolbar.RunBtn; import org.jcnc.jnotepad.controller.event.handler.toolbar.SetBtn; -import org.jcnc.jnotepad.util.UiUtil; -import org.jcnc.jnotepad.views.root.left.sidebar.tools.SidebarToolBar; +import org.jcnc.jnotepad.ui.views.root.left.sidebar.tools.SidebarToolBar; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/TopMenuBarManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/TopMenuBarManager.java similarity index 94% rename from src/main/java/org/jcnc/jnotepad/views/manager/TopMenuBarManager.java rename to src/main/java/org/jcnc/jnotepad/ui/views/manager/TopMenuBarManager.java index 03edb9f..89cd9bd 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/TopMenuBarManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/TopMenuBarManager.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.views.manager; +package org.jcnc.jnotepad.ui.views.manager; import javafx.collections.ObservableList; import javafx.geometry.Insets; @@ -6,11 +6,11 @@ import javafx.scene.control.Menu; import javafx.scene.control.MenuItem; import javafx.scene.input.KeyCombination; import org.jcnc.jnotepad.api.core.views.manager.AbstractManager; +import org.jcnc.jnotepad.app.util.LogUtil; import org.jcnc.jnotepad.controller.config.UserConfigController; import org.jcnc.jnotepad.model.entity.ShortcutKey; -import org.jcnc.jnotepad.util.LogUtil; -import org.jcnc.jnotepad.views.root.top.menubar.TopMenuBar; -import org.jcnc.jnotepad.views.root.top.menubar.menu.*; +import org.jcnc.jnotepad.ui.views.root.top.menubar.TopMenuBar; +import org.jcnc.jnotepad.ui.views.root.top.menubar.menu.*; import org.slf4j.Logger; import java.util.ArrayList; diff --git a/src/main/java/org/jcnc/jnotepad/views/root/RootBorderPane.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/RootBorderPane.java similarity index 85% rename from src/main/java/org/jcnc/jnotepad/views/root/RootBorderPane.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/RootBorderPane.java index 88b50b4..1fcc2ed 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/RootBorderPane.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/RootBorderPane.java @@ -1,6 +1,6 @@ -package org.jcnc.jnotepad.views.root; +package org.jcnc.jnotepad.ui.views.root; -import org.jcnc.jnotepad.component.module.base.AbstractBorderPane; +import org.jcnc.jnotepad.ui.component.module.base.AbstractBorderPane; /** * RootBorderPane 表示 JNotepad 应用程序的根布局。 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/bottom/RootBottomSideBarVerticalBox.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/bottom/RootBottomSideBarVerticalBox.java similarity index 87% rename from src/main/java/org/jcnc/jnotepad/views/root/bottom/RootBottomSideBarVerticalBox.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/bottom/RootBottomSideBarVerticalBox.java index ade0095..1b785bb 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/bottom/RootBottomSideBarVerticalBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/bottom/RootBottomSideBarVerticalBox.java @@ -1,7 +1,7 @@ -package org.jcnc.jnotepad.views.root.bottom; +package org.jcnc.jnotepad.ui.views.root.bottom; import javafx.scene.layout.VBox; -import org.jcnc.jnotepad.component.module.base.AbstractVerticalBox; +import org.jcnc.jnotepad.ui.component.module.base.AbstractVerticalBox; /** * 底部根侧边栏垂直布局 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/bottom/function/FunctionBox.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/bottom/function/FunctionBox.java similarity index 92% rename from src/main/java/org/jcnc/jnotepad/views/root/bottom/function/FunctionBox.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/bottom/function/FunctionBox.java index 0fcd58e..5d9826a 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/bottom/function/FunctionBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/bottom/function/FunctionBox.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.views.root.bottom.function; +package org.jcnc.jnotepad.ui.views.root.bottom.function; import javafx.geometry.Insets; import javafx.scene.control.MenuBar; diff --git a/src/main/java/org/jcnc/jnotepad/views/root/bottom/status/BottomStatusBox.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/bottom/status/BottomStatusBox.java similarity index 87% rename from src/main/java/org/jcnc/jnotepad/views/root/bottom/status/BottomStatusBox.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/bottom/status/BottomStatusBox.java index d95e7c6..6f1133a 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/bottom/status/BottomStatusBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/bottom/status/BottomStatusBox.java @@ -1,8 +1,8 @@ -package org.jcnc.jnotepad.views.root.bottom.status; +package org.jcnc.jnotepad.ui.views.root.bottom.status; import javafx.scene.control.Button; import javafx.scene.control.Label; -import org.jcnc.jnotepad.component.module.base.AbstractHorizontalBox; +import org.jcnc.jnotepad.ui.component.module.base.AbstractHorizontalBox; /** * 状态栏组件封装。 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/center/main/MainBorderPane.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/MainBorderPane.java similarity index 80% rename from src/main/java/org/jcnc/jnotepad/views/root/center/main/MainBorderPane.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/MainBorderPane.java index 5bbef69..88eb532 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/center/main/MainBorderPane.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/MainBorderPane.java @@ -1,6 +1,6 @@ -package org.jcnc.jnotepad.views.root.center.main; +package org.jcnc.jnotepad.ui.views.root.center.main; -import org.jcnc.jnotepad.component.module.base.AbstractBorderPane; +import org.jcnc.jnotepad.ui.component.module.base.AbstractBorderPane; /** * 主界面边界布局 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/directory/DirectorySidebarPane.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/directory/DirectorySidebarPane.java similarity index 89% rename from src/main/java/org/jcnc/jnotepad/views/root/center/main/center/directory/DirectorySidebarPane.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/directory/DirectorySidebarPane.java index 02563bc..fbe31e1 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/directory/DirectorySidebarPane.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/directory/DirectorySidebarPane.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.views.root.center.main.center.directory; +package org.jcnc.jnotepad.ui.views.root.center.main.center.directory; import javafx.scene.control.TreeItem; import javafx.scene.control.TreeView; @@ -7,7 +7,7 @@ import org.jcnc.jnotepad.model.entity.DirFileModel; import java.io.File; import java.util.Objects; -import static org.jcnc.jnotepad.util.TabUtil.openFileToTab; +import static org.jcnc.jnotepad.app.util.TabUtil.openFileToTab; /** diff --git a/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTab.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/tab/CenterTab.java similarity index 93% rename from src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTab.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/tab/CenterTab.java index f365523..871edb8 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTab.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/tab/CenterTab.java @@ -1,16 +1,16 @@ -package org.jcnc.jnotepad.views.root.center.main.center.tab; +package org.jcnc.jnotepad.ui.views.root.center.main.center.tab; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.scene.control.Tab; import org.fxmisc.flowless.VirtualizedScrollPane; -import org.jcnc.jnotepad.component.module.TextCodeArea; +import org.jcnc.jnotepad.app.util.FileUtil; +import org.jcnc.jnotepad.app.util.LogUtil; +import org.jcnc.jnotepad.app.util.TabUtil; import org.jcnc.jnotepad.controller.config.UserConfigController; -import org.jcnc.jnotepad.util.FileUtil; -import org.jcnc.jnotepad.util.LogUtil; -import org.jcnc.jnotepad.util.TabUtil; -import org.jcnc.jnotepad.views.manager.BottomStatusBoxManager; -import org.jcnc.jnotepad.views.manager.CenterTabPaneManager; +import org.jcnc.jnotepad.ui.component.module.TextCodeArea; +import org.jcnc.jnotepad.ui.views.manager.BottomStatusBoxManager; +import org.jcnc.jnotepad.ui.views.manager.CenterTabPaneManager; import org.slf4j.Logger; import java.io.BufferedWriter; diff --git a/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTabPane.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/tab/CenterTabPane.java similarity index 84% rename from src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTabPane.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/tab/CenterTabPane.java index b242380..c1909d3 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTabPane.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/tab/CenterTabPane.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.views.root.center.main.center.tab; +package org.jcnc.jnotepad.ui.views.root.center.main.center.tab; import javafx.scene.control.TabPane; diff --git a/src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/SidebarToolBar.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/left/sidebar/tools/SidebarToolBar.java similarity index 96% rename from src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/SidebarToolBar.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/left/sidebar/tools/SidebarToolBar.java index a406e4a..268e441 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/SidebarToolBar.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/left/sidebar/tools/SidebarToolBar.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.views.root.left.sidebar.tools; +package org.jcnc.jnotepad.ui.views.root.left.sidebar.tools; import javafx.geometry.Insets; import javafx.geometry.Orientation; diff --git a/src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/ToolVerticalBox.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/left/sidebar/tools/ToolVerticalBox.java similarity index 86% rename from src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/ToolVerticalBox.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/left/sidebar/tools/ToolVerticalBox.java index 4b16b08..69a189b 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/ToolVerticalBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/left/sidebar/tools/ToolVerticalBox.java @@ -1,8 +1,8 @@ -package org.jcnc.jnotepad.views.root.left.sidebar.tools; +package org.jcnc.jnotepad.ui.views.root.left.sidebar.tools; import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; -import org.jcnc.jnotepad.component.module.base.AbstractVerticalBox; +import org.jcnc.jnotepad.ui.component.module.base.AbstractVerticalBox; /** * 垂直布局类 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/right/RootRightSideBarVerticalBox.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/right/RootRightSideBarVerticalBox.java similarity index 85% rename from src/main/java/org/jcnc/jnotepad/views/root/right/RootRightSideBarVerticalBox.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/right/RootRightSideBarVerticalBox.java index 6de4e90..aed21d1 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/right/RootRightSideBarVerticalBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/right/RootRightSideBarVerticalBox.java @@ -1,6 +1,6 @@ -package org.jcnc.jnotepad.views.root.right; +package org.jcnc.jnotepad.ui.views.root.right; -import org.jcnc.jnotepad.component.module.base.AbstractVerticalBox; +import org.jcnc.jnotepad.ui.component.module.base.AbstractVerticalBox; /** * 右侧边栏的垂直布局容器类。 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/top/RootTopBorderPane.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/RootTopBorderPane.java similarity index 85% rename from src/main/java/org/jcnc/jnotepad/views/root/top/RootTopBorderPane.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/top/RootTopBorderPane.java index 7cd3d7a..2abc29d 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/top/RootTopBorderPane.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/RootTopBorderPane.java @@ -1,6 +1,6 @@ -package org.jcnc.jnotepad.views.root.top; +package org.jcnc.jnotepad.ui.views.root.top; -import org.jcnc.jnotepad.component.module.base.AbstractBorderPane; +import org.jcnc.jnotepad.ui.component.module.base.AbstractBorderPane; /** * RootTopBorderPane 类表示 JNotepad 应用程序的顶部边界面板。 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/TopMenuBar.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/TopMenuBar.java similarity index 96% rename from src/main/java/org/jcnc/jnotepad/views/root/top/menubar/TopMenuBar.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/TopMenuBar.java index 7d82c07..ca594df 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/TopMenuBar.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/TopMenuBar.java @@ -1,8 +1,8 @@ -package org.jcnc.jnotepad.views.root.top.menubar; +package org.jcnc.jnotepad.ui.views.root.top.menubar; import javafx.scene.control.*; -import org.jcnc.jnotepad.views.manager.CenterTabPaneManager; -import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTab; +import org.jcnc.jnotepad.ui.views.manager.CenterTabPaneManager; +import org.jcnc.jnotepad.ui.views.root.center.main.center.tab.CenterTab; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/FileTopMenu.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/FileTopMenu.java similarity index 93% rename from src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/FileTopMenu.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/FileTopMenu.java index ceac373..0d290db 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/FileTopMenu.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/FileTopMenu.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.views.root.top.menubar.menu; +package org.jcnc.jnotepad.ui.views.root.top.menubar.menu; import javafx.scene.control.Menu; import javafx.scene.control.MenuItem; @@ -9,7 +9,7 @@ import org.jcnc.jnotepad.controller.event.handler.toolbar.OpenDirectory; import java.util.HashMap; import java.util.Map; -import static org.jcnc.jnotepad.common.constants.TextConstants.*; +import static org.jcnc.jnotepad.app.common.constants.TextConstants.*; /** * 文件菜单 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/HelpTopMenu.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/HelpTopMenu.java similarity index 83% rename from src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/HelpTopMenu.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/HelpTopMenu.java index 7626a34..035f129 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/HelpTopMenu.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/HelpTopMenu.java @@ -1,16 +1,16 @@ -package org.jcnc.jnotepad.views.root.top.menubar.menu; +package org.jcnc.jnotepad.ui.views.root.top.menubar.menu; import javafx.scene.control.Menu; import javafx.scene.control.MenuItem; import javafx.stage.Stage; import org.jcnc.jnotepad.api.core.views.top.menu.AbstractTopMenu; -import org.jcnc.jnotepad.component.stage.topmenu.help.DeveloperDebugPaneStage; -import org.jcnc.jnotepad.component.stage.topmenu.help.HelpPaneStage; +import org.jcnc.jnotepad.ui.component.stage.topmenu.help.DeveloperDebugPaneStage; +import org.jcnc.jnotepad.ui.component.stage.topmenu.help.HelpPaneStage; import java.util.HashMap; import java.util.Map; -import static org.jcnc.jnotepad.common.constants.TextConstants.*; +import static org.jcnc.jnotepad.app.common.constants.TextConstants.*; /** * 帮助菜单 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/LanguageTopMenu.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/LanguageTopMenu.java similarity index 96% rename from src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/LanguageTopMenu.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/LanguageTopMenu.java index 98e0b60..3fa2d47 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/LanguageTopMenu.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/LanguageTopMenu.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.views.root.top.menubar.menu; +package org.jcnc.jnotepad.ui.views.root.top.menubar.menu; import javafx.event.ActionEvent; import javafx.scene.control.Menu; @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import static org.jcnc.jnotepad.common.constants.TextConstants.*; +import static org.jcnc.jnotepad.app.common.constants.TextConstants.*; /** * 语言顶部菜单 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/PluginTopMenu.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/PluginTopMenu.java similarity index 86% rename from src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/PluginTopMenu.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/PluginTopMenu.java index 10ac572..f3291bc 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/PluginTopMenu.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/PluginTopMenu.java @@ -1,14 +1,14 @@ -package org.jcnc.jnotepad.views.root.top.menubar.menu; +package org.jcnc.jnotepad.ui.views.root.top.menubar.menu; import javafx.scene.control.Menu; import javafx.scene.control.MenuItem; import org.jcnc.jnotepad.api.core.views.top.menu.AbstractTopMenu; -import org.jcnc.jnotepad.component.stage.topmenu.plugin.PluginManagementPane; +import org.jcnc.jnotepad.ui.component.stage.topmenu.plugin.PluginManagementPane; import java.util.HashMap; import java.util.Map; -import static org.jcnc.jnotepad.common.constants.TextConstants.*; +import static org.jcnc.jnotepad.app.common.constants.TextConstants.*; /** * 插件菜单 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/RunTopMenu.java similarity index 89% rename from src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/RunTopMenu.java index a65d5f8..9cf0f2d 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/RunTopMenu.java @@ -1,22 +1,22 @@ -package org.jcnc.jnotepad.views.root.top.menubar.menu; +package org.jcnc.jnotepad.ui.views.root.top.menubar.menu; import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.scene.control.Menu; import javafx.scene.control.MenuItem; import org.jcnc.jnotepad.api.core.views.top.menu.AbstractTopMenu; -import org.jcnc.jnotepad.component.module.vbox.BuildPanel; -import org.jcnc.jnotepad.util.LogUtil; -import org.jcnc.jnotepad.views.manager.BuildPanelManager; -import org.jcnc.jnotepad.views.manager.CenterTabPaneManager; -import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTab; +import org.jcnc.jnotepad.app.util.LogUtil; +import org.jcnc.jnotepad.ui.component.module.vbox.BuildPanel; +import org.jcnc.jnotepad.ui.views.manager.BuildPanelManager; +import org.jcnc.jnotepad.ui.views.manager.CenterTabPaneManager; +import org.jcnc.jnotepad.ui.views.root.center.main.center.tab.CenterTab; import java.io.*; import java.util.HashMap; import java.util.Map; -import static org.jcnc.jnotepad.common.constants.TextConstants.DE_BUG; -import static org.jcnc.jnotepad.common.constants.TextConstants.RUN; +import static org.jcnc.jnotepad.app.common.constants.TextConstants.DE_BUG; +import static org.jcnc.jnotepad.app.common.constants.TextConstants.RUN; /** * 运行菜单 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/SettingTopMenu.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/SettingTopMenu.java similarity index 90% rename from src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/SettingTopMenu.java rename to src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/SettingTopMenu.java index e4d262d..e9e8e3d 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/SettingTopMenu.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/SettingTopMenu.java @@ -1,18 +1,18 @@ -package org.jcnc.jnotepad.views.root.top.menubar.menu; +package org.jcnc.jnotepad.ui.views.root.top.menubar.menu; import javafx.scene.control.Menu; import javafx.scene.control.MenuItem; import javafx.stage.Stage; import org.jcnc.jnotepad.api.core.views.top.menu.AbstractTopMenu; +import org.jcnc.jnotepad.app.util.UiUtil; import org.jcnc.jnotepad.controller.config.UserConfigController; import org.jcnc.jnotepad.controller.event.handler.menuitem.OpenConfig; -import org.jcnc.jnotepad.util.UiUtil; -import org.jcnc.jnotepad.views.manager.CenterTabPaneManager; +import org.jcnc.jnotepad.ui.views.manager.CenterTabPaneManager; import java.util.HashMap; import java.util.Map; -import static org.jcnc.jnotepad.common.constants.TextConstants.*; +import static org.jcnc.jnotepad.app.common.constants.TextConstants.*; /** * 设置菜单