From fc0eec29320491ff1ee06f94dcf43e4b0141c2be Mon Sep 17 00:00:00 2001 From: gewuyou <1063891901@qq.com> Date: Sat, 7 Oct 2023 09:26:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=A8=20=E4=BF=AE=E6=94=B9=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E8=BF=87=E6=97=B6=E7=9A=84API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jcnc/jnotepad/views/manager/BottomStatusBoxManager.java | 4 ++-- .../org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java | 2 +- .../jnotepad/views/root/center/main/center/tab/CenterTab.java | 4 ++-- .../jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/BottomStatusBoxManager.java b/src/main/java/org/jcnc/jnotepad/views/manager/BottomStatusBoxManager.java index 6e0f024..6959653 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/BottomStatusBoxManager.java +++ b/src/main/java/org/jcnc/jnotepad/views/manager/BottomStatusBoxManager.java @@ -106,7 +106,7 @@ public class BottomStatusBoxManager { if (instance.getSelected() == null) { return; } - TextCodeArea textArea = instance.getSelected().getLineNumberTextArea(); + TextCodeArea textArea = instance.getSelected().getTextCodeArea(); int caretPosition = textArea.getCaretPosition(); int row = getRow(caretPosition, textArea.getText()); int column = getColumn(caretPosition, textArea.getText()); @@ -128,7 +128,7 @@ public class BottomStatusBoxManager { updateEncodingLabel(centerTab.getCharset().name()); // 添加光标位置变化监听器 - TextCodeArea textArea = centerTab.getLineNumberTextArea(); + TextCodeArea textArea = centerTab.getTextCodeArea(); textArea.caretPositionProperty().addListener((ChangeListener) (observable, oldValue, newValue) -> updateRowColumnLabel(textArea.getCaretPosition(), textArea.getText())); } } diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java b/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java index 2ceeb3e..e1d973d 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java +++ b/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java @@ -79,7 +79,7 @@ public class CenterTabPaneManager { } if (tab.isRelevance()) { // 获取当前文本域对象 - TextCodeArea textCodeArea = tab.getLineNumberTextArea(); + TextCodeArea textCodeArea = tab.getTextCodeArea(); // 获取当前标签页对应文件上次修改时间 Long lastModifiedTime = tab.getLastModifiedTimeOfAssociatedFile(); // 获取对应文件上次修改时间 diff --git a/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTab.java b/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTab.java index e937d88..7a135b7 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTab.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTab.java @@ -72,7 +72,7 @@ public class CenterTab extends Tab { textCodeArea.setWrapText(autoLine); } - public TextCodeArea getLineNumberTextArea() { + public TextCodeArea getTextCodeArea() { return textCodeArea; } @@ -99,7 +99,7 @@ public class CenterTab extends Tab { // 从标签页的用户数据中获取文件对象 File file = (File) tab.getUserData(); // 获取主文本区域中的文本内容 - String newValue = tab.getLineNumberTextArea().getText(); + String newValue = tab.getTextCodeArea().getText(); // 如果文件对象为空,记录警告信息并返回,不执行保存操作 if (file == null) { diff --git a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java b/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java index c45a553..0ba9fdc 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java @@ -71,7 +71,7 @@ public class RunTopMenu extends AbstractTopMenu { // 获取TextCodeArea的文本内容 CenterTab centerTab = CenterTabPaneManager.getInstance().getSelected(); - String code = centerTab.getLineNumberTextArea().getText(); + String code = centerTab.getTextCodeArea().getText(); // TextCodeArea的当前文本内容 System.out.println("TextCodeArea的当前文本内容:" + code); -- Gitee From 9d765f2f5cdcdd4a7f6779ba7ec614e0499156e6 Mon Sep 17 00:00:00 2001 From: gewuyou <1063891901@qq.com> Date: Sat, 7 Oct 2023 09:55:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=A8=20=E4=BF=AE=E6=94=B9=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E8=BF=87=E6=97=B6=E7=9A=84API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java b/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java index ded8cea..6ebe38e 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/top/menubar/menu/RunTopMenu.java @@ -68,7 +68,7 @@ public class RunTopMenu extends AbstractTopMenu { // 获取TextCodeArea的文本内容 CenterTab centerTab = CenterTabPaneManager.getInstance().getSelected(); - String code = centerTab.getLineNumberTextArea().getText(); + String code = centerTab.getTextCodeArea().getText(); String fileName = centerTab.getText(); -- Gitee