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

fix: 修复读取json并修改的问题

Browse Source
This commit is contained in:
songdragon 2023-08-27 00:58:38 +08:00
parent 815e2b01a8
commit 20bf5e75f4
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/org/jcnc/jnotepad/ui/menu/JNotepadMenuBar.java
View File

@ -287,7 +287,6 @@ public class JNotepadMenuBar extends MenuBar {
*/
private void setCurrentLanguage(String language) throws JsonProcessingException {
boolean flag = false;
ObjectNode json = JsonUtil.OBJECT_MAPPER.createObjectNode();
// 获取本地配置文件
logger.info("尝试读取本地配置文件!");
StringBuilder jsonData = new StringBuilder();
@ -300,30 +299,12 @@ public class JNotepadMenuBar extends MenuBar {
logger.error("读取失败,配置文件错误或不存在配置文件!");
flag = true;
}
ObjectNode json = null;
if (!flag) {
ObjectMapper objectMapper = JsonUtil.OBJECT_MAPPER;
JsonNode jsonNode;
try {
jsonNode = objectMapper.readTree(jsonData.toString());
} catch (JsonProcessingException e) {
throw new AppException(e.getMessage());
}
final ObjectNode finalJson = json;
jsonNode.fields().forEachRemaining(entry -> {
String key = entry.getKey();
JsonNode childNode = entry.getValue();
if (!LOWER_LANGUAGE.equals(key)) {
if (childNode.isArray()) {
ArrayNode arrayNode = finalJson.putArray(key);
arrayNode.add(childNode.toString());
} else {
finalJson.put(key, childNode.toString());
}
}
});
json = JsonUtil.OBJECT_MAPPER.readValue(jsonData.toString(), ObjectNode.class);
logger.info("读取本地配置文件成功!");
}
if (flag) {
} else {
logger.info("获取默认内置配置文件!");
// 如果读取本地失败则获取默认配置文件
json = createShortcutKeyJson();