diff --git a/pom.xml b/pom.xml index ded11a0..e1f798e 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,7 @@ logback-classic 1.4.11 + com.ibm.icu icu4j diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 1a3f9b1..22e4a73 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -22,4 +22,5 @@ module org.jcnc.jnotepad { exports org.jcnc.jnotepad.view.manager; exports org.jcnc.jnotepad.constants; exports org.jcnc.jnotepad.ui; + exports org.jcnc.jnotepad.app.init; } \ No newline at end of file diff --git a/src/main/java/org/jcnc/jnotepad/LunchApp.java b/src/main/java/org/jcnc/jnotepad/LunchApp.java index 5ce4dab..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; @@ -7,10 +8,10 @@ import javafx.scene.Scene; import javafx.scene.image.Image; import javafx.scene.layout.Pane; import javafx.stage.Stage; -import org.jcnc.jnotepad.app.config.LoadJnotepadConfig; -import org.jcnc.jnotepad.app.config.LoadLanguageConfig; -import org.jcnc.jnotepad.app.config.LoadShortcutKeyConfig; import org.jcnc.jnotepad.app.config.LocalizationConfig; +import org.jcnc.jnotepad.app.init.LoadJnotepadConfig; +import org.jcnc.jnotepad.app.init.LoadLanguageConfig; +import org.jcnc.jnotepad.app.init.LoadShortcutKeyConfig; import org.jcnc.jnotepad.constants.AppConstants; import org.jcnc.jnotepad.controller.manager.Controller; import org.jcnc.jnotepad.ui.LineNumberTextArea; @@ -24,7 +25,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; - /** * 启动程序 * @@ -53,11 +53,9 @@ public class LunchApp extends Application { @Override public void start(Stage primaryStage) { Pane root = new Pane(); - 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 shortcutKeyList; - - /** - * 样式列表 TODO - */ - private List