rusefi
/
RomRaider
mirror of https://github.com/rusefi/RomRaider.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace internal DOMParser with Document builder

This commit is contained in:
Dale Schultz 2022-03-22 20:49:42 -04:00
parent 8c8ef6a824
commit 7ca4e5fc8c
No known key found for this signature in database
GPG Key ID: EA2C8AD6CB5C2AF2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/romraider/util/SettingsManager.java
View File

@ -1,6 +1,6 @@
/* /*
* RomRaider Open-Source Tuning, Logging and Reflashing * RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2021 RomRaider.com * Copyright (C) 2006-2022 RomRaider.com
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -28,6 +28,9 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
@ -36,7 +39,6 @@ import com.romraider.Settings;
import com.romraider.swing.JProgressPane; import com.romraider.swing.JProgressPane;
import com.romraider.xml.DOMSettingsBuilder; import com.romraider.xml.DOMSettingsBuilder;
import com.romraider.xml.DOMSettingsUnmarshaller; import com.romraider.xml.DOMSettingsUnmarshaller;
import com.sun.org.apache.xerces.internal.parsers.DOMParser;
public class SettingsManager { public class SettingsManager {
private static final Logger LOGGER = private static final Logger LOGGER =
@ -58,11 +60,11 @@ public class SettingsManager {
} }
return settings; return settings;
} }
public static void setTesting(boolean b) { public static void setTesting(boolean b) {
testing = b; testing = b;
} }
private static Settings load() { private static Settings load() {
Settings loadedSettings; Settings loadedSettings;
try { try {
@ -80,9 +82,9 @@ public class SettingsManager {
final InputSource src = new InputSource(settingsFileIn); final InputSource src = new InputSource(settingsFileIn);
final DOMSettingsUnmarshaller domUms = new DOMSettingsUnmarshaller(); final DOMSettingsUnmarshaller domUms = new DOMSettingsUnmarshaller();
final DOMParser parser = new DOMParser(); final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
parser.parse(src); final DocumentBuilder builder = dbf.newDocumentBuilder();
final Document doc = parser.getDocument(); final Document doc = builder.parse(src);
loadedSettings = domUms.unmarshallSettings(doc.getDocumentElement()); loadedSettings = domUms.unmarshallSettings(doc.getDocumentElement());
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
showMessageDialog(null, showMessageDialog(null,
@ -101,7 +103,7 @@ public class SettingsManager {
public static void save(Settings newSettings, JProgressPane progress) { public static void save(Settings newSettings, JProgressPane progress) {
if(testing) return; if(testing) return;
final DOMSettingsBuilder builder = new DOMSettingsBuilder(); final DOMSettingsBuilder builder = new DOMSettingsBuilder();
try { try {
final File newDir = new File(settingsDir); final File newDir = new File(settingsDir);