From 8f4448bac2b7521e4c8a7460cb5d74e30fb2930d Mon Sep 17 00:00:00 2001
From: gewuyou <1063891901@qq.com>
Date: Mon, 28 Aug 2023 23:38:08 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A1=20=E6=B7=BB=E5=8A=A0=E6=88=96?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=BA=90=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/jcnc/jnotepad/LunchApp.java               | 4 ++--
 .../jcnc/jnotepad/controller/event/handler/OpenFile.java    | 1 -
 .../jnotepad/controller/i18n/LocalizationController.java    | 4 ++--
 src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java  | 2 --
 .../java/org/jcnc/jnotepad/ui/menu/JNotepadMenuBar.java     | 6 ++----
 src/main/resources/logback.xml                              | 2 +-
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/jcnc/jnotepad/LunchApp.java b/src/main/java/org/jcnc/jnotepad/LunchApp.java
index 24b90d5..9186ceb 100644
--- a/src/main/java/org/jcnc/jnotepad/LunchApp.java
+++ b/src/main/java/org/jcnc/jnotepad/LunchApp.java
@@ -42,7 +42,7 @@ public class LunchApp extends Application {
         scene = new Scene(root, width, length);
         Application.setUserAgentStylesheet(new PrimerLight().getUserAgentStylesheet());
         scene.getStylesheets().add(Objects.requireNonNull(getClass().getResource("/css/styles.css")).toExternalForm());
-        initUIComponents();
+        initUiComponents();
 
 
         UIResourceBundle.bindStringProperty(primaryStage.titleProperty(), TextConstants.TITLE);
@@ -53,7 +53,7 @@ public class LunchApp extends Application {
         primaryStage.show();
     }
 
-    private void initUIComponents() {
+    private void initUiComponents() {
 
         //1. 加载语言
         LocalizationController.initLocal();
diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/OpenFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/OpenFile.java
index ad2c8c7..c7e12ee 100644
--- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/OpenFile.java
+++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/OpenFile.java
@@ -36,7 +36,6 @@ public class OpenFile implements EventHandler<ActionEvent> {
      */
     @Override
     public void handle(ActionEvent event) {
-
         // 创建文件选择器
         FileChooser fileChooser = new FileChooser();
         // 显示文件选择对话框，并获取选中的文件
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 da1daa1..84edbfa 100644
--- a/src/main/java/org/jcnc/jnotepad/controller/i18n/LocalizationController.java
+++ b/src/main/java/org/jcnc/jnotepad/controller/i18n/LocalizationController.java
@@ -13,8 +13,8 @@ import static org.jcnc.jnotepad.constants.TextConstants.CHINESE;
 import static org.jcnc.jnotepad.constants.TextConstants.ENGLISH;
 
 /**
- * 本地化配置文件<br>
- * 注意：该配置文件必须先于快捷键配置文件加载
+ * 本地化控制器<br>
+ * 注意：本地化配置加载应当优先于快捷键配置加载
  *
  * @author gewuyou
  * @see LunchApp
diff --git a/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java b/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java
index acb4a03..53690b1 100644
--- a/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java
+++ b/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java
@@ -3,10 +3,8 @@ package org.jcnc.jnotepad.ui;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.TextArea;
 import javafx.scene.layout.BorderPane;
-import org.jcnc.jnotepad.app.config.AppConfig;
 import org.jcnc.jnotepad.controller.config.AppConfigController;
 import org.jcnc.jnotepad.tool.LogUtil;
-import org.jcnc.jnotepad.ui.menu.JNotepadMenuBar;
 import org.jcnc.jnotepad.ui.status.JNotepadStatusBox;
 import org.jcnc.jnotepad.ui.tab.JNotepadTab;
 import org.jcnc.jnotepad.ui.tab.JNotepadTabPane;
diff --git a/src/main/java/org/jcnc/jnotepad/ui/menu/JNotepadMenuBar.java b/src/main/java/org/jcnc/jnotepad/ui/menu/JNotepadMenuBar.java
index ae07a03..162d0b4 100644
--- a/src/main/java/org/jcnc/jnotepad/ui/menu/JNotepadMenuBar.java
+++ b/src/main/java/org/jcnc/jnotepad/ui/menu/JNotepadMenuBar.java
@@ -145,11 +145,8 @@ public class JNotepadMenuBar extends MenuBar {
         for (AppConfig.ShortcutKey shortcutKey : shortcutKeyConfigs) {
             // 保证json的key必须和变量名一致
             MenuItem menuItem = this.itemMap.get(shortcutKey.getButtonName());
-            if (Objects.isNull(menuItem)) {
-                continue;
-            }
             String shortKeyValue = shortcutKey.getShortcutKeyValue();
-            if ("".equals(shortKeyValue)) {
+            if (Objects.isNull(menuItem) || "".equals(shortKeyValue)) {
                 continue;
             }
             logger.info("功能名称：{}->快捷键:{}", menuItem.getText(), shortKeyValue);
@@ -290,6 +287,7 @@ public class JNotepadMenuBar extends MenuBar {
 
     /**
      * 切换语言
+     *
      * @param actionEvent 点击事件
      */
     private void toggleLanguage(ActionEvent actionEvent) {
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 89ac5a3..b23a028 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -10,7 +10,7 @@
     <property name="log.maxHistory" value="30"/>
     <!-- 日志存储路径 -->
     <property name="log.filePath" value="logs"/>
-    <!--发布0时，请使用下方的路径-->
+    <!--发布时，请使用下方的路径-->
     <!--<property name="log.filePath" value="${user.home}/.jnotepad/logs"/>-->
     <!-- 日志的显式格式 -->
     <property name="log.pattern"