JCNC/JNotepad
JCNC/JNotepad
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "➕ 添加依赖：添加并引入Slf4j api 与 logback作为项目日志框架，已替换项目内控制台输出，简单封装了日志工具类"

Browse Source 
This reverts commit 79e368dc17da8914f09649c4fe1fd2bcbecc3485.
This commit is contained in:
格物方能致知 2023-08-21 12:16:36 +00:00 committed by Gitee
parent 79e368dc17
commit 4bf14ed939
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
10 changed files with 13 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pom.xml
View File

@ -37,18 +37,7 @@
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>
<!-- SLF4J API -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.32</version>
</dependency>
<!-- SLF4J Binding (Logback) -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.9</version>
</dependency>
</dependencies>
<build>

2
src/main/java/module-info.java
View File

@ -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;
}

3
src/main/java/org/jcnc/jnotepad/controller/event/handler/SaveAsFile.java
View File

@ -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<ActionEvent> {
selectedTab.setText(file.getName()); // 更新Tab页标签上的文件名
selectedTab.setUserData(file); // 将文件对象保存到Tab页的UserData中
} catch (IOException ignored) {
LogUtil.info("已忽略IO异常!",this.getClass());
System.out.println("已忽视IO异常!");
}
}
}

7
src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
View File

@ -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异常!");
}
}

5
src/main/java/org/jcnc/jnotepad/controller/manager/ShortcutKey.java
View File

@ -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();
}
}

14
src/main/java/org/jcnc/jnotepad/exception/AppException.java
View File

@ -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());
}
}

2
src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java
View File

@ -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();
}
}

2
src/main/java/org/jcnc/jnotepad/tool/FileUtil.java
View File

@ -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;
}
}

79
src/main/java/org/jcnc/jnotepad/tool/LogUtil.java
View File

@ -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);
}
}

6
src/main/java/org/jcnc/jnotepad/view/manager/ViewManager.java
View File

@ -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);
}
/**