diff --git a/src/main/java/org/jcnc/jnotepad/JnotepadApp.java b/src/main/java/org/jcnc/jnotepad/JnotepadApp.java index 8d2abe2..170e258 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.app.util.LogUtil; +import org.jcnc.jnotepad.app.utils.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 5d04c42..6fde0b8 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,9 +1,9 @@ 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.app.utils.JsonUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; +import org.jcnc.jnotepad.app.utils.PopUpUtil; import org.jcnc.jnotepad.controller.exception.AppException; import org.slf4j.Logger; 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 d2154bc..54d9e58 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,7 +8,7 @@ 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.app.util.LogUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; import org.jcnc.jnotepad.ui.views.root.top.menubar.TopMenuBar; import org.slf4j.Logger; diff --git a/src/main/java/org/jcnc/jnotepad/app/common/manager/ThreadPoolManager.java b/src/main/java/org/jcnc/jnotepad/app/common/manager/ThreadPoolManager.java index fcf5bbd..faf8055 100644 --- a/src/main/java/org/jcnc/jnotepad/app/common/manager/ThreadPoolManager.java +++ b/src/main/java/org/jcnc/jnotepad/app/common/manager/ThreadPoolManager.java @@ -1,6 +1,6 @@ package org.jcnc.jnotepad.app.common.manager; -import org.jcnc.jnotepad.app.util.LogUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; import org.slf4j.Logger; import java.util.concurrent.*; 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 d0aba5a..3d7467d 100644 --- a/src/main/java/org/jcnc/jnotepad/app/manager/ApplicationManager.java +++ b/src/main/java/org/jcnc/jnotepad/app/manager/ApplicationManager.java @@ -13,9 +13,9 @@ 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.app.util.FileUtil; -import org.jcnc.jnotepad.app.util.LogUtil; -import org.jcnc.jnotepad.app.util.UiUtil; +import org.jcnc.jnotepad.app.utils.FileUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; +import org.jcnc.jnotepad.app.utils.UiUtil; import org.jcnc.jnotepad.controller.ResourceController; import org.jcnc.jnotepad.controller.cache.CacheController; import org.jcnc.jnotepad.controller.config.AppConfigController; diff --git a/src/main/java/org/jcnc/jnotepad/app/util/ClipboardUtil.java b/src/main/java/org/jcnc/jnotepad/app/utils/ClipboardUtil.java similarity index 96% rename from src/main/java/org/jcnc/jnotepad/app/util/ClipboardUtil.java rename to src/main/java/org/jcnc/jnotepad/app/utils/ClipboardUtil.java index dd42114..100153a 100644 --- a/src/main/java/org/jcnc/jnotepad/app/util/ClipboardUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/utils/ClipboardUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.app.util; +package org.jcnc.jnotepad.app.utils; import javafx.scene.input.Clipboard; import javafx.scene.input.ClipboardContent; diff --git a/src/main/java/org/jcnc/jnotepad/app/util/EncodingDetector.java b/src/main/java/org/jcnc/jnotepad/app/utils/EncodingDetector.java similarity index 98% rename from src/main/java/org/jcnc/jnotepad/app/util/EncodingDetector.java rename to src/main/java/org/jcnc/jnotepad/app/utils/EncodingDetector.java index 620fbfa..550a9a1 100644 --- a/src/main/java/org/jcnc/jnotepad/app/util/EncodingDetector.java +++ b/src/main/java/org/jcnc/jnotepad/app/utils/EncodingDetector.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.app.util; +package org.jcnc.jnotepad.app.utils; import com.ibm.icu.text.CharsetDetector; import com.ibm.icu.text.CharsetMatch; diff --git a/src/main/java/org/jcnc/jnotepad/app/util/FileUtil.java b/src/main/java/org/jcnc/jnotepad/app/utils/FileUtil.java similarity index 99% rename from src/main/java/org/jcnc/jnotepad/app/util/FileUtil.java rename to src/main/java/org/jcnc/jnotepad/app/utils/FileUtil.java index 8f6b6ad..9b1fe76 100644 --- a/src/main/java/org/jcnc/jnotepad/app/util/FileUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/utils/FileUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.app.util; +package org.jcnc.jnotepad.app.utils; import javafx.scene.Node; import org.jcnc.jnotepad.controller.event.handler.menuitem.OpenFile; diff --git a/src/main/java/org/jcnc/jnotepad/app/util/JsonUtil.java b/src/main/java/org/jcnc/jnotepad/app/utils/JsonUtil.java similarity index 98% rename from src/main/java/org/jcnc/jnotepad/app/util/JsonUtil.java rename to src/main/java/org/jcnc/jnotepad/app/utils/JsonUtil.java index 9ec43db..057073c 100644 --- a/src/main/java/org/jcnc/jnotepad/app/util/JsonUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/utils/JsonUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.app.util; +package org.jcnc.jnotepad.app.utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/src/main/java/org/jcnc/jnotepad/app/util/LogUtil.java b/src/main/java/org/jcnc/jnotepad/app/utils/LogUtil.java similarity index 95% rename from src/main/java/org/jcnc/jnotepad/app/util/LogUtil.java rename to src/main/java/org/jcnc/jnotepad/app/utils/LogUtil.java index 04e8ce6..918ed02 100644 --- a/src/main/java/org/jcnc/jnotepad/app/util/LogUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/utils/LogUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.app.util; +package org.jcnc.jnotepad.app.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jcnc/jnotepad/app/util/NotificationUtil.java b/src/main/java/org/jcnc/jnotepad/app/utils/NotificationUtil.java similarity index 99% rename from src/main/java/org/jcnc/jnotepad/app/util/NotificationUtil.java rename to src/main/java/org/jcnc/jnotepad/app/utils/NotificationUtil.java index 2528eb4..14c0a59 100644 --- a/src/main/java/org/jcnc/jnotepad/app/util/NotificationUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/utils/NotificationUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.app.util; +package org.jcnc.jnotepad.app.utils; import atlantafx.base.controls.Notification; import atlantafx.base.theme.Styles; diff --git a/src/main/java/org/jcnc/jnotepad/app/util/PopUpUtil.java b/src/main/java/org/jcnc/jnotepad/app/utils/PopUpUtil.java similarity index 99% rename from src/main/java/org/jcnc/jnotepad/app/util/PopUpUtil.java rename to src/main/java/org/jcnc/jnotepad/app/utils/PopUpUtil.java index a1a58e8..c7794c2 100644 --- a/src/main/java/org/jcnc/jnotepad/app/util/PopUpUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/utils/PopUpUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.app.util; +package org.jcnc.jnotepad.app.utils; import org.jcnc.jnotepad.model.enums.DialogType; import org.jcnc.jnotepad.ui.component.stage.dialog.AppDialogBuilder; diff --git a/src/main/java/org/jcnc/jnotepad/app/util/ResourceUtil.java b/src/main/java/org/jcnc/jnotepad/app/utils/ResourceUtil.java similarity index 98% rename from src/main/java/org/jcnc/jnotepad/app/util/ResourceUtil.java rename to src/main/java/org/jcnc/jnotepad/app/utils/ResourceUtil.java index d0da3d5..1ab1b34 100644 --- a/src/main/java/org/jcnc/jnotepad/app/util/ResourceUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/utils/ResourceUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.app.util; +package org.jcnc.jnotepad.app.utils; import org.jcnc.jnotepad.JnotepadApp; diff --git a/src/main/java/org/jcnc/jnotepad/app/util/TabUtil.java b/src/main/java/org/jcnc/jnotepad/app/utils/TabUtil.java similarity index 99% rename from src/main/java/org/jcnc/jnotepad/app/util/TabUtil.java rename to src/main/java/org/jcnc/jnotepad/app/utils/TabUtil.java index 627a8d8..d5307e0 100644 --- a/src/main/java/org/jcnc/jnotepad/app/util/TabUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/utils/TabUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.app.util; +package org.jcnc.jnotepad.app.utils; import javafx.scene.control.Tab; import javafx.scene.control.TextField; @@ -29,7 +29,7 @@ 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.app.utils.FileUtil.getFileText; import static org.jcnc.jnotepad.controller.config.UserConfigController.CONFIG_NAME; /** diff --git a/src/main/java/org/jcnc/jnotepad/app/util/UiUtil.java b/src/main/java/org/jcnc/jnotepad/app/utils/UiUtil.java similarity index 99% rename from src/main/java/org/jcnc/jnotepad/app/util/UiUtil.java rename to src/main/java/org/jcnc/jnotepad/app/utils/UiUtil.java index 8411829..9e8764e 100644 --- a/src/main/java/org/jcnc/jnotepad/app/util/UiUtil.java +++ b/src/main/java/org/jcnc/jnotepad/app/utils/UiUtil.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.app.util; +package org.jcnc.jnotepad.app.utils; import atlantafx.base.theme.Styles; import javafx.scene.Node; diff --git a/src/main/java/org/jcnc/jnotepad/app/util/aReadme.md b/src/main/java/org/jcnc/jnotepad/app/utils/aReadme.md similarity index 100% rename from src/main/java/org/jcnc/jnotepad/app/util/aReadme.md rename to src/main/java/org/jcnc/jnotepad/app/utils/aReadme.md 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 77fbd42..830356b 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/cache/CacheController.java +++ b/src/main/java/org/jcnc/jnotepad/controller/cache/CacheController.java @@ -2,8 +2,8 @@ package org.jcnc.jnotepad.controller.cache; import com.fasterxml.jackson.core.type.TypeReference; 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.app.utils.JsonUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; import org.jcnc.jnotepad.controller.config.AppConfigController; import org.jcnc.jnotepad.model.entity.Cache; import org.slf4j.Logger; 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 27722cd..b1760a4 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.app.util.TabUtil.addNewFileTab; +import static org.jcnc.jnotepad.app.utils.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 0f7a95a..e8b9168 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.app.utils.LogUtil; import org.jcnc.jnotepad.controller.config.UserConfigController; import java.io.File; -import static org.jcnc.jnotepad.app.util.TabUtil.openFileToTab; +import static org.jcnc.jnotepad.app.utils.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 2fdcbc0..be3e5df 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 @@ -6,14 +6,14 @@ 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.app.util.UiUtil; +import org.jcnc.jnotepad.app.utils.UiUtil; import org.jcnc.jnotepad.model.entity.Cache; import org.jcnc.jnotepad.model.enums.CacheExpirationTime; import org.jcnc.jnotepad.ui.component.stage.dialog.factory.impl.BasicFileChooserFactory; import java.io.File; -import static org.jcnc.jnotepad.app.util.TabUtil.openFileToTab; +import static org.jcnc.jnotepad.app.utils.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 7fdde7c..b76f4d9 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 @@ -4,7 +4,7 @@ import javafx.event.ActionEvent; import javafx.event.EventHandler; import org.jcnc.jnotepad.ui.views.manager.CenterTabPaneManager; -import static org.jcnc.jnotepad.app.util.TabUtil.rename; +import static org.jcnc.jnotepad.app.utils.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 a0a7bc9..4b84566 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.app.util.LogUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; import org.jcnc.jnotepad.ui.views.manager.CenterTabPaneManager; -import static org.jcnc.jnotepad.app.util.TabUtil.saveAsFile; +import static org.jcnc.jnotepad.app.utils.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 7e186d9..d685a45 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 @@ -4,7 +4,7 @@ import javafx.event.ActionEvent; import javafx.event.EventHandler; import org.jcnc.jnotepad.ui.views.manager.CenterTabPaneManager; -import static org.jcnc.jnotepad.app.util.TabUtil.saveFile; +import static org.jcnc.jnotepad.app.utils.TabUtil.saveFile; /** * 保存文件事件处理程序。 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 f863134..05be499 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 @@ -6,8 +6,8 @@ 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.app.util.FileUtil; -import org.jcnc.jnotepad.app.util.UiUtil; +import org.jcnc.jnotepad.app.utils.FileUtil; +import org.jcnc.jnotepad.app.utils.UiUtil; import org.jcnc.jnotepad.model.entity.Cache; import org.jcnc.jnotepad.model.entity.DirFileModel; import org.jcnc.jnotepad.model.enums.CacheExpirationTime; 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 648bfc1..4c79cd6 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java +++ b/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java @@ -8,8 +8,8 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import static org.jcnc.jnotepad.app.util.TabUtil.addNewFileTab; -import static org.jcnc.jnotepad.app.util.TabUtil.openFileToTab; +import static org.jcnc.jnotepad.app.utils.TabUtil.addNewFileTab; +import static org.jcnc.jnotepad.app.utils.TabUtil.openFileToTab; /** * 控制器类，实现 ControllerAble 接口，用于管理文本编辑器的各种操作和事件处理。 diff --git a/src/main/java/org/jcnc/jnotepad/controller/plugin/PluginLoader.java b/src/main/java/org/jcnc/jnotepad/controller/plugin/PluginLoader.java index 23927dc..82ce17a 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/plugin/PluginLoader.java +++ b/src/main/java/org/jcnc/jnotepad/controller/plugin/PluginLoader.java @@ -1,8 +1,8 @@ package org.jcnc.jnotepad.controller.plugin; 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.app.utils.JsonUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; import org.jcnc.jnotepad.controller.config.PluginConfigController; import org.jcnc.jnotepad.controller.exception.AppException; import org.jcnc.jnotepad.controller.plugin.interfaces.Plugin; diff --git a/src/main/java/org/jcnc/jnotepad/controller/plugin/PluginManagerInterface.java b/src/main/java/org/jcnc/jnotepad/controller/plugin/PluginManagerInterface.java index 7a376b6..8fec9fc 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/plugin/PluginManagerInterface.java +++ b/src/main/java/org/jcnc/jnotepad/controller/plugin/PluginManagerInterface.java @@ -6,9 +6,9 @@ import javafx.scene.control.Label; import javafx.scene.layout.VBox; import javafx.stage.FileChooser; import javafx.stage.Stage; -import org.jcnc.jnotepad.app.util.LogUtil; -import org.jcnc.jnotepad.app.util.PopUpUtil; -import org.jcnc.jnotepad.app.util.UiUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; +import org.jcnc.jnotepad.app.utils.PopUpUtil; +import org.jcnc.jnotepad.app.utils.UiUtil; import org.jcnc.jnotepad.controller.plugin.manager.PluginManager; import org.jcnc.jnotepad.ui.component.stage.dialog.factory.impl.BasicFileChooserFactory; import org.slf4j.Logger; diff --git a/src/main/java/org/jcnc/jnotepad/controller/plugin/manager/PluginManager.java b/src/main/java/org/jcnc/jnotepad/controller/plugin/manager/PluginManager.java index 4bb8935..9714f36 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/plugin/manager/PluginManager.java +++ b/src/main/java/org/jcnc/jnotepad/controller/plugin/manager/PluginManager.java @@ -2,8 +2,8 @@ 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.app.util.LogUtil; -import org.jcnc.jnotepad.app.util.PopUpUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; +import org.jcnc.jnotepad.app.utils.PopUpUtil; import org.jcnc.jnotepad.controller.config.PluginConfigController; import org.jcnc.jnotepad.model.entity.PluginDescriptor; import org.slf4j.Logger; diff --git a/src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/CmdTerminalBox.java b/src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/CmdTerminalBox.java index a03da92..97ed871 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/CmdTerminalBox.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/module/vbox/components/CmdTerminalBox.java @@ -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.app.util.LogUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; import java.io.*; import java.nio.charset.Charset; diff --git a/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/AppDialogBuilder.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/AppDialogBuilder.java index 8e31859..b4011eb 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/AppDialogBuilder.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/dialog/AppDialogBuilder.java @@ -5,7 +5,7 @@ import javafx.geometry.Pos; import javafx.scene.image.Image; import javafx.stage.Modality; import javafx.stage.Stage; -import org.jcnc.jnotepad.app.util.UiUtil; +import org.jcnc.jnotepad.app.utils.UiUtil; import org.jcnc.jnotepad.model.enums.DialogType; 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/ui/component/stage/setting/SetStage.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/setting/SetStage.java index 6136f49..6be26fc 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/component/stage/setting/SetStage.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/setting/SetStage.java @@ -21,8 +21,8 @@ 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.app.util.PopUpUtil; -import org.jcnc.jnotepad.app.util.UiUtil; +import org.jcnc.jnotepad.app.utils.PopUpUtil; +import org.jcnc.jnotepad.app.utils.UiUtil; import org.jcnc.jnotepad.controller.config.AppConfigController; import org.jcnc.jnotepad.controller.event.handler.toolbar.OpenDirectory; import org.jcnc.jnotepad.controller.plugin.PluginManagerInterface; diff --git a/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/DeveloperDebugPaneStage.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/DeveloperDebugPaneStage.java index 972048d..a9bcba6 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/DeveloperDebugPaneStage.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/DeveloperDebugPaneStage.java @@ -10,9 +10,9 @@ 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.app.util.LogUtil; -import org.jcnc.jnotepad.app.util.PopUpUtil; -import org.jcnc.jnotepad.app.util.UiUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; +import org.jcnc.jnotepad.app.utils.PopUpUtil; +import org.jcnc.jnotepad.app.utils.UiUtil; import org.jcnc.jnotepad.ui.component.stage.topmenu.builder.StageButtonBuilder; import org.slf4j.Logger; diff --git a/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/HelpPaneStage.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/HelpPaneStage.java index cb41527..14b0dc6 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/HelpPaneStage.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/help/HelpPaneStage.java @@ -16,10 +16,10 @@ 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.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 org.jcnc.jnotepad.app.utils.ClipboardUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; +import org.jcnc.jnotepad.app.utils.NotificationUtil; +import org.jcnc.jnotepad.app.utils.UiUtil; import static org.jcnc.jnotepad.app.common.constants.AppConstants.*; diff --git a/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/plugin/PluginManagementPane.java b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/plugin/PluginManagementPane.java index 26c6571..7717116 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/plugin/PluginManagementPane.java +++ b/src/main/java/org/jcnc/jnotepad/ui/component/stage/topmenu/plugin/PluginManagementPane.java @@ -26,9 +26,9 @@ 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.app.util.LogUtil; -import org.jcnc.jnotepad.app.util.PopUpUtil; -import org.jcnc.jnotepad.app.util.UiUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; +import org.jcnc.jnotepad.app.utils.PopUpUtil; +import org.jcnc.jnotepad.app.utils.UiUtil; import org.jcnc.jnotepad.controller.plugin.manager.PluginManager; import org.jcnc.jnotepad.model.entity.PluginDescriptor; import org.jcnc.jnotepad.ui.component.stage.setting.CustomSetButton; diff --git a/src/main/java/org/jcnc/jnotepad/ui/views/manager/CenterTabPaneManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/CenterTabPaneManager.java index 9913f90..4d3cbc9 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/views/manager/CenterTabPaneManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/CenterTabPaneManager.java @@ -5,8 +5,8 @@ import javafx.collections.ObservableList; import javafx.scene.control.Tab; import javafx.stage.Stage; 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.app.utils.FileUtil; +import org.jcnc.jnotepad.app.utils.PopUpUtil; import org.jcnc.jnotepad.controller.config.UserConfigController; import org.jcnc.jnotepad.model.enums.CacheExpirationTime; import org.jcnc.jnotepad.ui.component.module.TextCodeArea; diff --git a/src/main/java/org/jcnc/jnotepad/ui/views/manager/DirectorySidebarManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/DirectorySidebarManager.java index 4aaaa4e..f774190 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/views/manager/DirectorySidebarManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/DirectorySidebarManager.java @@ -5,7 +5,7 @@ import javafx.scene.control.SplitPane; import javafx.scene.control.TreeItem; 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.app.utils.FileUtil; import org.jcnc.jnotepad.controller.event.handler.toolbar.OpenDirectory; import org.jcnc.jnotepad.model.entity.DirFileModel; import org.jcnc.jnotepad.ui.views.root.center.main.MainBorderPane; diff --git a/src/main/java/org/jcnc/jnotepad/ui/views/manager/SidebarToolBarManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/SidebarToolBarManager.java index ec4f214..ba25342 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/views/manager/SidebarToolBarManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/SidebarToolBarManager.java @@ -3,7 +3,7 @@ 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.app.utils.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; diff --git a/src/main/java/org/jcnc/jnotepad/ui/views/manager/TopMenuBarManager.java b/src/main/java/org/jcnc/jnotepad/ui/views/manager/TopMenuBarManager.java index 89cd9bd..898e050 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/views/manager/TopMenuBarManager.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/manager/TopMenuBarManager.java @@ -6,7 +6,7 @@ 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.app.utils.LogUtil; import org.jcnc.jnotepad.controller.config.UserConfigController; import org.jcnc.jnotepad.model.entity.ShortcutKey; import org.jcnc.jnotepad.ui.views.root.top.menubar.TopMenuBar; diff --git a/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/directory/DirectorySidebarPane.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/directory/DirectorySidebarPane.java index fbe31e1..f36bba4 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/directory/DirectorySidebarPane.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/directory/DirectorySidebarPane.java @@ -7,7 +7,7 @@ import org.jcnc.jnotepad.model.entity.DirFileModel; import java.io.File; import java.util.Objects; -import static org.jcnc.jnotepad.app.util.TabUtil.openFileToTab; +import static org.jcnc.jnotepad.app.utils.TabUtil.openFileToTab; /** diff --git a/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/tab/CenterTab.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/tab/CenterTab.java index 871edb8..6d1001f 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/tab/CenterTab.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/center/main/center/tab/CenterTab.java @@ -4,9 +4,9 @@ import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.scene.control.Tab; import org.fxmisc.flowless.VirtualizedScrollPane; -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.app.utils.FileUtil; +import org.jcnc.jnotepad.app.utils.LogUtil; +import org.jcnc.jnotepad.app.utils.TabUtil; import org.jcnc.jnotepad.controller.config.UserConfigController; import org.jcnc.jnotepad.ui.component.module.TextCodeArea; import org.jcnc.jnotepad.ui.views.manager.BottomStatusBoxManager; diff --git a/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/RunTopMenu.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/RunTopMenu.java index 9cf0f2d..fc69cf2 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/RunTopMenu.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/RunTopMenu.java @@ -5,7 +5,7 @@ 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.app.util.LogUtil; +import org.jcnc.jnotepad.app.utils.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; diff --git a/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/SettingTopMenu.java b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/SettingTopMenu.java index e9e8e3d..c7d7e58 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/SettingTopMenu.java +++ b/src/main/java/org/jcnc/jnotepad/ui/views/root/top/menubar/menu/SettingTopMenu.java @@ -4,7 +4,7 @@ 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.app.utils.UiUtil; import org.jcnc.jnotepad.controller.config.UserConfigController; import org.jcnc.jnotepad.controller.event.handler.menuitem.OpenConfig; import org.jcnc.jnotepad.ui.views.manager.CenterTabPaneManager;