mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-19 16:40:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-6370: Upgrading to JDOM2

Browse Source
This commit is contained in:
Ryan Kurtz
2026-01-24 05:37:29 -05:00
parent 3dcb02018d
commit 2a06923b23
139 changed files with 363 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchSetDB.java
View File

@@ -20,9 +20,9 @@ import static ghidra.feature.vt.api.db.VTMatchSetTableDBAdapter.ColumnDescriptio
import java.io.*;
import java.util.*;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.jdom2.Element;
import org.jdom2.JDOMException;
import org.jdom2.input.SAXBuilder;
import db.*;
import ghidra.feature.vt.api.impl.*;

10
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchSetTableDBAdapterV0.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,8 +20,8 @@ import static ghidra.feature.vt.api.db.VTMatchSetTableDBAdapter.ColumnDescriptio
import java.io.IOException;
import java.io.StringWriter;
import org.jdom.Element;
import org.jdom.output.XMLOutputter;
import org.jdom2.Element;
import org.jdom2.output.XMLOutputter;
import db.*;
import ghidra.feature.vt.api.main.VTProgramCorrelator;
@@ -81,7 +81,7 @@ public class VTMatchSetTableDBAdapterV0 extends VTMatchSetTableDBAdapter {
}
Element optionsElement = options.getXmlRoot(true);
XMLOutputter xmlout = new GenericXMLOutputter();
XMLOutputter xmlout = GenericXMLOutputter.getInstance();
StringWriter writer = new StringWriter();
try {
xmlout.output(optionsElement, writer);

2
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/util/VTOptions.java
View File

@@ -15,7 +15,7 @@
*/
package ghidra.feature.vt.api.util;
import org.jdom.Element;
import org.jdom2.Element;
import ghidra.framework.options.*;

2
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/plugin/AddressCorrelatorManager.java
View File

@@ -17,7 +17,7 @@ package ghidra.feature.vt.gui.plugin;
import java.util.*;
import org.jdom.Element;
import org.jdom2.Element;
import generic.cache.FixedSizeMRUCachingFactory;
import generic.stl.Pair;

6
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/plugin/VTSubToolManager.java
View File

@@ -19,8 +19,8 @@ import java.awt.Component;
import java.io.*;
import java.util.*;
import org.jdom.Document;
import org.jdom.output.XMLOutputter;
import org.jdom2.Document;
import org.jdom2.output.XMLOutputter;
import docking.ActionContext;
import docking.DockingWindowManager;
@@ -428,7 +428,7 @@ public class VTSubToolManager implements VTControllerListener, OptionsChangeList
try {
OutputStream os = new FileOutputStream(toolFile);
Document doc = new Document(t.getToolTemplate(true).saveToXml());
XMLOutputter xmlOut = new GenericXMLOutputter();
XMLOutputter xmlOut = GenericXMLOutputter.getInstance();
xmlOut.output(doc, os);
os.close();
}