From 8da72722f0e4c903f3ce83e47046e918dd2d90b5 Mon Sep 17 00:00:00 2001 From: gewuyou <1063891901@qq.com> Date: Thu, 7 Sep 2023 14:59:48 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=20BUG=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E6=89=93=E5=BC=80=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=B6=E5=A4=9A=E5=87=BA=E4=B8=80=E8=A1=8C?= =?UTF-8?q?=E8=A1=8C=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jnotepad/controller/event/handler/menubar/OpenFile.java | 5 ++++- .../java/org/jcnc/jnotepad/root/top/menu/TopMenuBar.java | 1 + .../java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenFile.java index cb6038f..623c0c3 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenFile.java @@ -113,7 +113,10 @@ public class OpenFile implements EventHandler { StringBuilder textBuilder = new StringBuilder(); String line; while ((line = reader.readLine()) != null) { - textBuilder.append(line).append("\n"); + if (!textBuilder.isEmpty()) { + textBuilder.append("\n"); + } + textBuilder.append(line); } String text = textBuilder.toString(); LogUtil.getLogger(this.getClass()).info("已调用读取文件功能"); diff --git a/src/main/java/org/jcnc/jnotepad/root/top/menu/TopMenuBar.java b/src/main/java/org/jcnc/jnotepad/root/top/menu/TopMenuBar.java index 3edcafa..a59eab2 100644 --- a/src/main/java/org/jcnc/jnotepad/root/top/menu/TopMenuBar.java +++ b/src/main/java/org/jcnc/jnotepad/root/top/menu/TopMenuBar.java @@ -135,6 +135,7 @@ public class TopMenuBar extends MenuBar { } } + /** * 初始化菜单栏 */ diff --git a/src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java b/src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java index b936485..caf6145 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java +++ b/src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java @@ -122,7 +122,6 @@ public class LineNumberTextArea extends BorderPane { */ double mainTextAreaScrollTop = mainTextArea.getScrollTop(); double lineNumberAreaScrollTop = lineNumberArea.getScrollTop(); - int numOfLines = mainTextArea.getParagraphs().size(); StringBuilder lineNumberText = new StringBuilder(); for (int i = 1; i <= numOfLines; i++) {