diff --git a/src/main/java/org/jcnc/jnotepad/app/config/LoadJnotepadConfig.java b/src/main/java/org/jcnc/jnotepad/app/config/LoadJnotepadConfig.java index 78e6964..6d81ab2 100644 --- a/src/main/java/org/jcnc/jnotepad/app/config/LoadJnotepadConfig.java +++ b/src/main/java/org/jcnc/jnotepad/app/config/LoadJnotepadConfig.java @@ -1,12 +1,8 @@ package org.jcnc.jnotepad.app.config; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import javafx.scene.control.MenuItem; import javafx.scene.input.KeyCombination; import org.jcnc.jnotepad.app.entity.ShortcutKey; -import org.jcnc.jnotepad.exception.AppException; import org.jcnc.jnotepad.tool.LogUtil; import org.jcnc.jnotepad.tool.PopUpUtil; import org.jcnc.jnotepad.ui.menu.JNotepadMenuBar; @@ -67,7 +63,6 @@ public abstract class LoadJnotepadConfig { logger.info("未检测到配置文件!"); // 不存在则创建 createConfig(); - logger.info("已创建默认配置文件!"); } } diff --git a/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java b/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java index 876bc87..4b33f46 100644 --- a/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java +++ b/src/main/java/org/jcnc/jnotepad/tool/EncodingDetector.java @@ -3,13 +3,16 @@ package org.jcnc.jnotepad.tool; import com.ibm.icu.text.CharsetDetector; import com.ibm.icu.text.CharsetMatch; -import org.jcnc.jnotepad.app.config.LocalizationConfig; +import org.jcnc.jnotepad.constants.TextConstants; import org.slf4j.Logger; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; + +import static org.jcnc.jnotepad.constants.TextConstants.UNKNOWN; /** @@ -71,6 +74,10 @@ public class EncodingDetector { public static Charset detectEncodingCharset(File file) { String charset = detectEncoding(file); if (charset.equals(localizationConfig.getUnknown())) { + try { + assert charset != null; + return Charset.forName(charset); + } catch (Exception e) { return Charset.defaultCharset(); } return Charset.forName(charset); diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 12cc4c3..5b0517f 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -3,13 +3,13 @@ - JJ + - +