From 4bf14ed939b20bc65ddacc0c6f3a2dd4243b8524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A0=BC=E7=89=A9=E6=96=B9=E8=83=BD=E8=87=B4=E7=9F=A5?=
<1063891901@qq.com>
Date: Mon, 21 Aug 2023 12:16:36 +0000
Subject: [PATCH] =?UTF-8?q?Revert=20"=E2=9E=95=20=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E4=BE=9D=E8=B5=96=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=B9=B6=E5=BC=95?=
=?UTF-8?q?=E5=85=A5Slf4j=20api=20=E4=B8=8E=20logback=E4=BD=9C=E4=B8=BA?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=A5=E5=BF=97=E6=A1=86=E6=9E=B6=EF=BC=8C?=
=?UTF-8?q?=E5=B7=B2=E6=9B=BF=E6=8D=A2=E9=A1=B9=E7=9B=AE=E5=86=85=E6=8E=A7?=
=?UTF-8?q?=E5=88=B6=E5=8F=B0=E8=BE=93=E5=87=BA=EF=BC=8C=E7=AE=80=E5=8D=95?=
=?UTF-8?q?=E5=B0=81=E8=A3=85=E4=BA=86=E6=97=A5=E5=BF=97=E5=B7=A5=E5=85=B7?=
=?UTF-8?q?=E7=B1=BB"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 79e368dc17da8914f09649c4fe1fd2bcbecc3485.
---
pom.xml | 13 +--
src/main/java/module-info.java | 2 -
.../controller/event/handler/SaveAsFile.java | 3 +-
.../controller/manager/Controller.java | 7 +-
.../controller/manager/ShortcutKey.java | 5 +-
.../jcnc/jnotepad/exception/AppException.java | 14 ----
.../jcnc/jnotepad/tool/EncodingDetector.java | 2 +-
.../java/org/jcnc/jnotepad/tool/FileUtil.java | 2 +-
.../java/org/jcnc/jnotepad/tool/LogUtil.java | 79 -------------------
.../jnotepad/view/manager/ViewManager.java | 6 +-
10 files changed, 13 insertions(+), 120 deletions(-)
delete mode 100644 src/main/java/org/jcnc/jnotepad/exception/AppException.java
delete mode 100644 src/main/java/org/jcnc/jnotepad/tool/LogUtil.java
diff --git a/pom.xml b/pom.xml
index c57ff05..e6fde4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,18 +37,7 @@
gson
2.10.1
-
-
- org.slf4j
- slf4j-api
- 1.7.32
-
-
-
- ch.qos.logback
- logback-classic
- 1.2.9
-
+
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 3aa0d42..c4adc8c 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -4,7 +4,6 @@ module org.jcnc.jnotepad {
// requires cn.hutool.json;
// requires cn.hutool.core;
requires com.google.gson;
- requires org.slf4j;
exports org.jcnc.jnotepad;
exports org.jcnc.jnotepad.tool;
exports org.jcnc.jnotepad.Interface;
@@ -14,5 +13,4 @@ module org.jcnc.jnotepad {
exports org.jcnc.jnotepad.view.manager;
exports org.jcnc.jnotepad.constants;
exports org.jcnc.jnotepad.ui;
- exports org.jcnc.jnotepad.exception;
}
\ No newline at end of file
diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/SaveAsFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/SaveAsFile.java
index b2c1536..c5afe8d 100644
--- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/SaveAsFile.java
+++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/SaveAsFile.java
@@ -4,7 +4,6 @@ import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.scene.control.Tab;
import javafx.stage.FileChooser;
-import org.jcnc.jnotepad.tool.LogUtil;
import org.jcnc.jnotepad.ui.LineNumberTextArea;
import org.jcnc.jnotepad.view.manager.ViewManager;
@@ -50,7 +49,7 @@ public class SaveAsFile implements EventHandler {
selectedTab.setText(file.getName()); // 更新Tab页标签上的文件名
selectedTab.setUserData(file); // 将文件对象保存到Tab页的UserData中
} catch (IOException ignored) {
- LogUtil.info("已忽略IO异常!",this.getClass());
+ System.out.println("已忽视IO异常!");
}
}
}
diff --git a/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java b/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
index a7b1417..1f622df 100644
--- a/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
+++ b/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
@@ -11,7 +11,6 @@ import org.jcnc.jnotepad.controller.event.handler.NewFile;
import org.jcnc.jnotepad.controller.event.handler.OpenFile;
import org.jcnc.jnotepad.controller.event.handler.SaveAsFile;
import org.jcnc.jnotepad.tool.EncodingDetector;
-import org.jcnc.jnotepad.tool.LogUtil;
import org.jcnc.jnotepad.ui.LineNumberTextArea;
import org.jcnc.jnotepad.view.manager.ViewManager;
@@ -108,9 +107,9 @@ public class Controller implements ControllerInterface {
if (file != null) {
try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
writer.write(newValue);
- LogUtil.info("正在自动保存---",this.getClass());
+ System.out.println("正在自动保存---");
} catch (IOException ignored) {
- LogUtil.info("已忽略IO异常!",this.getClass());
+ System.out.println("已忽视IO异常!");
}
}
}
@@ -185,7 +184,7 @@ public class Controller implements ControllerInterface {
autoSave(textArea);
});
} catch (IOException ignored) {
- LogUtil.info("已忽略IO异常!",this.getClass());
+ System.out.println("已忽视IO异常!");
}
}
diff --git a/src/main/java/org/jcnc/jnotepad/controller/manager/ShortcutKey.java b/src/main/java/org/jcnc/jnotepad/controller/manager/ShortcutKey.java
index 3228404..1cd4d74 100644
--- a/src/main/java/org/jcnc/jnotepad/controller/manager/ShortcutKey.java
+++ b/src/main/java/org/jcnc/jnotepad/controller/manager/ShortcutKey.java
@@ -6,7 +6,6 @@ import com.google.gson.reflect.TypeToken;
import javafx.scene.control.MenuItem;
import javafx.scene.input.KeyCombination;
import org.jcnc.jnotepad.Interface.ShortcutKeyInterface;
-import org.jcnc.jnotepad.tool.LogUtil;
import org.jcnc.jnotepad.view.manager.ViewManager;
import java.io.*;
@@ -34,7 +33,7 @@ public class ShortcutKey implements ShortcutKeyInterface {
jsonData.append(line);
}
} catch (IOException e) {
- LogUtil.error(e.getMessage(),e,this.getClass());
+ e.printStackTrace();
}
} else {
// todo new InputStreamReader(inputStream) 实参 'inputStream' 可能为null
@@ -44,7 +43,7 @@ public class ShortcutKey implements ShortcutKeyInterface {
jsonData.append(line);
}
} catch (IOException e) {
- LogUtil.error(e.getMessage(),e,this.getClass());
+ e.printStackTrace();
}
}
diff --git a/src/main/java/org/jcnc/jnotepad/exception/AppException.java b/src/main/java/org/jcnc/jnotepad/exception/AppException.java
deleted file mode 100644
index af59783..0000000
--- a/src/main/java/org/jcnc/jnotepad/exception/AppException.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jcnc.jnotepad.exception;
-import org.jcnc.jnotepad.tool.LogUtil;
-
-/**
- * 应用异常类
- *
- * @author gewuyou
- */
-public class AppException extends RuntimeException{
- public AppException(String message) {
- super(message);
- LogUtil.error(message,this.getClass());
- }
-}
diff --git a/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java b/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java
index 938af8a..5343276 100644
--- a/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java
+++ b/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java
@@ -36,7 +36,7 @@ public class EncodingDetector {
// 尝试常见的编码
for (Charset charset : commonCharsets()) {
if (isValidEncoding(text, charset)) {
- LogUtil.info("编码监测结果:" + isValidEncoding(text, charset), EncodingDetector.class);
+ System.out.println("编码监测结果:" + isValidEncoding(text, charset));
return charset.name();
}
}
diff --git a/src/main/java/org/jcnc/jnotepad/tool/FileUtil.java b/src/main/java/org/jcnc/jnotepad/tool/FileUtil.java
index 9156a90..86dfde1 100644
--- a/src/main/java/org/jcnc/jnotepad/tool/FileUtil.java
+++ b/src/main/java/org/jcnc/jnotepad/tool/FileUtil.java
@@ -30,7 +30,7 @@ public class FileUtil {
jsonStr = sb.toString();
return jsonStr;
} catch (IOException e) {
- LogUtil.error(e.getMessage(),e,FileUtil.class);
+ e.printStackTrace();
return null;
}
}
diff --git a/src/main/java/org/jcnc/jnotepad/tool/LogUtil.java b/src/main/java/org/jcnc/jnotepad/tool/LogUtil.java
deleted file mode 100644
index 1639855..0000000
--- a/src/main/java/org/jcnc/jnotepad/tool/LogUtil.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.jcnc.jnotepad.tool;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 日志工具类
- *
- * @author gewuyou
- */
-public class LogUtil {
- private LogUtil() {
- }
-
- /**
- * 日志信息打印
- *
- * @param message 日志信息
- * @param currentClass 所要记录的类
- *
- * @apiNote 传入当前需要记录的类，方便知晓是哪个位置记录的日志
- */
- public static void info(String message, Class currentClass) {
- Logger logger = LoggerFactory.getLogger(currentClass);
- logger.info(message);
- }
- /**
- * 日志排错信息打印
- *
- * @param message 日志信息
- * @param currentClass 所要记录的类
- *
- * @apiNote 传入当前需要记录的类，方便知晓是哪个位置记录的日志
- */
-
- public static void debug(String message, Class currentClass) {
- Logger logger = LoggerFactory.getLogger(currentClass);
- logger.debug(message);
- }
- /**
- * 日志警告信息打印
- *
- * @param message 日志信息
- * @param currentClass 所要记录的类
- *
- * @apiNote 传入当前需要记录的类，方便知晓是哪个位置记录的日志
- */
- public static void warn(String message, Class currentClass) {
- Logger logger = LoggerFactory.getLogger(currentClass);
- logger.warn(message);
- }
- /**
- * 日志错误信息打印
- *
- * @param message 日志信息
- * @param currentClass 所要记录的类
- *
- * @apiNote 传入当前需要记录的类，方便知晓是哪个位置记录的日志
- */
- public static void error(String message, Class currentClass) {
- Logger logger = LoggerFactory.getLogger(currentClass);
- logger.error(message);
- }
- /**
- * 日志错误信息打印
- *
- * @param message 日志信息
- * @param throwable 抛出的异常
- * @param currentClass 所要记录的类
- *
- * @apiNote 这个方法用来弥补当抛出异常或手动抛出异常时，无法捕捉到所抛异常
- */
-
- public static void error(String message, Throwable throwable, Class currentClass) {
- Logger logger = LoggerFactory.getLogger(currentClass);
- logger.error(message, throwable);
- }
-}
-
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 0842809..bac2c4c 100644
--- a/src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java
+++ b/src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java
@@ -5,7 +5,6 @@ import javafx.scene.Scene;
import javafx.scene.control.*;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.HBox;
-import org.jcnc.jnotepad.exception.AppException;
import java.util.HashMap;
import java.util.Map;
@@ -26,7 +25,9 @@ public class ViewManager {
private int tabIndex = 0;
private Boolean line = true;
+
/// 菜单栏组件
+
/**
* 菜单栏
*/
@@ -176,7 +177,7 @@ public class ViewManager {
if (instance != null) {
return instance;
} else {
- throw new AppException("ViewManager实例未初始化!");
+ throw new RuntimeException("ViewManager的实例未初始化!");
}
}
@@ -188,6 +189,7 @@ public class ViewManager {
private ViewManager(Scene scene) {
root = new BorderPane();
scene.setRoot(root);
+
}
/**