diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index b867622..b3b2fc4 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -23,13 +23,10 @@ module org.jcnc.jnotepad { exports org.jcnc.jnotepad.controller.event.handler.menuBar; exports org.jcnc.jnotepad.tool; exports org.jcnc.jnotepad.Interface; - exports org.jcnc.jnotepad.ui.root.center.tab; - exports org.jcnc.jnotepad.ui.root.bottom.status; - exports org.jcnc.jnotepad.ui.root.top.menu; exports org.jcnc.jnotepad.ui.module; exports org.jcnc.jnotepad.ui.setStage; - exports org.jcnc.jnotepad.ui.root.top.tools; exports org.jcnc.jnotepad.view.manager; opens org.jcnc.jnotepad.app.config; + exports org.jcnc.jnotepad.root.center.main.bottom.status; } \ No newline at end of file diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/NewFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/NewFile.java index 7506996..a81cbc5 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/NewFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/NewFile.java @@ -4,9 +4,9 @@ import javafx.event.ActionEvent; import javafx.event.EventHandler; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; import org.jcnc.jnotepad.constants.TextConstants; +import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTab; import org.jcnc.jnotepad.tool.UiUtil; import org.jcnc.jnotepad.ui.module.LineNumberTextArea; -import org.jcnc.jnotepad.ui.root.center.tab.JNotepadTab; import org.jcnc.jnotepad.view.manager.ViewManager; 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 61d75db..46655ab 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 @@ -6,11 +6,11 @@ import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.stage.FileChooser; import org.jcnc.jnotepad.manager.ThreadPoolManager; +import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTab; import org.jcnc.jnotepad.tool.EncodingDetector; import org.jcnc.jnotepad.tool.LogUtil; import org.jcnc.jnotepad.tool.UiUtil; import org.jcnc.jnotepad.ui.module.LineNumberTextArea; -import org.jcnc.jnotepad.ui.root.center.tab.JNotepadTab; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/RenameFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/RenameFile.java index 40fd251..cc6dea8 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/RenameFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/RenameFile.java @@ -5,9 +5,9 @@ import javafx.event.EventHandler; import javafx.scene.control.TextField; import javafx.scene.input.KeyCode; import javafx.stage.FileChooser; +import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTab; import org.jcnc.jnotepad.tool.LogUtil; import org.jcnc.jnotepad.tool.UiUtil; -import org.jcnc.jnotepad.ui.root.center.tab.JNotepadTab; import org.slf4j.Logger; import java.io.File; diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/SaveFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/SaveFile.java index f33022f..fe9979e 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/SaveFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/SaveFile.java @@ -4,10 +4,10 @@ import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.stage.FileChooser; import org.jcnc.jnotepad.controller.i18n.LocalizationController; +import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTab; import org.jcnc.jnotepad.tool.LogUtil; import org.jcnc.jnotepad.tool.SingletonUtil; import org.jcnc.jnotepad.tool.UiUtil; -import org.jcnc.jnotepad.ui.root.center.tab.JNotepadTab; import org.slf4j.Logger; import java.io.File; diff --git a/src/main/java/org/jcnc/jnotepad/root/RootBorderPane.java b/src/main/java/org/jcnc/jnotepad/root/RootBorderPane.java new file mode 100644 index 0000000..4be8100 --- /dev/null +++ b/src/main/java/org/jcnc/jnotepad/root/RootBorderPane.java @@ -0,0 +1,31 @@ +package org.jcnc.jnotepad.root; + +import org.jcnc.jnotepad.root.bottom.RootBottomSideBarVBox; +import org.jcnc.jnotepad.root.center.main.MainBorderPane; +import org.jcnc.jnotepad.root.left.sidebar.RootLeftSideBarVBox; +import org.jcnc.jnotepad.root.right.RootRightSideBarVBox; +import org.jcnc.jnotepad.root.top.RootTopSideBarVBox; +import org.jcnc.jnotepad.ui.module.AbstractBorderPane; + +public class RootBorderPane extends AbstractBorderPane { + + private static final RootBorderPane INSTANCE = new RootBorderPane(); + + private RootBorderPane() { + initRootBorderPane(); + } + + private void initRootBorderPane() { + setCenterComponent(MainBorderPane.getInstance()); + setLeftComponent(RootLeftSideBarVBox.getInstance()); + setRightComponent(RootRightSideBarVBox.getInstance()); + setTopComponent(RootTopSideBarVBox.getInstance()); + setBottomComponent(RootBottomSideBarVBox.getInstance()); + } + + public static RootBorderPane getInstance() { + return INSTANCE; + } +} + + diff --git a/src/main/java/org/jcnc/jnotepad/root/bottom/RootBottomSideBarVBox.java b/src/main/java/org/jcnc/jnotepad/root/bottom/RootBottomSideBarVBox.java new file mode 100644 index 0000000..8a02199 --- /dev/null +++ b/src/main/java/org/jcnc/jnotepad/root/bottom/RootBottomSideBarVBox.java @@ -0,0 +1,21 @@ +package org.jcnc.jnotepad.root.bottom; + +import org.jcnc.jnotepad.root.center.main.bottom.status.JNotepadStatusBox; +import org.jcnc.jnotepad.ui.module.AbstractVBox; + +public class RootBottomSideBarVBox extends AbstractVBox { + + private static final RootBottomSideBarVBox INSTANCE = new RootBottomSideBarVBox(); + + private RootBottomSideBarVBox() { + initSidebarVBox(); + } + + private void initSidebarVBox() { + getChildren().addAll(JNotepadStatusBox.getInstance()); + } + + public static RootBottomSideBarVBox getInstance() { + return INSTANCE; + } +} diff --git a/src/main/java/org/jcnc/jnotepad/root/center/main/MainBorderPane.java b/src/main/java/org/jcnc/jnotepad/root/center/main/MainBorderPane.java new file mode 100644 index 0000000..d6a32ac --- /dev/null +++ b/src/main/java/org/jcnc/jnotepad/root/center/main/MainBorderPane.java @@ -0,0 +1,28 @@ +package org.jcnc.jnotepad.root.center.main; + +import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTabPane; +import org.jcnc.jnotepad.root.center.main.top.MainTopVBox; +import org.jcnc.jnotepad.ui.module.AbstractBorderPane; + +public class MainBorderPane extends AbstractBorderPane { + + private static final MainBorderPane INSTANCE = new MainBorderPane(); + + private MainBorderPane() { + initRootBorderPane(); + } + + private void initRootBorderPane() { + //setBottomComponent(JNotepadStatusBox.getInstance()); + + setCenter(JNotepadTabPane.getInstance()); + + setTopComponent(MainTopVBox.getInstance()); + } + + public static MainBorderPane getInstance() { + return INSTANCE; + } +} + + diff --git a/src/main/java/org/jcnc/jnotepad/ui/root/bottom/status/JNotepadStatusBox.java b/src/main/java/org/jcnc/jnotepad/root/center/main/bottom/status/JNotepadStatusBox.java similarity index 88% rename from src/main/java/org/jcnc/jnotepad/ui/root/bottom/status/JNotepadStatusBox.java rename to src/main/java/org/jcnc/jnotepad/root/center/main/bottom/status/JNotepadStatusBox.java index 6aa2502..5c51410 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/root/bottom/status/JNotepadStatusBox.java +++ b/src/main/java/org/jcnc/jnotepad/root/center/main/bottom/status/JNotepadStatusBox.java @@ -1,13 +1,14 @@ -package org.jcnc.jnotepad.ui.root.bottom.status; +package org.jcnc.jnotepad.root.center.main.bottom.status; import javafx.geometry.Insets; +import javafx.geometry.Pos; import javafx.scene.control.Label; import javafx.scene.control.TextArea; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; import org.jcnc.jnotepad.constants.TextConstants; +import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTab; +import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTabPane; import org.jcnc.jnotepad.ui.module.AbstractHBox; -import org.jcnc.jnotepad.ui.root.center.tab.JNotepadTab; -import org.jcnc.jnotepad.ui.root.center.tab.JNotepadTabPane; import java.nio.charset.Charset; @@ -46,6 +47,7 @@ public class JNotepadStatusBox extends AbstractHBox { * @since 2023/8/27 9:33 */ public void initStatusBox() { + this.getChildren().clear(); // 创建状态栏 statusLabel = new Label(); @@ -57,9 +59,16 @@ public class JNotepadStatusBox extends AbstractHBox { this.getChildren().add(statusLabel); this.getChildren().add(encodingLabel); this.getProperties().put("borderpane-margin", new Insets(5, 10, 5, 10)); - + this.setAlignment(Pos.BASELINE_RIGHT); UiResourceBundle.getInstance().addListener((observable, oldValue, newValue) -> updateWhenTabSelected()); + /* + 第一个参数 10 表示上边距。 + 第二个参数 10 表示右边距。 + 第三个参数 10 表示下边距。 + 第四个参数 10 表示左边距。 + */ + setMargin(statusLabel, new Insets(5, 10, 5, 10)); } public void updateEncodingLabel() { @@ -75,7 +84,7 @@ public class JNotepadStatusBox extends AbstractHBox { if (encoding == null) { encoding = Charset.defaultCharset().name(); } - this.encodingLabel.setText(getEncodingFormattedText(encoding)); + this.encodingLabel.setText(getEncodingFormattedText(encoding) + "\t"); } /** @@ -155,7 +164,7 @@ public class JNotepadStatusBox extends AbstractHBox { } protected String getEncodingFormattedText(String encoding) { - String encodingLabelFormat = "\t%s : %s"; + String encodingLabelFormat = "%s : %s"; return String.format(encodingLabelFormat, UiResourceBundle.getContent(TextConstants.ENCODE), encoding); } } diff --git a/src/main/java/org/jcnc/jnotepad/ui/root/center/tab/JNotepadTab.java b/src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/JNotepadTab.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/ui/root/center/tab/JNotepadTab.java rename to src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/JNotepadTab.java index 700be3a..14dee97 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/root/center/tab/JNotepadTab.java +++ b/src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/JNotepadTab.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.ui.root.center.tab; +package org.jcnc.jnotepad.root.center.main.center.tab; import javafx.scene.control.Tab; import org.jcnc.jnotepad.controller.config.AppConfigController; diff --git a/src/main/java/org/jcnc/jnotepad/ui/root/center/tab/JNotepadTabPane.java b/src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/JNotepadTabPane.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/ui/root/center/tab/JNotepadTabPane.java rename to src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/JNotepadTabPane.java index dcd1398..40c096b 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/root/center/tab/JNotepadTabPane.java +++ b/src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/JNotepadTabPane.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.ui.root.center.tab; +package org.jcnc.jnotepad.root.center.main.center.tab; import javafx.scene.control.TabPane; import org.jcnc.jnotepad.controller.config.AppConfigController; diff --git a/src/main/java/org/jcnc/jnotepad/root/center/main/top/MainTopVBox.java b/src/main/java/org/jcnc/jnotepad/root/center/main/top/MainTopVBox.java new file mode 100644 index 0000000..0238371 --- /dev/null +++ b/src/main/java/org/jcnc/jnotepad/root/center/main/top/MainTopVBox.java @@ -0,0 +1,20 @@ +package org.jcnc.jnotepad.root.center.main.top; + +import javafx.scene.layout.VBox; +import org.jcnc.jnotepad.root.center.main.top.menu.JNotepadMenuBar; +import org.jcnc.jnotepad.root.center.main.top.tools.ToolHBox; + +public class MainTopVBox extends VBox { + private static final MainTopVBox INSTANCE = new MainTopVBox(); + + private MainTopVBox() { + // 在构造函数中初始化 + getChildren().add(JNotepadMenuBar.getInstance()); + getChildren().add(ToolHBox.getInstance()); + } + + public static MainTopVBox getInstance() { + return INSTANCE; + } + +} diff --git a/src/main/java/org/jcnc/jnotepad/ui/root/top/menu/JNotepadMenuBar.java b/src/main/java/org/jcnc/jnotepad/root/center/main/top/menu/JNotepadMenuBar.java similarity index 97% rename from src/main/java/org/jcnc/jnotepad/ui/root/top/menu/JNotepadMenuBar.java rename to src/main/java/org/jcnc/jnotepad/root/center/main/top/menu/JNotepadMenuBar.java index 404639d..9b27637 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/root/top/menu/JNotepadMenuBar.java +++ b/src/main/java/org/jcnc/jnotepad/root/center/main/top/menu/JNotepadMenuBar.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.ui.root.top.menu; +package org.jcnc.jnotepad.root.center.main.top.menu; import javafx.event.ActionEvent; import javafx.scene.control.*; @@ -10,10 +10,10 @@ import org.jcnc.jnotepad.controller.config.AppConfigController; import org.jcnc.jnotepad.controller.event.handler.menuBar.*; import org.jcnc.jnotepad.controller.event.handler.tool.SetBtn; import org.jcnc.jnotepad.controller.i18n.LocalizationController; +import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTab; +import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTabPane; +import org.jcnc.jnotepad.root.center.main.top.tools.JNotepadToolBar; import org.jcnc.jnotepad.tool.LogUtil; -import org.jcnc.jnotepad.ui.root.center.tab.JNotepadTab; -import org.jcnc.jnotepad.ui.root.center.tab.JNotepadTabPane; -import org.jcnc.jnotepad.ui.root.top.tools.JNotepadToolBar; import org.slf4j.Logger; import java.util.*; diff --git a/src/main/java/org/jcnc/jnotepad/ui/root/top/tools/JNotepadToolBar.java b/src/main/java/org/jcnc/jnotepad/root/center/main/top/tools/JNotepadToolBar.java similarity index 94% rename from src/main/java/org/jcnc/jnotepad/ui/root/top/tools/JNotepadToolBar.java rename to src/main/java/org/jcnc/jnotepad/root/center/main/top/tools/JNotepadToolBar.java index e84d498..1f63cab 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/root/top/tools/JNotepadToolBar.java +++ b/src/main/java/org/jcnc/jnotepad/root/center/main/top/tools/JNotepadToolBar.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.ui.root.top.tools; +package org.jcnc.jnotepad.root.center.main.top.tools; import javafx.scene.control.Button; import javafx.scene.control.ToolBar; diff --git a/src/main/java/org/jcnc/jnotepad/ui/root/top/tools/ToolHBox.java b/src/main/java/org/jcnc/jnotepad/root/center/main/top/tools/ToolHBox.java similarity index 89% rename from src/main/java/org/jcnc/jnotepad/ui/root/top/tools/ToolHBox.java rename to src/main/java/org/jcnc/jnotepad/root/center/main/top/tools/ToolHBox.java index 6a6c238..364d959 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/root/top/tools/ToolHBox.java +++ b/src/main/java/org/jcnc/jnotepad/root/center/main/top/tools/ToolHBox.java @@ -1,4 +1,4 @@ -package org.jcnc.jnotepad.ui.root.top.tools; +package org.jcnc.jnotepad.root.center.main.top.tools; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; diff --git a/src/main/java/org/jcnc/jnotepad/root/left/sidebar/RootLeftSideBarVBox.java b/src/main/java/org/jcnc/jnotepad/root/left/sidebar/RootLeftSideBarVBox.java new file mode 100644 index 0000000..c9206ea --- /dev/null +++ b/src/main/java/org/jcnc/jnotepad/root/left/sidebar/RootLeftSideBarVBox.java @@ -0,0 +1,21 @@ +package org.jcnc.jnotepad.root.left.sidebar; + +import org.jcnc.jnotepad.ui.module.AbstractVBox; + +public class RootLeftSideBarVBox extends AbstractVBox { + + private static final RootLeftSideBarVBox INSTANCE = new RootLeftSideBarVBox(); + + private RootLeftSideBarVBox() { + initSidebarVBox(); + } + + private void initSidebarVBox() { + + } + + + public static RootLeftSideBarVBox getInstance() { + return INSTANCE; + } +} diff --git a/src/main/java/org/jcnc/jnotepad/root/right/RootRightSideBarVBox.java b/src/main/java/org/jcnc/jnotepad/root/right/RootRightSideBarVBox.java new file mode 100644 index 0000000..72426fc --- /dev/null +++ b/src/main/java/org/jcnc/jnotepad/root/right/RootRightSideBarVBox.java @@ -0,0 +1,20 @@ +package org.jcnc.jnotepad.root.right; + +import org.jcnc.jnotepad.ui.module.AbstractVBox; + +public class RootRightSideBarVBox extends AbstractVBox { + + private static final RootRightSideBarVBox INSTANCE = new RootRightSideBarVBox(); + + private RootRightSideBarVBox() { + initSidebarVBox(); + } + + private void initSidebarVBox() { + + } + + public static RootRightSideBarVBox getInstance() { + return INSTANCE; + } +} diff --git a/src/main/java/org/jcnc/jnotepad/root/top/RootTopSideBarVBox.java b/src/main/java/org/jcnc/jnotepad/root/top/RootTopSideBarVBox.java new file mode 100644 index 0000000..fc9c90a --- /dev/null +++ b/src/main/java/org/jcnc/jnotepad/root/top/RootTopSideBarVBox.java @@ -0,0 +1,20 @@ +package org.jcnc.jnotepad.root.top; + +import org.jcnc.jnotepad.ui.module.AbstractVBox; + +public class RootTopSideBarVBox extends AbstractVBox { + + private static final RootTopSideBarVBox INSTANCE = new RootTopSideBarVBox(); + + private RootTopSideBarVBox() { + initSidebarVBox(); + } + + private void initSidebarVBox() { + + } + + public static RootTopSideBarVBox getInstance() { + return INSTANCE; + } +} diff --git a/src/main/java/org/jcnc/jnotepad/tool/UiUtil.java b/src/main/java/org/jcnc/jnotepad/tool/UiUtil.java index 5bffe22..fef4518 100644 --- a/src/main/java/org/jcnc/jnotepad/tool/UiUtil.java +++ b/src/main/java/org/jcnc/jnotepad/tool/UiUtil.java @@ -3,10 +3,10 @@ package org.jcnc.jnotepad.tool; import javafx.scene.image.Image; import javafx.stage.Window; import org.jcnc.jnotepad.constants.AppConstants; -import org.jcnc.jnotepad.ui.root.bottom.status.JNotepadStatusBox; -import org.jcnc.jnotepad.ui.root.center.tab.JNotepadTab; -import org.jcnc.jnotepad.ui.root.center.tab.JNotepadTabPane; -import org.jcnc.jnotepad.ui.root.top.menu.JNotepadMenuBar; +import org.jcnc.jnotepad.root.center.main.bottom.status.JNotepadStatusBox; +import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTab; +import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTabPane; +import org.jcnc.jnotepad.root.center.main.top.menu.JNotepadMenuBar; import org.jcnc.jnotepad.ui.setStage.SetStage; import org.jcnc.jnotepad.view.manager.ViewManager; 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 81ee991..cfe2d63 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java +++ b/src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java @@ -3,10 +3,10 @@ package org.jcnc.jnotepad.ui.module; import javafx.beans.property.StringProperty; import javafx.scene.control.TextArea; import javafx.scene.layout.BorderPane; +import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTab; import org.jcnc.jnotepad.tool.LogUtil; import org.jcnc.jnotepad.tool.SingletonUtil; import org.jcnc.jnotepad.tool.UiUtil; -import org.jcnc.jnotepad.ui.root.center.tab.JNotepadTab; import org.slf4j.Logger; import java.io.BufferedWriter; diff --git a/src/main/java/org/jcnc/jnotepad/ui/root/top/RootTopVBox.java b/src/main/java/org/jcnc/jnotepad/ui/root/top/RootTopVBox.java deleted file mode 100644 index bae5279..0000000 --- a/src/main/java/org/jcnc/jnotepad/ui/root/top/RootTopVBox.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.jcnc.jnotepad.ui.root.top; - -import javafx.scene.layout.VBox; -import org.jcnc.jnotepad.ui.root.top.menu.JNotepadMenuBar; -import org.jcnc.jnotepad.ui.root.top.tools.ToolHBox; - -public class RootTopVBox extends VBox { - private static final RootTopVBox INSTANCE = new RootTopVBox(); - - private RootTopVBox() { - // 在构造函数中初始化 - getChildren().add(JNotepadMenuBar.getInstance()); - getChildren().add(ToolHBox.getInstance()); - } - - public static RootTopVBox getInstance() { - return INSTANCE; - } - -} diff --git a/src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java b/src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java index 3d25a34..bf597ee 100644 --- a/src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java +++ b/src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java @@ -3,9 +3,7 @@ package org.jcnc.jnotepad.view.manager; import javafx.scene.Scene; import javafx.scene.layout.BorderPane; import org.jcnc.jnotepad.exception.AppException; -import org.jcnc.jnotepad.ui.root.bottom.status.JNotepadStatusBox; -import org.jcnc.jnotepad.ui.root.center.tab.JNotepadTabPane; -import org.jcnc.jnotepad.ui.root.top.RootTopVBox; +import org.jcnc.jnotepad.root.RootBorderPane; /** @@ -76,12 +74,7 @@ public class ViewManager { // 创建主界面布局 root = new BorderPane(); - - root.setTop(RootTopVBox.getInstance()); - - // 创建标签页和文本编辑区域 - root.setCenter(JNotepadTabPane.getInstance()); - root.setBottom(JNotepadStatusBox.getInstance()); + root.setCenter(RootBorderPane.getInstance()); scene.setRoot(root); }