diff --git a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/tracemgr/DebuggerCoordinates.java b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/tracemgr/DebuggerCoordinates.java index cc7c433083..f1d7f4b17a 100644 --- a/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/tracemgr/DebuggerCoordinates.java +++ b/Ghidra/Debug/Debugger-api/src/main/java/ghidra/debug/api/tracemgr/DebuggerCoordinates.java @@ -18,7 +18,7 @@ package ghidra.debug.api.tracemgr; import java.io.IOException; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.app.services.DebuggerTraceManagerService; import ghidra.debug.api.target.Target; diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/client/tracermi/RmiClient.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/client/tracermi/RmiClient.java index c9fada1ef8..2b5ef91946 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/client/tracermi/RmiClient.java +++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/client/tracermi/RmiClient.java @@ -22,7 +22,7 @@ import java.nio.channels.SocketChannel; import java.util.*; import java.util.concurrent.*; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import com.google.protobuf.ByteString; diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/TraceRmiLauncherServicePlugin.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/TraceRmiLauncherServicePlugin.java index 20d49cc9c4..d5449138b3 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/TraceRmiLauncherServicePlugin.java +++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/TraceRmiLauncherServicePlugin.java @@ -22,8 +22,8 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jdom.Element; -import org.jdom.JDOMException; +import org.jdom2.Element; +import org.jdom2.JDOMException; import db.Transaction; import docking.ActionContext; diff --git a/Ghidra/Debug/Debugger/ghidra_scripts/PopulateDemoTrace.java b/Ghidra/Debug/Debugger/ghidra_scripts/PopulateDemoTrace.java index e563a7bfce..4015b85e26 100644 --- a/Ghidra/Debug/Debugger/ghidra_scripts/PopulateDemoTrace.java +++ b/Ghidra/Debug/Debugger/ghidra_scripts/PopulateDemoTrace.java @@ -17,7 +17,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.*; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import db.Transaction; import ghidra.app.plugin.assembler.Assembler; diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/MultiProviderSaveBehavior.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/MultiProviderSaveBehavior.java index 2620522e58..6fa3142983 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/MultiProviderSaveBehavior.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/MultiProviderSaveBehavior.java @@ -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. @@ -18,7 +18,7 @@ package ghidra.app.plugin.core.debug.gui; import java.util.List; import java.util.function.BiConsumer; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.app.plugin.core.debug.gui.MultiProviderSaveBehavior.SaveableProvider; import ghidra.framework.options.SaveState; diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingPlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingPlugin.java index cd9937a683..979763eb5e 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingPlugin.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingPlugin.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.function.Consumer; import java.util.stream.Collectors; -import org.jdom.Element; +import org.jdom2.Element; import docking.ActionContext; import docking.action.MenuData; diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java index f282a99c09..f787eadf33 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProvider.java @@ -31,7 +31,7 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.apache.commons.lang3.StringUtils; -import org.jdom.Element; +import org.jdom2.Element; import docking.*; import docking.action.DockingAction; diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesPlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesPlugin.java index 44bfb3d0cb..356c0d12e3 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesPlugin.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerMemoryBytesPlugin.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.function.Consumer; import java.util.stream.Collectors; -import org.jdom.Element; +import org.jdom2.Element; import docking.action.DockingAction; import ghidra.app.plugin.PluginCategoryNames; diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/register/DebuggerRegistersPlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/register/DebuggerRegistersPlugin.java index 8f674497cb..dcb037e26a 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/register/DebuggerRegistersPlugin.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/register/DebuggerRegistersPlugin.java @@ -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. @@ -19,7 +19,7 @@ import java.util.*; import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.app.plugin.PluginCategoryNames; import ghidra.app.plugin.core.debug.AbstractDebuggerPlugin; diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java index 4c09294e21..f3727f9f75 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java @@ -29,7 +29,7 @@ import javax.swing.*; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; -import org.jdom.Element; +import org.jdom2.Element; import db.Transaction; import docking.ActionContext; diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ProgramEmulationUtils.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ProgramEmulationUtils.java index d75cd2d321..c701beac4f 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ProgramEmulationUtils.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ProgramEmulationUtils.java @@ -21,7 +21,7 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import db.Transaction; import ghidra.app.plugin.core.debug.service.modules.DebuggerStaticMappingUtils; diff --git a/Ghidra/Debug/Debugger/src/screen/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelPluginScreenShots.java b/Ghidra/Debug/Debugger/src/screen/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelPluginScreenShots.java index 1229a9daa0..1d10904ad1 100644 --- a/Ghidra/Debug/Debugger/src/screen/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelPluginScreenShots.java +++ b/Ghidra/Debug/Debugger/src/screen/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelPluginScreenShots.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import java.util.List; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import org.junit.Test; import db.Transaction; diff --git a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java index 1877db7003..9c8e31cbfa 100644 --- a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java +++ b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java @@ -31,7 +31,7 @@ import java.util.function.Supplier; import javax.swing.*; import javax.swing.tree.TreePath; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import org.junit.*; import org.junit.rules.TestName; diff --git a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelProviderTest.java b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelProviderTest.java index 239d45a2ca..615f4b9f34 100644 --- a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelProviderTest.java +++ b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelProviderTest.java @@ -21,7 +21,7 @@ import java.awt.event.MouseEvent; import java.util.*; import java.util.stream.*; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import org.junit.*; import db.Transaction; diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/target/DBTraceObjectManager.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/target/DBTraceObjectManager.java index 36ef72db53..634b76283d 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/target/DBTraceObjectManager.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/target/DBTraceObjectManager.java @@ -23,7 +23,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import db.*; import ghidra.framework.data.OpenMode; diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/target/schema/XmlSchemaContext.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/target/schema/XmlSchemaContext.java index 8dce5fa5c9..f8c19ba968 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/target/schema/XmlSchemaContext.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/target/schema/XmlSchemaContext.java @@ -18,8 +18,8 @@ package ghidra.trace.model.target.schema; import java.io.*; import java.util.*; -import org.jdom.*; -import org.jdom.input.SAXBuilder; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; import ghidra.trace.model.target.TraceObject; import ghidra.trace.model.target.iface.TraceObjectInterface; diff --git a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/dbg/target/schema/XmlTargetObjectSchemaTest.java b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/dbg/target/schema/XmlTargetObjectSchemaTest.java index 32b9b5a01a..fb2d976b5c 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/dbg/target/schema/XmlTargetObjectSchemaTest.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/dbg/target/schema/XmlTargetObjectSchemaTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertNotNull; import java.io.IOException; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import org.junit.Ignore; import org.junit.Test; diff --git a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/ToyDBTraceBuilder.java b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/ToyDBTraceBuilder.java index 90652d07f9..8b32ff73e5 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/ToyDBTraceBuilder.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/ToyDBTraceBuilder.java @@ -28,7 +28,7 @@ import java.nio.file.Path; import java.util.Collection; import java.util.List; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import db.DBHandle; import db.Transaction; diff --git a/Ghidra/Extensions/SleighDevTools/src/main/java/ghidra/app/util/disassemble/GNUExternalDisassembler.java b/Ghidra/Extensions/SleighDevTools/src/main/java/ghidra/app/util/disassemble/GNUExternalDisassembler.java index 7fb8a4605b..cbb51d82e4 100644 --- a/Ghidra/Extensions/SleighDevTools/src/main/java/ghidra/app/util/disassemble/GNUExternalDisassembler.java +++ b/Ghidra/Extensions/SleighDevTools/src/main/java/ghidra/app/util/disassemble/GNUExternalDisassembler.java @@ -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. @@ -19,8 +19,8 @@ import java.io.*; import java.util.*; import org.apache.commons.lang3.StringUtils; -import org.jdom.*; -import org.jdom.input.SAXBuilder; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; import generic.jar.ResourceFile; import ghidra.app.util.bin.ByteProvider; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeBrowserPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeBrowserPlugin.java index 9cf075cefd..dc2a3569fd 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeBrowserPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeBrowserPlugin.java @@ -17,7 +17,7 @@ package ghidra.app.plugin.core.codebrowser; import java.util.Iterator; -import org.jdom.Element; +import org.jdom2.Element; import docking.widgets.fieldpanel.FieldPanel; import docking.widgets.fieldpanel.support.FieldSelection; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/colorizer/ColorizingPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/colorizer/ColorizingPlugin.java index 2490e77a0a..9a6e6429ab 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/colorizer/ColorizingPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/colorizer/ColorizingPlugin.java @@ -21,7 +21,7 @@ import java.awt.Color; import java.util.ArrayList; import java.util.List; -import org.jdom.Element; +import org.jdom2.Element; import docking.ActionContext; import docking.action.DockingAction; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/gotoquery/DefaultNavigatableLocationMemento.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/gotoquery/DefaultNavigatableLocationMemento.java index 53a084373a..c7c0b5f03a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/gotoquery/DefaultNavigatableLocationMemento.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/gotoquery/DefaultNavigatableLocationMemento.java @@ -1,13 +1,12 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * 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. @@ -24,7 +23,7 @@ import ghidra.program.util.ProgramLocation; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import docking.ComponentProvider; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NavigationHistoryPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NavigationHistoryPlugin.java index 6313742df1..944dc24717 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NavigationHistoryPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NavigationHistoryPlugin.java @@ -17,7 +17,7 @@ package ghidra.app.plugin.core.navigation; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import docking.ComponentProvider; import docking.DockingWindowManager; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/ProgramStartingLocationPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/ProgramStartingLocationPlugin.java index 3db9b2c0d7..cf2dd7fdbb 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/ProgramStartingLocationPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/ProgramStartingLocationPlugin.java @@ -18,8 +18,8 @@ package ghidra.app.plugin.core.navigation; import java.io.IOException; import java.util.*; -import org.jdom.Element; -import org.jdom.JDOMException; +import org.jdom2.Element; +import org.jdom2.JDOMException; import docking.widgets.OptionDialog; import ghidra.app.CorePluginPackage; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditMemoryReferencePanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditMemoryReferencePanel.java index 875d13ad8e..602ec30176 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditMemoryReferencePanel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditMemoryReferencePanel.java @@ -27,7 +27,7 @@ import javax.swing.*; import javax.swing.border.LineBorder; import javax.swing.table.AbstractTableModel; -import org.jdom.Element; +import org.jdom2.Element; import docking.DropDownMenuIcon; import docking.widgets.button.GButton; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditReferenceDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditReferenceDialog.java index d4b8b495e5..8f7a55489b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditReferenceDialog.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditReferenceDialog.java @@ -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. @@ -21,7 +21,7 @@ import javax.swing.*; import javax.swing.border.*; import javax.swing.event.ChangeListener; -import org.jdom.Element; +import org.jdom2.Element; import docking.ReusableDialogComponentProvider; import docking.widgets.button.GRadioButton; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/ReferencesPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/ReferencesPlugin.java index 90ea8a5308..5444faabbd 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/ReferencesPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/ReferencesPlugin.java @@ -22,7 +22,7 @@ import java.util.*; import javax.swing.JComponent; -import org.jdom.Element; +import org.jdom2.Element; import docking.ComponentProvider; import docking.DockingUtils; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/FilterDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/FilterDialog.java index 6889eea5df..444e66a340 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/FilterDialog.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/FilterDialog.java @@ -23,7 +23,7 @@ import java.util.Map; import javax.swing.*; -import org.jdom.Element; +import org.jdom2.Element; import docking.ComponentProvider; import docking.ReusableDialogComponentProvider; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/NewSymbolFilter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/NewSymbolFilter.java index 955b1fe30b..5b700cae40 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/NewSymbolFilter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/NewSymbolFilter.java @@ -17,7 +17,7 @@ package ghidra.app.plugin.core.symtable; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.program.model.address.Address; import ghidra.program.model.listing.*; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolPanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolPanel.java index 061b72f5cb..a966d475d6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolPanel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolPanel.java @@ -24,7 +24,7 @@ import javax.swing.event.TableModelListener; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; -import org.jdom.Element; +import org.jdom2.Element; import docking.widgets.checkbox.GCheckBox; import docking.widgets.table.DefaultRowFilterTransformer; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/GenerateOldLanguagePlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/GenerateOldLanguagePlugin.java index bc68a1f221..3a37532157 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/GenerateOldLanguagePlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/GenerateOldLanguagePlugin.java @@ -26,9 +26,9 @@ import javax.swing.JButton; import javax.swing.JPanel; import javax.swing.border.EmptyBorder; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.output.XMLOutputter; import docking.ActionContext; import docking.DialogComponentProvider; @@ -390,7 +390,7 @@ public class GenerateOldLanguagePlugin extends Plugin implements ApplicationLeve Document doc = new Document(root); FileOutputStream out = new FileOutputStream(transFile); - XMLOutputter xml = new GenericXMLOutputter(); + XMLOutputter xml = GenericXMLOutputter.getInstance(); xml.output(doc, out); out.close(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFRegisterMappingsManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFRegisterMappingsManager.java index 76a627a2a3..e25ebec126 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFRegisterMappingsManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFRegisterMappingsManager.java @@ -21,8 +21,8 @@ import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jdom.*; -import org.jdom.input.SAXBuilder; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; import generic.jar.ResourceFile; import ghidra.program.model.lang.*; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/GoRegisterInfoManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/GoRegisterInfoManager.java index ac6ea60e93..10911f2640 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/GoRegisterInfoManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/GoRegisterInfoManager.java @@ -19,8 +19,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.*; -import org.jdom.*; -import org.jdom.input.SAXBuilder; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; import generic.jar.ResourceFile; import ghidra.app.util.bin.format.dwarf.DWARFUtil; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/prelink/MachoPrelinkParser.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/prelink/MachoPrelinkParser.java index 01e5e716b9..49aca5ebf9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/prelink/MachoPrelinkParser.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/prelink/MachoPrelinkParser.java @@ -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. @@ -18,8 +18,8 @@ package ghidra.app.util.bin.format.macho.prelink; import java.io.*; import java.util.*; -import org.jdom.*; -import org.jdom.input.SAXBuilder; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; import ghidra.app.util.bin.ByteProvider; import ghidra.app.util.bin.format.macho.MachHeader; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibraryHints.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibraryHints.java index 7306ccf26b..840a56a569 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibraryHints.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibraryHints.java @@ -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. @@ -18,8 +18,8 @@ package ghidra.app.util.opinion; import java.io.*; import java.util.*; -import org.jdom.*; -import org.jdom.input.SAXBuilder; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; import org.xml.sax.SAXException; import org.xml.sax.SAXNotRecognizedException; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibrarySymbolTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibrarySymbolTable.java index 6c1a2c9209..c26cc0ba5b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibrarySymbolTable.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibrarySymbolTable.java @@ -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,9 +20,9 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; -import org.jdom.*; -import org.jdom.input.SAXBuilder; -import org.jdom.output.XMLOutputter; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.XMLOutputter; import org.xml.sax.*; import generic.jar.ResourceFile; @@ -519,7 +519,7 @@ class LibrarySymbolTable { try { Document doc = new Document(root); - XMLOutputter xmlout = new GenericXMLOutputter(); + XMLOutputter xmlout = GenericXMLOutputter.getInstance(); xmlout.output(doc, fos); } finally { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoPrelinkUtils.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoPrelinkUtils.java index 391b18759b..e6185ede47 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoPrelinkUtils.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoPrelinkUtils.java @@ -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,7 +20,7 @@ import java.util.*; import org.apache.commons.collections4.BidiMap; import org.apache.commons.collections4.bidimap.DualHashBidiMap; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import ghidra.app.util.bin.ByteProvider; import ghidra.app.util.bin.ByteProviderWrapper; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldFormatModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldFormatModel.java index dfcc9d3f8d..4469d7288c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldFormatModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldFormatModel.java @@ -17,7 +17,7 @@ package ghidra.app.util.viewer.format; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import docking.widgets.fieldpanel.field.Field; import docking.widgets.fieldpanel.support.RowLayout; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FormatManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FormatManager.java index 59ce6ce5d6..1d91e86858 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FormatManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FormatManager.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.jdom.Element; +import org.jdom2.Element; import docking.widgets.fieldpanel.support.Highlight; import ghidra.app.util.ListingHighlightProvider; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/test/TestEnv.java b/Ghidra/Features/Base/src/main/java/ghidra/test/TestEnv.java index e39c85eb8f..c976fca608 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/test/TestEnv.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/test/TestEnv.java @@ -23,7 +23,7 @@ import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import org.jdom.Element; +import org.jdom2.Element; import docking.ComponentProvider; import docking.DialogComponentProvider; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestCombinedTestResults.java b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestCombinedTestResults.java index c6f92bd228..84cd74323d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestCombinedTestResults.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestCombinedTestResults.java @@ -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,10 +20,10 @@ import java.io.*; import java.util.*; import java.util.function.Predicate; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.input.SAXBuilder; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.XMLOutputter; import generic.theme.GThemeDefaults.Colors.Palette; import ghidra.test.processors.support.PCodeTestResults.TestResults; @@ -108,7 +108,7 @@ public class PCodeTestCombinedTestResults { combinedResults.put(jUnitName, testResults); } } - catch (org.jdom.JDOMException je) { + catch (org.jdom2.JDOMException je) { throw new IOException("Invalid P-Code test results xml file: " + xmlFile, je); } finally { @@ -148,7 +148,7 @@ public class PCodeTestCombinedTestResults { try { Document doc = new Document(root); - XMLOutputter xmlout = new GenericXMLOutputter(); + XMLOutputter xmlout = GenericXMLOutputter.getInstance(); xmlout.output(doc, bos); } finally { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestResults.java b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestResults.java index 0da4bcdfb0..70ac2ea624 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestResults.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestResults.java @@ -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 java.text.SimpleDateFormat; import java.util.*; import java.util.function.Predicate; -import org.jdom.Attribute; -import org.jdom.Element; +import org.jdom2.Attribute; +import org.jdom2.Element; public class PCodeTestResults { diff --git a/Ghidra/Features/Base/src/test.slow/java/docking/DockingWindowManagerTest.java b/Ghidra/Features/Base/src/test.slow/java/docking/DockingWindowManagerTest.java index c4900a2269..85661ac2f1 100644 --- a/Ghidra/Features/Base/src/test.slow/java/docking/DockingWindowManagerTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/docking/DockingWindowManagerTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicReference; import javax.swing.JComponent; import javax.swing.JLabel; -import org.jdom.Element; +import org.jdom2.Element; import org.junit.Test; import docking.test.AbstractDockingTest; diff --git a/Ghidra/Features/Base/src/test.slow/java/docking/widgets/table/GhidraTableColumnModelTest.java b/Ghidra/Features/Base/src/test.slow/java/docking/widgets/table/GhidraTableColumnModelTest.java index a2c80ee95a..132b482a8d 100644 --- a/Ghidra/Features/Base/src/test.slow/java/docking/widgets/table/GhidraTableColumnModelTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/docking/widgets/table/GhidraTableColumnModelTest.java @@ -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. @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicReference; import javax.swing.*; import javax.swing.table.*; -import org.jdom.*; +import org.jdom2.*; import org.junit.*; import docking.DockingUtils; diff --git a/Ghidra/Features/Base/src/test.slow/java/docking/widgets/table/GhidraTableFilterTest.java b/Ghidra/Features/Base/src/test.slow/java/docking/widgets/table/GhidraTableFilterTest.java index 4cb50e96f8..f22b8f26e5 100644 --- a/Ghidra/Features/Base/src/test.slow/java/docking/widgets/table/GhidraTableFilterTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/docking/widgets/table/GhidraTableFilterTest.java @@ -23,7 +23,7 @@ import java.util.List; import javax.swing.JComponent; import javax.swing.JPanel; -import org.jdom.Element; +import org.jdom2.Element; import org.junit.*; import docking.*; diff --git a/Ghidra/Features/Base/src/test.slow/java/docking/widgets/tree/GTreeFilterTest.java b/Ghidra/Features/Base/src/test.slow/java/docking/widgets/tree/GTreeFilterTest.java index c0a2861800..e40db2e938 100644 --- a/Ghidra/Features/Base/src/test.slow/java/docking/widgets/tree/GTreeFilterTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/docking/widgets/tree/GTreeFilterTest.java @@ -21,7 +21,7 @@ import java.util.List; import javax.swing.tree.TreePath; -import org.jdom.Element; +import org.jdom2.Element; import org.junit.*; import docking.DockingWindowManager; diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/symtable/SymbolTablePluginTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/symtable/SymbolTablePluginTest.java index da051821f9..65040654b1 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/symtable/SymbolTablePluginTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/symtable/SymbolTablePluginTest.java @@ -30,7 +30,7 @@ import javax.swing.event.ChangeEvent; import javax.swing.table.TableModel; import javax.swing.text.JTextComponent; -import org.jdom.Element; +import org.jdom2.Element; import org.junit.*; import docking.*; diff --git a/Ghidra/Features/Base/src/test/java/ghidra/framework/options/GPropertiesTest.java b/Ghidra/Features/Base/src/test/java/ghidra/framework/options/GPropertiesTest.java index b689fa305c..b544caf1d1 100644 --- a/Ghidra/Features/Base/src/test/java/ghidra/framework/options/GPropertiesTest.java +++ b/Ghidra/Features/Base/src/test/java/ghidra/framework/options/GPropertiesTest.java @@ -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. @@ -25,10 +25,10 @@ import java.util.Date; import javax.swing.KeyStroke; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.input.SAXBuilder; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.XMLOutputter; import org.junit.Before; import org.junit.Test; @@ -177,7 +177,7 @@ public class GPropertiesTest extends AbstractGenericTest { try { os = new FileOutputStream(saveFile); Document doc = new Document(element); - XMLOutputter xmlout = new GenericXMLOutputter(); + XMLOutputter xmlout = GenericXMLOutputter.getInstance(); xmlout.output(doc, os); os.close(); } diff --git a/Ghidra/Features/Base/src/test/java/ghidra/framework/options/OptionsTest.java b/Ghidra/Features/Base/src/test/java/ghidra/framework/options/OptionsTest.java index 99c08f48c5..7dc2cab3ac 100644 --- a/Ghidra/Features/Base/src/test/java/ghidra/framework/options/OptionsTest.java +++ b/Ghidra/Features/Base/src/test/java/ghidra/framework/options/OptionsTest.java @@ -30,7 +30,7 @@ import java.util.*; import javax.swing.JComponent; import javax.swing.KeyStroke; -import org.jdom.Element; +import org.jdom2.Element; import org.junit.*; import docking.DockingUtils; diff --git a/Ghidra/Features/Base/src/test/java/ghidra/framework/options/SaveStateTest.java b/Ghidra/Features/Base/src/test/java/ghidra/framework/options/SaveStateTest.java index deb951bb3f..61d521c080 100644 --- a/Ghidra/Features/Base/src/test/java/ghidra/framework/options/SaveStateTest.java +++ b/Ghidra/Features/Base/src/test/java/ghidra/framework/options/SaveStateTest.java @@ -17,7 +17,7 @@ package ghidra.framework.options; import static org.junit.Assert.*; -import org.jdom.Element; +import org.jdom2.Element; import org.junit.Test; import generic.test.AbstractGTest; diff --git a/Ghidra/Features/Base/src/test/java/ghidra/program/util/LanguageTranslatorAdapterTest.java b/Ghidra/Features/Base/src/test/java/ghidra/program/util/LanguageTranslatorAdapterTest.java index 704e432f57..159f3b9d81 100644 --- a/Ghidra/Features/Base/src/test/java/ghidra/program/util/LanguageTranslatorAdapterTest.java +++ b/Ghidra/Features/Base/src/test/java/ghidra/program/util/LanguageTranslatorAdapterTest.java @@ -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. @@ -22,9 +22,9 @@ import java.io.StringReader; import java.math.BigInteger; import java.util.Arrays; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.input.SAXBuilder; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.input.SAXBuilder; import org.junit.Before; import org.junit.Test; diff --git a/Ghidra/Features/Base/src/test/java/ghidra/program/util/SimpleLanguageTranslatorTest.java b/Ghidra/Features/Base/src/test/java/ghidra/program/util/SimpleLanguageTranslatorTest.java index 278fb8a0c4..a1ca57d54b 100644 --- a/Ghidra/Features/Base/src/test/java/ghidra/program/util/SimpleLanguageTranslatorTest.java +++ b/Ghidra/Features/Base/src/test/java/ghidra/program/util/SimpleLanguageTranslatorTest.java @@ -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. @@ -22,9 +22,9 @@ import java.io.StringReader; import java.math.BigInteger; import java.util.Arrays; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.input.SAXBuilder; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.input.SAXBuilder; import org.junit.Before; import org.junit.Test; diff --git a/Ghidra/Features/Base/src/test/java/ghidra/util/xml/XmlUtilitiesTest.java b/Ghidra/Features/Base/src/test/java/ghidra/util/xml/XmlUtilitiesTest.java index d9b3d8a6af..22e23ac994 100644 --- a/Ghidra/Features/Base/src/test/java/ghidra/util/xml/XmlUtilitiesTest.java +++ b/Ghidra/Features/Base/src/test/java/ghidra/util/xml/XmlUtilitiesTest.java @@ -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,7 +20,7 @@ import static org.junit.Assert.assertTrue; import java.util.List; -import org.jdom.Element; +import org.jdom2.Element; import org.junit.Test; import generic.test.AbstractGenericTest; diff --git a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/ContextRegisterInfo.java b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/ContextRegisterInfo.java index cfd7ded47e..869aedef19 100644 --- a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/ContextRegisterInfo.java +++ b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/ContextRegisterInfo.java @@ -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. @@ -17,7 +17,7 @@ package ghidra.bitpatterns.info; import java.math.BigInteger; -import org.jdom.Element; +import org.jdom2.Element; /** * class for representing the values a specific context register assumes within a function body. diff --git a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FileBitPatternInfo.java b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FileBitPatternInfo.java index 3e16993995..d7d98fa6c9 100644 --- a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FileBitPatternInfo.java +++ b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FileBitPatternInfo.java @@ -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. @@ -19,8 +19,8 @@ import java.io.*; import java.util.ArrayList; import java.util.List; -import org.jdom.*; -import org.jdom.input.SAXBuilder; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; import ghidra.util.Msg; import ghidra.util.xml.XmlUtilities; diff --git a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FunctionBitPatternInfo.java b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FunctionBitPatternInfo.java index 0979444942..16edf22c0f 100644 --- a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FunctionBitPatternInfo.java +++ b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FunctionBitPatternInfo.java @@ -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. @@ -18,7 +18,7 @@ package ghidra.bitpatterns.info; import java.math.BigInteger; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.program.model.address.Address; import ghidra.program.model.address.AddressSetView; diff --git a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/InstructionSequence.java b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/InstructionSequence.java index 7fe800d5c1..f1bc1f85c2 100644 --- a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/InstructionSequence.java +++ b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/InstructionSequence.java @@ -17,7 +17,7 @@ package ghidra.bitpatterns.info; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.util.xml.XmlUtilities; diff --git a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/AbstractByteViewerPlugin.java b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/AbstractByteViewerPlugin.java index 6e70731620..687b671511 100644 --- a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/AbstractByteViewerPlugin.java +++ b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/AbstractByteViewerPlugin.java @@ -17,7 +17,7 @@ package ghidra.app.plugin.core.byteviewer; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.app.events.AbstractLocationPluginEvent; import ghidra.app.events.AbstractSelectionPluginEvent; diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilePlugin.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilePlugin.java index ad27c3ae85..a97ddb8dd1 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilePlugin.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilePlugin.java @@ -17,7 +17,7 @@ package ghidra.app.plugin.core.decompile; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.app.CorePluginPackage; import ghidra.app.decompiler.*; diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/app/util/opinion/ApkLoader.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/app/util/opinion/ApkLoader.java index 12ac29216c..d4b03d1c5b 100644 --- a/Ghidra/Features/FileFormats/src/main/java/ghidra/app/util/opinion/ApkLoader.java +++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/app/util/opinion/ApkLoader.java @@ -18,8 +18,8 @@ package ghidra.app.util.opinion; import java.io.IOException; import java.util.*; -import org.jdom.*; -import org.jdom.input.SAXBuilder; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; import ghidra.app.util.bin.BinaryReader; import ghidra.app.util.bin.ByteProvider; diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/crypto/CryptoKeyFactory.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/crypto/CryptoKeyFactory.java index c02351f56e..6fe111d232 100644 --- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/crypto/CryptoKeyFactory.java +++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/crypto/CryptoKeyFactory.java @@ -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. @@ -18,9 +18,9 @@ package ghidra.file.crypto; import java.io.*; import java.util.*; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.input.SAXBuilder; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.input.SAXBuilder; import generic.jar.ResourceFile; import ghidra.framework.Application; diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/eclipse/AndroidProjectCreator.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/eclipse/AndroidProjectCreator.java index 6469e1b0d5..19249412a9 100644 --- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/eclipse/AndroidProjectCreator.java +++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/eclipse/AndroidProjectCreator.java @@ -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. @@ -18,7 +18,7 @@ package ghidra.file.eclipse; import java.io.*; import java.util.List; -import org.jdom.*; +import org.jdom2.*; import generic.jar.ResourceFile; import ghidra.app.util.bin.ByteProvider; diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/prelink/MachoPrelinkFileSystem.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/prelink/MachoPrelinkFileSystem.java index 04ab3ff9d9..6c5728c5d7 100644 --- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/prelink/MachoPrelinkFileSystem.java +++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/prelink/MachoPrelinkFileSystem.java @@ -20,7 +20,7 @@ import java.io.InputStream; import java.util.*; import org.apache.commons.collections4.BidiMap; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import ghidra.app.util.MemoryBlockUtils; import ghidra.app.util.bin.*; diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/FunctionGraphPlugin.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/FunctionGraphPlugin.java index 5e99e91c69..6cb20d3354 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/FunctionGraphPlugin.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/FunctionGraphPlugin.java @@ -19,7 +19,7 @@ import java.util.*; import javax.swing.Icon; -import org.jdom.Element; +import org.jdom2.Element; import docking.ComponentProvider; import docking.DockingWindowManager; diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/IndependentColorProvider.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/IndependentColorProvider.java index e882425750..f345a8427b 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/IndependentColorProvider.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/IndependentColorProvider.java @@ -19,7 +19,7 @@ import java.awt.Color; import java.awt.Component; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import docking.ComponentPlaceholder; import docking.DockingWindowManager; diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/SetFormatDialogComponentProvider.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/SetFormatDialogComponentProvider.java index 6a2a49690d..0a318b715a 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/SetFormatDialogComponentProvider.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/SetFormatDialogComponentProvider.java @@ -22,7 +22,7 @@ import java.util.List; import javax.swing.JComponent; import javax.swing.JPanel; -import org.jdom.Element; +import org.jdom2.Element; import docking.*; import docking.action.*; diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/FGComponent.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/FGComponent.java index 8d7bd3963f..24059f5208 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/FGComponent.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/FGComponent.java @@ -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. @@ -19,7 +19,7 @@ import java.awt.*; import java.util.*; import java.util.Map.Entry; -import org.jdom.Element; +import org.jdom2.Element; import edu.uci.ics.jung.algorithms.layout.Layout; import edu.uci.ics.jung.visualization.RenderContext; diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/FunctionGraph.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/FunctionGraph.java index bfb708657f..0e247160de 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/FunctionGraph.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/FunctionGraph.java @@ -18,7 +18,7 @@ package ghidra.app.plugin.core.functiongraph.graph; import java.awt.Point; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import edu.uci.ics.jung.graph.Graph; import ghidra.app.plugin.core.functiongraph.graph.layout.FGLayout; diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/AddressInfo.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/AddressInfo.java index 4286b154f0..c48079ebe3 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/AddressInfo.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/AddressInfo.java @@ -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. @@ -17,7 +17,7 @@ package ghidra.app.plugin.core.functiongraph.graph.vertex; import ghidra.program.model.address.AddressSetView; -import org.jdom.Element; +import org.jdom2.Element; public class AddressInfo { diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupHistoryInfo.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupHistoryInfo.java index f504af52ad..ef891f6a66 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupHistoryInfo.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupHistoryInfo.java @@ -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. @@ -18,7 +18,7 @@ package ghidra.app.plugin.core.functiongraph.graph.vertex; import java.awt.geom.Point2D; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import edu.uci.ics.jung.algorithms.layout.Layout; import edu.uci.ics.jung.graph.Graph; diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupVertexSerializer.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupVertexSerializer.java index 395eb71f93..808f8d7c62 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupVertexSerializer.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupVertexSerializer.java @@ -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. @@ -18,7 +18,7 @@ package ghidra.app.plugin.core.functiongraph.graph.vertex; import java.awt.geom.Point2D; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import edu.uci.ics.jung.graph.Graph; import ghidra.app.plugin.core.functiongraph.graph.FGEdge; diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupedVertexInfo.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupedVertexInfo.java index 92dd9fd31f..10815f6011 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupedVertexInfo.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/GroupedVertexInfo.java @@ -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. @@ -19,7 +19,7 @@ import java.awt.Color; import java.awt.geom.Point2D; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.app.plugin.core.functiongraph.graph.FGEdge; import ghidra.app.plugin.core.functiongraph.graph.FunctionGraph; diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/PointInfo.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/PointInfo.java index 76510ccc70..0b543a22cd 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/PointInfo.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/PointInfo.java @@ -1,13 +1,12 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * 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. @@ -18,7 +17,7 @@ package ghidra.app.plugin.core.functiongraph.graph.vertex; import java.awt.geom.Point2D; -import org.jdom.Element; +import org.jdom2.Element; class PointInfo { diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/VertexInfo.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/VertexInfo.java index ad6f552e8d..8d0e40daa9 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/VertexInfo.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/graph/vertex/VertexInfo.java @@ -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. @@ -18,7 +18,7 @@ package ghidra.app.plugin.core.functiongraph.graph.vertex; import java.awt.geom.Point2D; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import edu.uci.ics.jung.algorithms.layout.Layout; import edu.uci.ics.jung.graph.Graph; diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/FunctionGraphVertexAttributes.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/FunctionGraphVertexAttributes.java index a0edcbbc9e..67668dfcbd 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/FunctionGraphVertexAttributes.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/FunctionGraphVertexAttributes.java @@ -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,7 +20,7 @@ import java.awt.Point; import java.util.*; import java.util.Map.Entry; -import org.jdom.Element; +import org.jdom2.Element; import edu.uci.ics.jung.graph.Graph; import ghidra.app.plugin.core.colorizer.ColorizingService; diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/LazyGraphGroupSaveableXML.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/LazyGraphGroupSaveableXML.java index c0a8837d0b..a3598a2aa1 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/LazyGraphGroupSaveableXML.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/LazyGraphGroupSaveableXML.java @@ -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. @@ -19,9 +19,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Collection; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.output.XMLOutputter; import edu.uci.ics.jung.graph.Graph; import ghidra.app.plugin.core.functiongraph.graph.FunctionGraph; @@ -57,7 +57,7 @@ public class LazyGraphGroupSaveableXML extends LazySaveableXML { Element groupVertexElement = GroupVertexSerializer.getXMLForGroupedVertices(functionGraph); Document document = new Document(groupVertexElement); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - XMLOutputter xmlOutputter = new GenericXMLOutputter(); + XMLOutputter xmlOutputter = GenericXMLOutputter.getInstance(); try { xmlOutputter.output(document, outputStream); diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/LazyGraphRegroupSaveableXML.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/LazyGraphRegroupSaveableXML.java index e5cca08727..007fb252b3 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/LazyGraphRegroupSaveableXML.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/LazyGraphRegroupSaveableXML.java @@ -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. @@ -19,9 +19,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Collection; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.output.XMLOutputter; import ghidra.app.plugin.core.functiongraph.graph.FunctionGraph; import ghidra.app.plugin.core.functiongraph.graph.vertex.GroupHistoryInfo; @@ -56,7 +56,7 @@ public class LazyGraphRegroupSaveableXML extends LazySaveableXML { GroupVertexSerializer.getXMLForRegroupableVertices(functionGraph); Document document = new Document(groupVertexElement); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - XMLOutputter xmlOutputter = new GenericXMLOutputter(); + XMLOutputter xmlOutputter = GenericXMLOutputter.getInstance(); try { xmlOutputter.output(document, outputStream); diff --git a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/SaveableXML.java b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/SaveableXML.java index 4c14d8356a..4c8025c23d 100644 --- a/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/SaveableXML.java +++ b/Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/mvc/SaveableXML.java @@ -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. @@ -17,9 +17,9 @@ package ghidra.app.plugin.core.functiongraph.mvc; import java.io.*; -import org.jdom.*; -import org.jdom.input.SAXBuilder; -import org.jdom.output.XMLOutputter; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.XMLOutputter; import ghidra.util.*; import ghidra.util.xml.GenericXMLOutputter; @@ -48,7 +48,7 @@ public class SaveableXML extends PrivateSaveable { Document document = new Document(element); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - XMLOutputter xmlOutputter = new GenericXMLOutputter(); + XMLOutputter xmlOutputter = GenericXMLOutputter.getInstance(); try { xmlOutputter.output(document, outputStream); diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchSetDB.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchSetDB.java index a263a1e049..2cbd3d6236 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchSetDB.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchSetDB.java @@ -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.*; diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchSetTableDBAdapterV0.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchSetTableDBAdapterV0.java index 228c726a76..bfa13c3d37 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchSetTableDBAdapterV0.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/db/VTMatchSetTableDBAdapterV0.java @@ -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); diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/util/VTOptions.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/util/VTOptions.java index f14eb59018..50e30afe03 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/util/VTOptions.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/util/VTOptions.java @@ -15,7 +15,7 @@ */ package ghidra.feature.vt.api.util; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.framework.options.*; diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/plugin/AddressCorrelatorManager.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/plugin/AddressCorrelatorManager.java index dc218ed3f4..cd2aaaf3f1 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/plugin/AddressCorrelatorManager.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/plugin/AddressCorrelatorManager.java @@ -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; diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/plugin/VTSubToolManager.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/plugin/VTSubToolManager.java index 455c020b7f..0bf091d318 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/plugin/VTSubToolManager.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/plugin/VTSubToolManager.java @@ -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(); } diff --git a/Ghidra/Framework/Docking/src/main/java/docking/ComponentNode.java b/Ghidra/Framework/Docking/src/main/java/docking/ComponentNode.java index f555b1ce28..8b747f2391 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/ComponentNode.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/ComponentNode.java @@ -21,7 +21,7 @@ import java.util.*; import javax.swing.*; -import org.jdom.Element; +import org.jdom2.Element; import docking.actions.KeyBindingUtils; import docking.widgets.OptionDialog; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DetachedWindowNode.java b/Ghidra/Framework/Docking/src/main/java/docking/DetachedWindowNode.java index 1a1066427d..a9c120a43a 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/DetachedWindowNode.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/DetachedWindowNode.java @@ -24,7 +24,7 @@ import java.util.Map.Entry; import javax.swing.*; -import org.jdom.Element; +import org.jdom2.Element; import generic.util.WindowUtilities; import ghidra.framework.OperatingSystem; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java b/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java index 47e91bbdd4..163a6b6130 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java @@ -28,7 +28,7 @@ import java.util.function.Supplier; import javax.swing.*; import org.apache.commons.collections4.map.LazyMap; -import org.jdom.Element; +import org.jdom2.Element; import docking.action.*; import docking.action.builder.ActionBuilder; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/Node.java b/Ghidra/Framework/Docking/src/main/java/docking/Node.java index dabcc015df..8170f6f08b 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/Node.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/Node.java @@ -19,7 +19,7 @@ import java.util.List; import javax.swing.JComponent; -import org.jdom.Element; +import org.jdom2.Element; /** * Base class for the various node objects used to build the component hierarchy. diff --git a/Ghidra/Framework/Docking/src/main/java/docking/RootNode.java b/Ghidra/Framework/Docking/src/main/java/docking/RootNode.java index 2ed477d953..5d9dff5b4b 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/RootNode.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/RootNode.java @@ -23,7 +23,7 @@ import java.util.List; import javax.swing.*; -import org.jdom.Element; +import org.jdom2.Element; import generic.util.WindowUtilities; import ghidra.framework.OperatingSystem; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/SplitNode.java b/Ghidra/Framework/Docking/src/main/java/docking/SplitNode.java index 54d3132435..fa856e4a77 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/SplitNode.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/SplitNode.java @@ -21,7 +21,7 @@ import java.util.List; import javax.swing.*; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.util.Msg; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingUtils.java b/Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingUtils.java index a40842c72f..ebc78af2b7 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingUtils.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingUtils.java @@ -30,9 +30,9 @@ import org.apache.commons.collections4.map.LazyMap; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.jdom.*; -import org.jdom.input.SAXBuilder; -import org.jdom.output.XMLOutputter; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.XMLOutputter; import docking.DockingUtils; import docking.Tool; @@ -157,7 +157,7 @@ public class KeyBindingUtils { // create the xml structure, the outputter and then write the data Element rootElement = keyBindingOptions.getXmlRoot(true); Document document = new Document(rootElement); - XMLOutputter xmlOutputter = new GenericXMLOutputter(); + XMLOutputter xmlOutputter = GenericXMLOutputter.getInstance(); try { xmlOutputter.output(document, outputStream); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldLocation.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldLocation.java index 00fd0a1b75..193a2029d9 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldLocation.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldLocation.java @@ -17,7 +17,7 @@ package docking.widgets.fieldpanel.support; import java.math.BigInteger; -import org.jdom.Element; +import org.jdom2.Element; import docking.widgets.fieldpanel.Layout; import docking.widgets.fieldpanel.field.Field; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldRange.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldRange.java index b677dd3dc8..5893ee0bf9 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldRange.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldRange.java @@ -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. @@ -17,7 +17,7 @@ package docking.widgets.fieldpanel.support; import java.math.BigInteger; -import org.jdom.Element; +import org.jdom2.Element; import docking.widgets.fieldpanel.Layout; import ghidra.util.exception.AssertException; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldSelection.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldSelection.java index 1897958e68..c09ada48f9 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldSelection.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldSelection.java @@ -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. @@ -18,7 +18,7 @@ package docking.widgets.fieldpanel.support; import java.math.BigInteger; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import docking.widgets.fieldpanel.Layout; import ghidra.framework.options.SaveState; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filter/FilterOptions.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filter/FilterOptions.java index bd880e3a77..12f82ea3c6 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filter/FilterOptions.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filter/FilterOptions.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; import javax.swing.Icon; -import org.jdom.Element; +import org.jdom2.Element; import generic.theme.GIcon; import resources.MultiIcon; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/ColumnSortState.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/ColumnSortState.java index a4962f49d9..4e2980e82d 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/ColumnSortState.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/ColumnSortState.java @@ -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. @@ -15,7 +15,7 @@ */ package docking.widgets.table; -import org.jdom.Element; +import org.jdom2.Element; /** * Not meant to be created by users. They should instead use the {@link TableSortStateEditor}. diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableColumnModel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableColumnModel.java index ef8f362fc2..7f3755a1c5 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableColumnModel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableColumnModel.java @@ -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. @@ -24,7 +24,7 @@ import javax.swing.ListSelectionModel; import javax.swing.event.*; import javax.swing.table.*; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.docking.settings.Settings; import ghidra.util.datastruct.WeakDataStructureFactory; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableFilterPanel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableFilterPanel.java index 39a01abed4..8c882cf2b3 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableFilterPanel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableFilterPanel.java @@ -25,8 +25,8 @@ import javax.swing.border.BevelBorder; import javax.swing.event.*; import javax.swing.table.TableColumnModel; -import org.jdom.Attribute; -import org.jdom.Element; +import org.jdom2.Attribute; +import org.jdom2.Element; import docking.DockingWindowManager; import docking.widgets.EmptyBorderButton; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableColumnModelState.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableColumnModelState.java index 2edce4c40d..a367cd80e1 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableColumnModelState.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableColumnModelState.java @@ -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. @@ -21,7 +21,7 @@ import java.util.List; import javax.swing.table.TableColumn; import javax.swing.table.TableModel; -import org.jdom.*; +import org.jdom2.*; import docking.DockingWindowManager; import ghidra.docking.settings.Settings; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableSortState.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableSortState.java index 7bb6bf0c07..e3a738c166 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableSortState.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/TableSortState.java @@ -17,7 +17,7 @@ package docking.widgets.table; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import docking.widgets.table.ColumnSortState.SortDirection; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/columnfilter/ColumnBasedTableFilter.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/columnfilter/ColumnBasedTableFilter.java index ed062d4222..32a25f7cea 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/columnfilter/ColumnBasedTableFilter.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/columnfilter/ColumnBasedTableFilter.java @@ -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. @@ -18,7 +18,7 @@ package docking.widgets.table.columnfilter; import java.util.*; import java.util.stream.Collectors; -import org.jdom.Element; +import org.jdom2.Element; import docking.widgets.table.*; import docking.widgets.table.constraint.ColumnConstraint; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/columnfilter/ColumnFilterSaveManager.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/columnfilter/ColumnFilterSaveManager.java index bfa795d0e8..354ad706b6 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/columnfilter/ColumnFilterSaveManager.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/columnfilter/ColumnFilterSaveManager.java @@ -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,7 +20,7 @@ import java.util.List; import javax.swing.JTable; -import org.jdom.Element; +import org.jdom2.Element; import docking.DockingWindowManager; import docking.widgets.table.RowObjectTableModel; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/DefaultGTreeFilterProvider.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/DefaultGTreeFilterProvider.java index 2d42aac0f7..8e8a19d5e6 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/DefaultGTreeFilterProvider.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/DefaultGTreeFilterProvider.java @@ -21,8 +21,8 @@ import javax.accessibility.AccessibleContext; import javax.swing.*; import javax.swing.border.BevelBorder; -import org.jdom.Attribute; -import org.jdom.Element; +import org.jdom2.Attribute; +import org.jdom2.Element; import docking.DockingWindowManager; import docking.widgets.EmptyBorderButton; diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/CheckoutManager.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/CheckoutManager.java index bca80e809b..8062d65f1a 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/CheckoutManager.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/CheckoutManager.java @@ -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. @@ -18,9 +18,9 @@ package ghidra.framework.store.local; import java.io.*; import java.util.*; -import org.jdom.*; -import org.jdom.input.SAXBuilder; -import org.jdom.output.XMLOutputter; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.XMLOutputter; import ghidra.framework.store.*; import ghidra.util.xml.GenericXMLOutputter; @@ -265,7 +265,7 @@ class CheckoutManager { checkouts.put(coStatus.getCheckoutId(), coStatus); } } - catch (org.jdom.JDOMException je) { + catch (org.jdom2.JDOMException je) { throw new InvalidObjectException("Invalid checkouts file: " + checkoutsFile); } finally { @@ -328,7 +328,7 @@ class CheckoutManager { try { Document doc = new Document(root); - XMLOutputter xmlout = new GenericXMLOutputter(); + XMLOutputter xmlout = GenericXMLOutputter.getInstance(); xmlout.output(doc, bos); } finally { diff --git a/Ghidra/Framework/Generic/Module.manifest b/Ghidra/Framework/Generic/Module.manifest index 59cfaa5423..d164fbec36 100644 --- a/Ghidra/Framework/Generic/Module.manifest +++ b/Ghidra/Framework/Generic/Module.manifest @@ -2,7 +2,7 @@ MODULE FILE LICENSE: lib/commons-compress-1.27.1.jar Apache License 2.0 MODULE FILE LICENSE: lib/commons-codec-1.18.0.jar Apache License 2.0 MODULE FILE LICENSE: lib/guava-32.1.3-jre.jar Apache License 2.0 MODULE FILE LICENSE: lib/failureaccess-1.0.1.jar Apache License 2.0 -MODULE FILE LICENSE: lib/jdom-legacy-1.1.3.jar JDOM License +MODULE FILE LICENSE: lib/jdom2-2.0.6.1.jar JDOM License MODULE FILE LICENSE: lib/log4j-api-2.25.3.jar Apache License 2.0 MODULE FILE LICENSE: lib/log4j-core-2.25.3.jar Apache License 2.0 MODULE FILE LICENSE: lib/commons-collections4-4.1.jar Apache License 2.0 diff --git a/Ghidra/Framework/Generic/build.gradle b/Ghidra/Framework/Generic/build.gradle index 01211c5626..93c0cb8768 100644 --- a/Ghidra/Framework/Generic/build.gradle +++ b/Ghidra/Framework/Generic/build.gradle @@ -33,7 +33,7 @@ dependencies { exclude group: 'org.checkerframework', module: 'checker-qual' } api "com.google.guava:failureaccess:1.0.1" - api "org.jdom:jdom-legacy:1.1.3" + api "org.jdom:jdom2:2.0.6.1" api "org.apache.logging.log4j:log4j-api:2.25.3" api "org.apache.logging.log4j:log4j-core:2.25.3" api "org.apache.commons:commons-collections4:4.1" diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/AttributedSaveState.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/AttributedSaveState.java index d4f4630d2f..5fcbe6c057 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/AttributedSaveState.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/AttributedSaveState.java @@ -18,8 +18,8 @@ package ghidra.framework.options; import java.util.*; import java.util.Map.Entry; -import org.jdom.Attribute; -import org.jdom.Element; +import org.jdom2.Attribute; +import org.jdom2.Element; /** * A version of {@link SaveState} that allows clients to add attributes to properties in this save diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/GProperties.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/GProperties.java index f86ca730f6..0b2acfc995 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/GProperties.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/GProperties.java @@ -25,9 +25,9 @@ import java.util.*; import javax.swing.KeyStroke; -import org.jdom.Element; -import org.jdom.JDOMException; -import org.jdom.output.XMLOutputter; +import org.jdom2.Element; +import org.jdom2.JDOMException; +import org.jdom2.output.XMLOutputter; import com.google.gson.*; diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/SaveState.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/SaveState.java index 4393b47925..ab9a722790 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/SaveState.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/SaveState.java @@ -19,7 +19,7 @@ import java.io.File; import java.io.IOException; import java.util.List; -import org.jdom.Element; +import org.jdom2.Element; /** * Class for saving name/value pairs as XML or Json. Classes that want to be diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/XmlProperties.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/XmlProperties.java index ab0c89417e..79c8bc091f 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/XmlProperties.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/XmlProperties.java @@ -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. @@ -18,7 +18,7 @@ package ghidra.framework.options; import java.io.File; import java.io.IOException; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.util.xml.XmlUtilities; import utilities.util.FileUtilities; diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/GenericXMLOutputter.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/GenericXMLOutputter.java index ec5c7cf066..6f2caf5071 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/GenericXMLOutputter.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/GenericXMLOutputter.java @@ -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. @@ -15,34 +15,35 @@ */ package ghidra.util.xml; -import org.jdom.output.Format; -import org.jdom.output.XMLOutputter; -import org.jdom.output.Format.TextMode; +import org.jdom2.output.Format; +import org.jdom2.output.XMLOutputter; +import org.jdom2.output.Format.TextMode; /** - * A simple extension of XMLOutputter that sets default settings to fix common bugs. + * Gets a {@link XMLOutputter} that sets default settings to fix common bugs */ -public class GenericXMLOutputter extends XMLOutputter { +public class GenericXMLOutputter { public static final String DEFAULT_INDENT = " "; - /** - * This constructor performs basic setup that can be changed later by the user. For example, - * 
-     *      setTextNormalize( true );
-     *      setIndent( DEFAULT_INDENT );
-     *      setNewlines( true );
-     *
- */ - public GenericXMLOutputter() { - init(); + private GenericXMLOutputter() { + // prevent instantiation } - private void init() { - // this prevents an excess build up of whitespace - Format compactFormat = Format.getCompactFormat(); - compactFormat.setIndent( DEFAULT_INDENT ); - compactFormat.setTextMode( TextMode.NORMALIZE ); - setFormat( compactFormat ); - } + /** + * This factory method performs basic setup that can be changed later by the user. For example, + * 
+     *      setTextNormalize(true);
+     *      setIndent(DEFAULT_INDENT);
+     *      setNewlines(true);
+     *
+ */ + public static XMLOutputter getInstance() { + // this prevents an excess build up of whitespace + Format compactFormat = Format.getCompactFormat(); + compactFormat.setIndent(DEFAULT_INDENT); + compactFormat.setTextMode(TextMode.NORMALIZE); + + return new XMLOutputter(compactFormat); + } } diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlUtilities.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlUtilities.java index 685f932208..861f1a3c14 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlUtilities.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlUtilities.java @@ -25,10 +25,10 @@ import javax.xml.XMLConstants; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; -import org.jdom.*; -import org.jdom.input.SAXBuilder; -import org.jdom.output.Format; -import org.jdom.output.XMLOutputter; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.Format; +import org.jdom2.output.XMLOutputter; import org.xml.sax.*; import generic.jar.ResourceFile; @@ -163,7 +163,7 @@ public class XmlUtilities { public static byte[] xmlToByteArray(Element root) { ByteArrayOutputStream os = new ByteArrayOutputStream(); Document doc = new Document(root); - XMLOutputter xmlOut = new GenericXMLOutputter(); + XMLOutputter xmlOut = GenericXMLOutputter.getInstance(); try { xmlOut.output(doc, os); os.close(); @@ -182,7 +182,7 @@ public class XmlUtilities { * @return String translation of the given element */ public static String toString(Element root) { - XMLOutputter outputter = new GenericXMLOutputter(); + XMLOutputter outputter = GenericXMLOutputter.getInstance(); return outputter.outputString(root); } diff --git a/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/OptionType.java b/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/OptionType.java index 6c7c79b24d..e358029ee4 100644 --- a/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/OptionType.java +++ b/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/OptionType.java @@ -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. @@ -22,9 +22,9 @@ import java.util.Date; import javax.swing.KeyStroke; -import org.jdom.*; -import org.jdom.input.SAXBuilder; -import org.jdom.output.XMLOutputter; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.XMLOutputter; import ghidra.util.Msg; import ghidra.util.xml.GenericXMLOutputter; @@ -194,7 +194,7 @@ public enum OptionType { private static String saveToXmlString(SaveState saveState) { Element element = saveState.saveToXml(); StringWriter stringWriter = new StringWriter(); - XMLOutputter xmlout = new GenericXMLOutputter(); + XMLOutputter xmlout = GenericXMLOutputter.getInstance(); try { xmlout.output(element, stringWriter); } diff --git a/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/PreferenceState.java b/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/PreferenceState.java index 0b20b6525f..3ce35919ac 100644 --- a/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/PreferenceState.java +++ b/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/PreferenceState.java @@ -1,13 +1,12 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * 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. @@ -16,7 +15,7 @@ */ package ghidra.framework.options; -import org.jdom.Element; +import org.jdom2.Element; /** * An implementation of SaveState that exists primarily to signal its intended usage. The diff --git a/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/ToolOptions.java b/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/ToolOptions.java index b4714e90d0..c08fb8c46f 100644 --- a/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/ToolOptions.java +++ b/Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/ToolOptions.java @@ -26,7 +26,7 @@ import java.util.*; import javax.swing.KeyStroke; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.util.*; import ghidra.util.bean.opteditor.OptionsVetoException; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/ToolUtils.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/ToolUtils.java index 4af1dfcf08..cad16dcc4b 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/ToolUtils.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/ToolUtils.java @@ -21,9 +21,9 @@ import java.util.*; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.jdom.*; -import org.jdom.input.SAXBuilder; -import org.jdom.output.XMLOutputter; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.XMLOutputter; import ghidra.framework.model.ProjectManager; import ghidra.framework.model.ToolTemplate; @@ -218,7 +218,7 @@ public class ToolUtils { Element element = template.saveToXml(); Document doc = new Document(element); - XMLOutputter xmlout = new GenericXMLOutputter(); + XMLOutputter xmlout = GenericXMLOutputter.getInstance(); xmlout.output(doc, os); os.close(); diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndTool.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndTool.java index c6ac4950a4..71a2ee92f6 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndTool.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndTool.java @@ -28,10 +28,10 @@ import javax.swing.JFrame; import javax.swing.JPanel; import org.apache.commons.lang3.StringUtils; -import org.jdom.Element; -import org.jdom.JDOMException; -import org.jdom.input.SAXBuilder; -import org.jdom.output.XMLOutputter; +import org.jdom2.Element; +import org.jdom2.JDOMException; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.XMLOutputter; import db.buffers.DataBuffer; import docking.*; @@ -255,8 +255,8 @@ public class FrontEndTool extends PluginTool implements OptionsChangeListener { root.setAttribute(VERSION_ATTRIBUTE_NAME, version); root.addContent(template.saveToXml()); try (OutputStream os = new FileOutputStream(TOOL_FILE)) { - org.jdom.Document doc = new org.jdom.Document(root); - XMLOutputter xmlOut = new GenericXMLOutputter(); + org.jdom2.Document doc = new org.jdom2.Document(root); + XMLOutputter xmlOut = GenericXMLOutputter.getInstance(); xmlOut.output(doc, os); } catch (IOException e) { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ToolActionManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ToolActionManager.java index 6f1a68dc81..f08b7afa03 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ToolActionManager.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ToolActionManager.java @@ -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 java.awt.event.KeyEvent; import java.io.*; import java.util.*; -import org.jdom.Element; -import org.jdom.input.SAXBuilder; +import org.jdom2.Element; +import org.jdom2.input.SAXBuilder; import docking.ActionContext; import docking.action.*; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ToolTemplate.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ToolTemplate.java index 2f204427b0..6c3f36573a 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ToolTemplate.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ToolTemplate.java @@ -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. @@ -17,7 +17,7 @@ package ghidra.framework.model; import javax.swing.ImageIcon; -import org.jdom.Element; +import org.jdom2.Element; import docking.util.image.ToolIconURL; import ghidra.framework.plugintool.PluginTool; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginManager.java index de35486898..6839fa7361 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginManager.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginManager.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.framework.main.UtilityPluginPackage; import ghidra.framework.model.DomainFile; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginTool.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginTool.java index 7823c908e0..178c825bb0 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginTool.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginTool.java @@ -29,7 +29,7 @@ import java.util.function.Function; import javax.swing.*; -import org.jdom.Element; +import org.jdom2.Element; import docking.*; import docking.action.*; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginsConfiguration.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginsConfiguration.java index 2ffb66fab3..c68189ebb2 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginsConfiguration.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginsConfiguration.java @@ -20,7 +20,7 @@ import static java.util.function.Predicate.*; import java.util.*; import java.util.function.Predicate; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.framework.main.ProgramaticUseOnly; import ghidra.framework.plugintool.util.*; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/StandAloneApplication.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/StandAloneApplication.java index 4e8471d484..ae1385513a 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/StandAloneApplication.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/StandAloneApplication.java @@ -22,10 +22,10 @@ import java.util.List; import javax.swing.ImageIcon; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.input.SAXBuilder; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.XMLOutputter; import docking.framework.ApplicationInformationDisplayFactory; import docking.framework.DockingApplicationConfiguration; @@ -300,7 +300,7 @@ public abstract class StandAloneApplication implements GenericStandAloneApplicat try { os = new FileOutputStream(savedToolFile); Document doc = new Document(rootElement); - XMLOutputter xmlout = new GenericXMLOutputter(); + XMLOutputter xmlout = GenericXMLOutputter.getInstance(); xmlout.output(doc, os); os.close(); } diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/OptionsManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/OptionsManager.java index b9e5785782..7e47310f0d 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/OptionsManager.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/OptionsManager.java @@ -21,7 +21,7 @@ import java.util.*; import javax.swing.JComponent; import javax.swing.tree.TreePath; -import org.jdom.Element; +import org.jdom2.Element; import docking.options.OptionsService; import docking.options.editor.OptionsDialog; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProject.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProject.java index 7c3b2e36bb..391e981780 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProject.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProject.java @@ -20,9 +20,9 @@ import java.net.URL; import java.util.*; import java.util.Map.Entry; -import org.jdom.*; -import org.jdom.input.SAXBuilder; -import org.jdom.output.XMLOutputter; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.XMLOutputter; import ghidra.framework.client.RepositoryAdapter; import ghidra.framework.data.DefaultProjectData; @@ -578,7 +578,7 @@ public class DefaultProject implements Project { File saveFile = new File(projectData.getProjectDir(), PROJECT_STATE); OutputStream os = new FileOutputStream(saveFile); Document doc = new Document(root); - XMLOutputter xmlOut = new GenericXMLOutputter(); + XMLOutputter xmlOut = GenericXMLOutputter.getInstance(); xmlOut.output(doc, os); os.close(); diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ExtensionManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ExtensionManager.java index 9af5810262..9824bf9c02 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ExtensionManager.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ExtensionManager.java @@ -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. @@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets; import java.util.*; import java.util.stream.Collectors; -import org.jdom.Element; +import org.jdom2.Element; import docking.widgets.OptionDialog; import generic.json.Json; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/GhidraTool.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/GhidraTool.java index 71956397e7..10d2e2110e 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/GhidraTool.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/GhidraTool.java @@ -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. @@ -15,7 +15,7 @@ */ package ghidra.framework.project.tool; -import org.jdom.Element; +import org.jdom2.Element; import docking.ActionContext; import docking.DockingWindowManager; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/GhidraToolTemplate.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/GhidraToolTemplate.java index 58739d858a..8c1b6395c6 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/GhidraToolTemplate.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/GhidraToolTemplate.java @@ -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. @@ -19,7 +19,7 @@ import java.util.ArrayList; import javax.swing.ImageIcon; -import org.jdom.Element; +import org.jdom2.Element; import docking.util.image.ToolIconURL; import ghidra.framework.model.Project; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolConnectionImpl.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolConnectionImpl.java index 3107e22d58..f9b34ae1c6 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolConnectionImpl.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolConnectionImpl.java @@ -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. @@ -17,7 +17,7 @@ package ghidra.framework.project.tool; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.framework.model.ToolConnection; import ghidra.framework.model.ToolListener; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolManagerImpl.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolManagerImpl.java index cebca6420a..f9e307a9ce 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolManagerImpl.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolManagerImpl.java @@ -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. @@ -19,7 +19,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.*; -import org.jdom.Element; +import org.jdom2.Element; import docking.ComponentProvider; import ghidra.framework.main.AppInfo; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolServicesImpl.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolServicesImpl.java index 01e757d58c..8826790811 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolServicesImpl.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolServicesImpl.java @@ -20,8 +20,8 @@ import java.net.URL; import java.util.*; import java.util.function.Function; -import org.jdom.Document; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.output.XMLOutputter; import docking.widgets.OptionDialog; import docking.widgets.filechooser.GhidraFileChooser; @@ -84,7 +84,7 @@ class ToolServicesImpl implements ToolServices { new FileOutputStream(location.getParent() + File.separator + filename)) { BufferedOutputStream bf = new BufferedOutputStream(f); Document doc = new Document(tool.saveToXml()); - XMLOutputter xmlout = new GenericXMLOutputter(); + XMLOutputter xmlout = GenericXMLOutputter.getInstance(); xmlout.output(doc, bf); } diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/WorkspaceImpl.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/WorkspaceImpl.java index 5f4f5c59c7..913719202e 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/WorkspaceImpl.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/WorkspaceImpl.java @@ -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. @@ -21,7 +21,7 @@ import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; -import org.jdom.Element; +import org.jdom2.Element; import ghidra.framework.model.ToolTemplate; import ghidra.framework.model.Workspace; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompileLauncher.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompileLauncher.java index be52d69c53..14223ccc3d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompileLauncher.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/SleighCompileLauncher.java @@ -19,7 +19,7 @@ import java.io.*; import java.util.*; import org.antlr.runtime.RecognitionException; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import generic.jar.ResourceFile; import ghidra.GhidraApplicationLayout; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguage.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguage.java index 21b55e2ab0..3de115c640 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguage.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguage.java @@ -18,8 +18,8 @@ package ghidra.program.util; import java.io.*; import java.util.*; -import org.jdom.*; -import org.jdom.input.SAXBuilder; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; import org.xml.sax.SAXException; import org.xml.sax.SAXNotRecognizedException; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java index c7f9112395..c366d4c526 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java @@ -20,9 +20,9 @@ import java.util.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.output.XMLOutputter; import generic.jar.ResourceFile; import ghidra.framework.Application; @@ -235,7 +235,7 @@ public class OldLanguageFactory { Document doc = new Document(root); FileOutputStream out = new FileOutputStream(file); - XMLOutputter xml = new GenericXMLOutputter(); + XMLOutputter xml = GenericXMLOutputter.getInstance(); xml.output(doc, out); out.close(); } diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SimpleLanguageTranslator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SimpleLanguageTranslator.java index e7d462b263..3eb1f52598 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SimpleLanguageTranslator.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SimpleLanguageTranslator.java @@ -22,8 +22,8 @@ import java.util.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.jdom.*; -import org.jdom.input.SAXBuilder; +import org.jdom2.*; +import org.jdom2.input.SAXBuilder; import org.xml.sax.SAXException; import org.xml.sax.SAXNotRecognizedException; diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/test/DummyTool.java b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/test/DummyTool.java index b7fd8f2c8f..6d6194380c 100644 --- a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/test/DummyTool.java +++ b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/test/DummyTool.java @@ -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. @@ -22,7 +22,7 @@ import java.util.*; import javax.swing.*; import javax.swing.event.ChangeListener; -import org.jdom.Element; +import org.jdom2.Element; import docking.*; import docking.action.DockingActionIf; diff --git a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/test/DummyToolTemplate.java b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/test/DummyToolTemplate.java index bc285175b4..4a303e67a4 100644 --- a/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/test/DummyToolTemplate.java +++ b/Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/test/DummyToolTemplate.java @@ -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. @@ -17,7 +17,7 @@ package ghidra.test; import javax.swing.ImageIcon; -import org.jdom.Element; +import org.jdom2.Element; import docking.util.image.ToolIconURL; import ghidra.framework.model.Project; diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/util/bin/format/dwarf4/next/DWARFRegisterMappingsTest.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/util/bin/format/dwarf4/next/DWARFRegisterMappingsTest.java index e30cafb70a..cac1379dc2 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/util/bin/format/dwarf4/next/DWARFRegisterMappingsTest.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/util/bin/format/dwarf4/next/DWARFRegisterMappingsTest.java @@ -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. @@ -22,7 +22,7 @@ import java.io.IOException; import java.util.HashSet; import java.util.Set; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/pcodeCPort/slgh_compile/regression/SleighCompileRegressionTest.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/pcodeCPort/slgh_compile/regression/SleighCompileRegressionTest.java index ede28167bd..80ef505aaf 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/pcodeCPort/slgh_compile/regression/SleighCompileRegressionTest.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/pcodeCPort/slgh_compile/regression/SleighCompileRegressionTest.java @@ -26,7 +26,7 @@ import java.util.regex.Pattern; import org.antlr.runtime.RecognitionException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import org.junit.*; import org.junit.experimental.categories.Category;