Skip to content

Commit db525ad

Browse files
committed
1.移除notepad代码;2.修改logback配置
1 parent 7bd7351 commit db525ad

9 files changed

Lines changed: 28 additions & 164 deletions

File tree

src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolApplication.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public void start(Stage primaryStage) throws Exception {
4949
// 1. 新UI启动时不扫描插件目录,启动更快;
5050
// 2. 新UI使用独立的ClassLoader加载插件,兼容性更好;
5151
// 3. 新UI本身体验较好。
52-
loadNewUI(primaryStage);
53-
// loadClassicUI(primaryStage);
52+
// loadNewUI(primaryStage);
53+
loadClassicUI(primaryStage);
5454

5555
StageUtils.loadPrimaryStageBound(primaryStage);
5656
primaryStage.show();
@@ -69,17 +69,17 @@ private void loadNewUI(Stage primaryStage) throws IOException {
6969
private void loadClassicUI(Stage primaryStage) throws IOException {
7070
FXMLLoader fXMLLoader = IndexController.getFXMLLoader();
7171
Parent root = fXMLLoader.load();
72-
73-
JFXDecorator decorator = JavaFxViewUtil.getJFXDecorator(
74-
primaryStage,
75-
RESOURCE_BUNDLE.getString("Title") + Config.xJavaFxToolVersions,
76-
LOGO_PATH,
77-
root
78-
);
79-
decorator.setOnCloseButtonAction(() -> confirmExit(null));
80-
81-
Scene scene = JavaFxViewUtil.getJFXDecoratorScene(decorator);
82-
primaryStage.setScene(scene);
72+
primaryStage.setScene(new Scene(root));
73+
// JFXDecorator decorator = JavaFxViewUtil.getJFXDecorator(
74+
// primaryStage,
75+
// RESOURCE_BUNDLE.getString("Title") + Config.xJavaFxToolVersions,
76+
// LOGO_PATH,
77+
// root
78+
// );
79+
// decorator.setOnCloseButtonAction(() -> confirmExit(null));
80+
//
81+
// Scene scene = JavaFxViewUtil.getJFXDecoratorScene(decorator);
82+
// primaryStage.setScene(scene);
8383
}
8484

8585
private void confirmExit(Event event) {

src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ public void initialize(URL location, ResourceBundle resources) {
8383
}
8484

8585
private void initNotepad() {
86-
if (Config.getBoolean(Config.Keys.NotepadEnabled, true)) {
87-
addNodepadAction(null);
88-
}
86+
// if (Config.getBoolean(Config.Keys.NotepadEnabled, true)) {
87+
// addNodepadAction(null);
88+
// }
8989
}
9090

9191
private void initView() {

src/main/java/com/xwintop/xJavaFxTool/controller/NotepadController.java

Lines changed: 0 additions & 78 deletions
This file was deleted.

src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public ContextMenu getSelectContextMenu(String selectText) {
6161
}
6262

6363
public void addNodepadAction(ActionEvent event) {
64-
Parent notepad = FxmlUtils.load("/com/xwintop/xJavaFxTool/fxmlView/notepad.fxml");
64+
TextArea notepad = new TextArea();
6565
if (indexController.getSingleWindowBootCheckMenuItem().isSelected()) {
6666
JavaFxViewUtil.getNewStage(indexController.getBundle().getString("addNodepad"), null, notepad);
6767
} else {

src/main/java/com/xwintop/xJavaFxTool/utils/NodeUtils.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/main/java/com/xwintop/xJavaFxTool/view/NotepadView.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/main/resources/com/xwintop/xJavaFxTool/fxmlView/notepad-tab.fxml

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/main/resources/com/xwintop/xJavaFxTool/fxmlView/notepad.fxml

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/main/resources/logback.xml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<configuration>
22
<jmxConfigurator/>
33
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
4-
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
5-
<fileNamePattern>logs/logFile.%d{yyyy-MM-dd}.log</fileNamePattern>
6-
<maxHistory>30</maxHistory>
7-
</rollingPolicy>
8-
<encoder>
9-
<pattern>%d{HH:mm:ss.SSS} [%-5level] [%thread] %logger{3600} - %msg%n</pattern>
10-
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
11-
</encoder>
4+
<file>logs/logFile.log</file>
5+
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
6+
<fileNamePattern>logs/logFile.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
7+
<maxFileSize>100MB</maxFileSize>
8+
<maxHistory>30</maxHistory>
9+
<totalSizeCap>3GB</totalSizeCap>
10+
</rollingPolicy>
11+
<encoder>
12+
<pattern>%d{HH:mm:ss.SSS} [%-5level] [%thread] %logger{3600} - %msg%n</pattern>
13+
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
14+
</encoder>
1215
</appender>
1316
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
1417
<encoder>

0 commit comments

Comments
 (0)