From 7ab6793179e963d814efa851f906a79d68bc263c Mon Sep 17 00:00:00 2001
From: gewuyou <1063891901@qq.com>
Date: Sat, 26 Aug 2023 13:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9A=B0=EF=B8=8F=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=20=F0=9F=90=9B=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20BUG=20=E5=BD=93=E6=97=A0=E6=89=93=E5=BC=80=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=E6=89=93=E5=BC=80=E6=96=87=E4=BB=B6=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=8A=9B=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/jcnc/jnotepad/LunchApp.java |  2 +-
 .../jnotepad/app/config/JnotepadConfig.java   | 53 -------------------
 .../app/config/LocalizationConfig.java        |  6 ++-
 .../jcnc/jnotepad/app/entity/ShortcutKey.java | 35 ------------
 .../org/jcnc/jnotepad/app/entity/Style.java   | 35 ------------
 .../jnotepad/app/init/LoadJnotepadConfig.java |  2 +-
 .../jnotepad/constants/PathConstants.java     |  8 +--
 .../jcnc/jnotepad/ui/LineNumberTextArea.java  | 28 +++++-----
 8 files changed, 20 insertions(+), 149 deletions(-)
 delete mode 100644 src/main/java/org/jcnc/jnotepad/app/config/JnotepadConfig.java
 delete mode 100644 src/main/java/org/jcnc/jnotepad/app/entity/ShortcutKey.java
 delete mode 100644 src/main/java/org/jcnc/jnotepad/app/entity/Style.java

diff --git a/src/main/java/org/jcnc/jnotepad/LunchApp.java b/src/main/java/org/jcnc/jnotepad/LunchApp.java
index b0fbe0b..c4270a6 100644
--- a/src/main/java/org/jcnc/jnotepad/LunchApp.java
+++ b/src/main/java/org/jcnc/jnotepad/LunchApp.java
@@ -1,5 +1,6 @@
 package org.jcnc.jnotepad;
 
+
 import atlantafx.base.theme.PrimerLight;
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -55,7 +56,6 @@ public class LunchApp extends Application {
         double width = AppConstants.SCREEN_WIDTH;
         double length = AppConstants.SCREEN_LENGTH;
         String icon = AppConstants.APP_ICON;
-
         scene = new Scene(root, width, length);
         Application.setUserAgentStylesheet(new PrimerLight().getUserAgentStylesheet());
         scene.getStylesheets().add(Objects.requireNonNull(getClass().getResource("/css/styles.css")).toExternalForm());
diff --git a/src/main/java/org/jcnc/jnotepad/app/config/JnotepadConfig.java b/src/main/java/org/jcnc/jnotepad/app/config/JnotepadConfig.java
deleted file mode 100644
index c138fba..0000000
--- a/src/main/java/org/jcnc/jnotepad/app/config/JnotepadConfig.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.jcnc.jnotepad.app.config;
-
-
-import org.jcnc.jnotepad.app.entity.ShortcutKey;
-import org.jcnc.jnotepad.app.entity.Style;
-
-import java.util.List;
-
-/**
- * 应用程序配置类
- *
- * @author gewuyou 一个大转盘
- * @see [相关类/方法]
- */
-public class JnotepadConfig {
-    /**
-     * 快捷键列表
-     */
-    private List<ShortcutKey> shortcutKeyList;
-
-    /**
-     * 样式列表 TODO
-     */
-    private List<Style> styleList;
-
-    /**
-     * 单例模式
-     */
-    private JnotepadConfig() {
-    }
-
-    private static final JnotepadConfig INSTANCE = new JnotepadConfig();
-
-    public static JnotepadConfig getInstance() {
-        return INSTANCE;
-    }
-
-    public List<ShortcutKey> getShortcutKeyList() {
-        return shortcutKeyList;
-    }
-
-    public void setShortcutKeyList(List<ShortcutKey> shortcutKeyList) {
-        this.shortcutKeyList = shortcutKeyList;
-    }
-
-    public List<Style> getStyleList() {
-        return styleList;
-    }
-
-    public void setStyleList(List<Style> styleList) {
-        this.styleList = styleList;
-    }
-}
diff --git a/src/main/java/org/jcnc/jnotepad/app/config/LocalizationConfig.java b/src/main/java/org/jcnc/jnotepad/app/config/LocalizationConfig.java
index 7711abd..69e5706 100644
--- a/src/main/java/org/jcnc/jnotepad/app/config/LocalizationConfig.java
+++ b/src/main/java/org/jcnc/jnotepad/app/config/LocalizationConfig.java
@@ -1,5 +1,6 @@
 package org.jcnc.jnotepad.app.config;
 
+import org.jcnc.jnotepad.LunchApp;
 import org.jcnc.jnotepad.tool.LogUtil;
 import org.slf4j.Logger;
 
@@ -11,8 +12,9 @@ import static org.jcnc.jnotepad.constants.AppConstants.APP_NAME;
 import static org.jcnc.jnotepad.constants.TextConstants.*;
 
 /**
- * 本地化配置文件
- *
+ * 本地化配置文件<br>
+ * 注意：该配置文件必须先于快捷键配置文件加载
+ * @see LunchApp
  * @author gewuyou
  */
 public class LocalizationConfig {
diff --git a/src/main/java/org/jcnc/jnotepad/app/entity/ShortcutKey.java b/src/main/java/org/jcnc/jnotepad/app/entity/ShortcutKey.java
deleted file mode 100644
index 0228f2f..0000000
--- a/src/main/java/org/jcnc/jnotepad/app/entity/ShortcutKey.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.jcnc.jnotepad.app.entity;
-
-/**
- * 快捷键
- *
- * @author gewuyou
- */
-public class ShortcutKey {
-    private String buttonName;
-    private String shortcutKeyValue;
-
-    public ShortcutKey() {
-    }
-
-    public ShortcutKey(String buttonName, String shortcutKeyValue) {
-        this.buttonName = buttonName;
-        this.shortcutKeyValue = shortcutKeyValue;
-    }
-
-    public String getButtonName() {
-        return buttonName;
-    }
-
-    public void setButtonName(String buttonName) {
-        this.buttonName = buttonName;
-    }
-
-    public String getShortcutKeyValue() {
-        return shortcutKeyValue;
-    }
-
-    public void setShortcutKeyValue(String shortcutKeyValue) {
-        this.shortcutKeyValue = shortcutKeyValue;
-    }
-}
diff --git a/src/main/java/org/jcnc/jnotepad/app/entity/Style.java b/src/main/java/org/jcnc/jnotepad/app/entity/Style.java
deleted file mode 100644
index 93d1be0..0000000
--- a/src/main/java/org/jcnc/jnotepad/app/entity/Style.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.jcnc.jnotepad.app.entity;
-
-/**
- * 样式
- *
- * @author gewuyou
- */
-public class Style {
-    private String styleName;
-    private String styleValue;
-
-    public Style() {
-    }
-
-    public Style(String styleName, String styleValue) {
-        this.styleName = styleName;
-        this.styleValue = styleValue;
-    }
-
-    public String getStyleName() {
-        return styleName;
-    }
-
-    public void setStyleName(String styleName) {
-        this.styleName = styleName;
-    }
-
-    public String getStyleValue() {
-        return styleValue;
-    }
-
-    public void setStyleValue(String styleValue) {
-        this.styleValue = styleValue;
-    }
-}
diff --git a/src/main/java/org/jcnc/jnotepad/app/init/LoadJnotepadConfig.java b/src/main/java/org/jcnc/jnotepad/app/init/LoadJnotepadConfig.java
index a2f132e..ee5b91e 100644
--- a/src/main/java/org/jcnc/jnotepad/app/init/LoadJnotepadConfig.java
+++ b/src/main/java/org/jcnc/jnotepad/app/init/LoadJnotepadConfig.java
@@ -74,7 +74,7 @@ public abstract class LoadJnotepadConfig<T> {
      * 解析配置文件
      *
      * @param inputStream 输入流
-     * @return java.util.List<java.util.LinkedHashMap < java.lang.String, java.lang.String>>
+     * @return T
      * @since 2023/8/25 15:18
      */
     protected abstract T parseConfig(InputStream inputStream);
diff --git a/src/main/java/org/jcnc/jnotepad/constants/PathConstants.java b/src/main/java/org/jcnc/jnotepad/constants/PathConstants.java
index 2879da3..b4b0837 100644
--- a/src/main/java/org/jcnc/jnotepad/constants/PathConstants.java
+++ b/src/main/java/org/jcnc/jnotepad/constants/PathConstants.java
@@ -1,16 +1,10 @@
 package org.jcnc.jnotepad.constants;
 
 /**
- * 路径常量
- *
+ * 路径常量<br>
  * @author gewuyou
  */
 public class PathConstants {
     private PathConstants() {
     }
-
-    /**
-     * 配置文件路径
-     */
-    public static final String CONFIGURATION_FILE_PATH = "../config/";
 }
diff --git a/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java b/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java
index 5198e78..5823960 100644
--- a/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java
+++ b/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java
@@ -52,14 +52,10 @@ public class LineNumberTextArea extends BorderPane {
 
     private void initListeners() {
         // 当主要文本区域的垂直滚动位置发生变化时，使行号文本区域的滚动位置保持一致
-        mainTextArea.scrollTopProperty().addListener((observable, oldValue, newValue) -> {
-            lineNumberArea.setScrollTop(mainTextArea.getScrollTop());
-        });
+        mainTextArea.scrollTopProperty().addListener((observable, oldValue, newValue) -> lineNumberArea.setScrollTop(mainTextArea.getScrollTop()));
 
         // 当行号文本区域的垂直滚动位置发生变化时，使主要文本区域的滚动位置保持一致
-        lineNumberArea.scrollTopProperty().addListener((observable, oldValue, newValue) -> {
-            mainTextArea.setScrollTop(lineNumberArea.getScrollTop());
-        });
+        lineNumberArea.scrollTopProperty().addListener((observable, oldValue, newValue) -> mainTextArea.setScrollTop(lineNumberArea.getScrollTop()));
 
         lineNumberArea.textProperty().addListener((observable, oldValue, newValue) -> updateLineNumberWidth());
 
@@ -79,14 +75,16 @@ public class LineNumberTextArea extends BorderPane {
      */
     public void save() {
         JNotepadTab tab = JNotepadTabPane.getInstance().getSelected();
-        File file = (File) tab.getUserData();
-        String newValue = this.mainTextArea.getText();
-        if (file != null) {
-            try (BufferedWriter writer = new BufferedWriter(new FileWriter(file, tab.getCharset()))) {
-                writer.write(newValue);
-                LogUtil.getLogger(this.getClass()).info("正在自动保存---");
-            } catch (IOException ignored) {
-                LogUtil.getLogger(this.getClass()).info("已忽视IO异常!");
+        if (tab != null) {
+            File file = (File) tab.getUserData();
+            String newValue = this.mainTextArea.getText();
+            if (file != null) {
+                try (BufferedWriter writer = new BufferedWriter(new FileWriter(file, tab.getCharset()))) {
+                    writer.write(newValue);
+                    LogUtil.getLogger(this.getClass()).info("正在自动保存---");
+                } catch (IOException ignored) {
+                    LogUtil.getLogger(this.getClass()).info("已忽视IO异常!");
+                }
             }
         }
     }
@@ -137,7 +135,7 @@ public class LineNumberTextArea extends BorderPane {
 
         // 恢复之前的滚动位置
         mainTextArea.setScrollTop(mainTextAreaScrollTop);
-        lineNumberArea.setScrollTop(lineNumberAreaScrollTop-8);
+        lineNumberArea.setScrollTop(lineNumberAreaScrollTop - 8);
     }
 
     public TextArea getMainTextArea() {