Ghidra is a software reverse engineering (SRE) framework
GP-0: Fixing unused import warnings
Ryan Kurtzd3131e319a9c
diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/client/tracermi/MemoryMapper.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/client/tracermi/MemoryMapper.javaindex 0f344c7661..500da0f4fb 100644--- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/client/tracermi/MemoryMapper.java+++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/client/tracermi/MemoryMapper.java@@ -15,8 +15,6 @@*/package ghidra.app.plugin.core.debug.client.tracermi;-import com.sun.jdi.VirtualMachine;-import ghidra.program.model.address.Address;public interface MemoryMapper {diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/UnixShellScriptTraceRmiLaunchOffer.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/UnixShellScriptTraceRmiLaunchOffer.javaindex e6175c2f3b..59441fe87f 100644--- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/UnixShellScriptTraceRmiLaunchOffer.java+++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/UnixShellScriptTraceRmiLaunchOffer.java@@ -17,12 +17,8 @@ package ghidra.app.plugin.core.debug.gui.tracermi.launcher;import java.io.File;import java.io.FileNotFoundException;-import java.net.SocketAddress;-import java.util.List;-import java.util.Map;import ghidra.app.plugin.core.debug.gui.tracermi.launcher.ScriptAttributesParser.ScriptAttributes;-import ghidra.debug.api.ValStr;import ghidra.program.model.listing.Program;/**diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstructionsView.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstructionsView.javaindex 92fa4329ad..28f14759b8 100644--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstructionsView.java+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstructionsView.java@@ -16,7 +16,6 @@package ghidra.trace.database.listing;import java.util.*;-import java.util.Map.Entry;import org.apache.commons.lang3.tuple.Pair;diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DirectedIterator.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DirectedIterator.javaindex ea954f8878..249b4239f2 100644--- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DirectedIterator.java+++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DirectedIterator.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,6 @@ package ghidra.util.database;import java.io.IOException;import db.Table;-import generic.End.Point;/*** An iterator over some component of a {@link Table}diff --git a/Ghidra/Debug/TaintAnalysis/src/main/java/ghidra/pcode/emu/taint/full/TaintDebuggerPcodeEmulator.java b/Ghidra/Debug/TaintAnalysis/src/main/java/ghidra/pcode/emu/taint/full/TaintDebuggerPcodeEmulator.javaindex 5a02ea8db5..cabcae8999 100644--- a/Ghidra/Debug/TaintAnalysis/src/main/java/ghidra/pcode/emu/taint/full/TaintDebuggerPcodeEmulator.java+++ b/Ghidra/Debug/TaintAnalysis/src/main/java/ghidra/pcode/emu/taint/full/TaintDebuggerPcodeEmulator.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,6 @@*/package ghidra.pcode.emu.taint.full;-import ghidra.app.plugin.core.debug.service.emulation.data.*;import ghidra.debug.api.emulation.PcodeDebuggerAccess;import ghidra.pcode.emu.taint.TaintPartsFactory;import ghidra.pcode.emu.taint.plain.TaintPcodeEmulator;diff --git a/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples2/SampleSearchTablePlugin.java b/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples2/SampleSearchTablePlugin.javaindex 5ddc7cadfd..5443c253b9 100644--- a/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples2/SampleSearchTablePlugin.java+++ b/Ghidra/Extensions/SampleTablePlugin/src/main/java/ghidra/examples2/SampleSearchTablePlugin.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.@@ -16,7 +16,6 @@package ghidra.examples2;import docking.ActionContext;-import docking.ComponentProvider;import docking.action.DockingAction;import docking.action.MenuData;import ghidra.app.ExamplesPluginPackage;diff --git a/Ghidra/Features/BSim/ghidra_scripts/CreateH2BSimDatabaseScript.java b/Ghidra/Features/BSim/ghidra_scripts/CreateH2BSimDatabaseScript.javaindex 1d8763bd5d..ac59924ef6 100644--- a/Ghidra/Features/BSim/ghidra_scripts/CreateH2BSimDatabaseScript.java+++ b/Ghidra/Features/BSim/ghidra_scripts/CreateH2BSimDatabaseScript.java@@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils;import ghidra.app.script.GhidraScript;import ghidra.features.base.values.GhidraValuesMap;import ghidra.features.bsim.query.*;-import ghidra.features.bsim.query.BSimServerInfo.DBType;import ghidra.features.bsim.query.FunctionDatabase.BSimError;import ghidra.features.bsim.query.description.DatabaseInformation;import ghidra.features.bsim.query.file.BSimH2FileDBConnectionManager;diff --git a/Ghidra/Features/BSim/ghidra_scripts/LocalBSimQueryScript.java b/Ghidra/Features/BSim/ghidra_scripts/LocalBSimQueryScript.javaindex 7b0e9d60bf..616eaeef7f 100644--- a/Ghidra/Features/BSim/ghidra_scripts/LocalBSimQueryScript.java+++ b/Ghidra/Features/BSim/ghidra_scripts/LocalBSimQueryScript.java@@ -26,7 +26,6 @@ import ghidra.app.decompiler.DecompileException;import ghidra.app.script.GhidraScript;import ghidra.app.services.FunctionComparisonService;import ghidra.app.tablechooser.*;-import ghidra.features.base.codecompare.model.MatchedFunctionComparisonModel;import ghidra.features.bsim.query.*;import ghidra.features.bsim.query.client.Configuration;import ghidra.features.bsim.query.description.FunctionDescription;diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/BSimServerTableModel.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/BSimServerTableModel.javaindex d5bace2917..8961f79604 100644--- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/BSimServerTableModel.java+++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/BSimServerTableModel.java@@ -21,15 +21,13 @@ import java.util.*;import javax.swing.Icon;import javax.swing.JLabel;-import org.apache.commons.lang3.StringUtils;-import docking.widgets.table.*;import ghidra.docking.settings.Settings;import ghidra.features.bsim.gui.BSimServerManager;-import ghidra.features.bsim.query.*;+import ghidra.features.bsim.query.BSimPostgresDBConnectionManager;import ghidra.features.bsim.query.BSimPostgresDBConnectionManager.BSimPostgresDataSource;+import ghidra.features.bsim.query.BSimServerInfo;import ghidra.features.bsim.query.BSimServerInfo.DBType;-import ghidra.framework.client.ClientUtil;import ghidra.framework.plugintool.ServiceProvider;import ghidra.framework.plugintool.ServiceProviderStub;import ghidra.util.table.column.AbstractGColumnRenderer;diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/CreateBsimServerInfoDialog.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/CreateBsimServerInfoDialog.javaindex e23fd63bf8..2228db9be0 100644--- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/CreateBsimServerInfoDialog.java+++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/CreateBsimServerInfoDialog.java@@ -38,7 +38,6 @@ import docking.widgets.textfield.GFormattedTextField;import docking.widgets.textfield.GFormattedTextField.Status;import ghidra.features.bsim.query.*;import ghidra.features.bsim.query.BSimServerInfo.DBType;-import ghidra.framework.client.ClientUtil;import ghidra.util.HelpLocation;import ghidra.util.filechooser.GhidraFileChooserModel;import ghidra.util.filechooser.GhidraFileFilter;diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/ParallelDecompileTask.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/ParallelDecompileTask.javaindex 93455422a1..d4082cd3ff 100755--- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/ParallelDecompileTask.java+++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/ParallelDecompileTask.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.@@ -26,7 +26,6 @@ import ghidra.program.model.listing.Function;import ghidra.program.model.listing.Program;import ghidra.util.Msg;import ghidra.util.task.TaskMonitor;-import ghidra.util.task.TaskMonitorAdapter;/*** Run decompilation across multiple functions in a single program, distributing the task acrossdiff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/file/H2FileFunctionDatabase.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/file/H2FileFunctionDatabase.javaindex e44de67abb..4822068a27 100644--- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/file/H2FileFunctionDatabase.java+++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/file/H2FileFunctionDatabase.java@@ -22,10 +22,8 @@ import java.util.*;import generic.concurrent.*;import generic.lsh.vector.LSHVector;import generic.lsh.vector.VectorCompare;-import ghidra.features.bsim.query.*;-import ghidra.features.bsim.query.BSimPostgresDBConnectionManager.BSimPostgresDataSource;-import ghidra.features.bsim.query.BSimServerInfo.DBType;-import ghidra.features.bsim.query.FunctionDatabase.Status;+import ghidra.features.bsim.query.BSimServerInfo;+import ghidra.features.bsim.query.LSHException;import ghidra.features.bsim.query.client.*;import ghidra.features.bsim.query.description.*;import ghidra.features.bsim.query.elastic.Base64VectorFactory;diff --git a/Ghidra/Features/Base/ghidra_scripts/CreateUEFIGDTArchivesScript.java b/Ghidra/Features/Base/ghidra_scripts/CreateUEFIGDTArchivesScript.javaindex 02fadb008f..b85ff5034f 100644--- a/Ghidra/Features/Base/ghidra_scripts/CreateUEFIGDTArchivesScript.java+++ b/Ghidra/Features/Base/ghidra_scripts/CreateUEFIGDTArchivesScript.java@@ -33,11 +33,9 @@ import java.io.IOException;import ghidra.app.script.GhidraScript;import ghidra.app.util.cparser.C.CParserUtils;-import ghidra.app.util.cparser.C.CParserUtils.CParseResults;import ghidra.app.util.cparser.C.ParseException;import ghidra.program.model.data.DataTypeManager;import ghidra.program.model.data.FileDataTypeManager;-import ghidra.util.Msg;public class CreateUEFIGDTArchivesScript extends GhidraScript {diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/UnpackageAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/UnpackageAction.javaindex 4c6e9ffe7d..06e852140f 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/UnpackageAction.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/UnpackageAction.java@@ -24,8 +24,6 @@ import docking.ActionContext;import docking.action.KeyBindingData;import docking.widgets.OptionDialog;import generic.theme.GIcon;-import ghidra.program.model.data.DataTypeComponent;-import ghidra.util.Msg;import ghidra.util.exception.CancelledException;import ghidra.util.exception.UsrException;import ghidra.util.task.TaskLauncher;diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/GhidraScriptRunner.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/GhidraScriptRunner.javaindex 4c69a890f0..5ee27678a7 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/GhidraScriptRunner.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/GhidraScriptRunner.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,8 +25,6 @@ import ghidra.app.plugin.core.osgi.BundleHost;import ghidra.app.script.*;import ghidra.framework.Application;import ghidra.framework.HeadlessGhidraApplicationConfiguration;-import ghidra.framework.data.DomainObjectAdapter;-import ghidra.program.database.ProgramDB;import ghidra.program.model.listing.Program;import ghidra.util.Msg;import ghidra.util.SystemUtilities;diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/state/ContextState.java b/Ghidra/Features/Base/src/main/java/ghidra/util/state/ContextState.javaindex ec3de42375..63bf59d39b 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/util/state/ContextState.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/util/state/ContextState.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.@@ -29,7 +29,6 @@ import ghidra.util.NumericUtilities;import ghidra.util.exception.AssertException;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;-import ghidra.util.task.TaskMonitorAdapter;public class ContextState {diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/datatypes/DataTypeMerge4Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/datatypes/DataTypeMerge4Test.javaindex d817788217..d030a52822 100644--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/datatypes/DataTypeMerge4Test.java+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/datatypes/DataTypeMerge4Test.java@@ -19,8 +19,6 @@ import static org.junit.Assert.*;import java.util.ArrayList;-import javax.swing.JDialog;-import org.junit.Assert;import org.junit.Test;diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/function/Function1Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/function/Function1Test.javaindex 0b944b870f..b78035a9bc 100644--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/function/Function1Test.java+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/function/Function1Test.java@@ -39,7 +39,6 @@ import ghidra.app.plugin.core.codebrowser.CodeBrowserPlugin;import ghidra.app.plugin.core.data.DataPlugin;import ghidra.app.plugin.core.disassembler.DisassemblerPlugin;import ghidra.app.plugin.core.highlight.SetHighlightPlugin;-import ghidra.app.plugin.core.instructionsearch.model.InstructionSearchData.UpdateType;import ghidra.app.plugin.core.navigation.*;import ghidra.app.services.ProgramManager;import ghidra.app.util.AddEditDialog;diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/features/base/values/LanguageValueTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/features/base/values/LanguageValueTest.javaindex 0268fe68fa..b76c7ebe9d 100644--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/features/base/values/LanguageValueTest.java+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/features/base/values/LanguageValueTest.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,6 @@ import org.junit.Test;import docking.widgets.values.AbstractValue;import ghidra.app.script.SelectLanguageDialog;-import ghidra.features.base.values.LanguageValue;import ghidra.features.base.values.LanguageValue.LangaugeValuePanel;import ghidra.program.model.lang.LanguageCompilerSpecPair;diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/program/util/ProgramContextTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/program/util/ProgramContextTest.javaindex 062243df8d..dfdf988ffc 100644--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/program/util/ProgramContextTest.java+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/program/util/ProgramContextTest.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.@@ -31,7 +31,6 @@ import ghidra.program.model.listing.ProgramContext;import ghidra.program.model.mem.Memory;import ghidra.test.AbstractGhidraHeadedIntegrationTest;import ghidra.util.task.TaskMonitor;-import ghidra.util.task.TaskMonitorAdapter;/*** quick and dirty test of the ProgramContextImpl just to seediff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/program/util/ProgramDiff1Test.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/program/util/ProgramDiff1Test.javaindex 8c1cb5e64f..370c044add 100644--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/program/util/ProgramDiff1Test.java+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/program/util/ProgramDiff1Test.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,11 +21,7 @@package ghidra.program.util;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertNotNull;--import java.util.Arrays;-import java.util.Objects;+import static org.junit.Assert.*;import org.junit.*;@@ -36,11 +32,11 @@ import ghidra.program.model.lang.Register;import ghidra.program.model.listing.*;import ghidra.program.model.symbol.Namespace;import ghidra.program.model.symbol.SourceType;-import ghidra.test.ClassicSampleX86ProgramBuilder;import ghidra.test.AbstractGhidraHeadedIntegrationTest;+import ghidra.test.ClassicSampleX86ProgramBuilder;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;-import ghidra.util.task.TaskMonitorAdapter;+import junit.framework.TestCase;/*** <CODE>ProgramDiffTest</CODE> tests the <CODE>ProgramDiff</CODE> classdiff --git a/Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/dwarf/NamespacePathTest.java b/Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/dwarf/NamespacePathTest.javaindex 1235e2cac3..35b08eb69c 100644--- a/Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/dwarf/NamespacePathTest.java+++ b/Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/dwarf/NamespacePathTest.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,6 @@ import static org.junit.Assert.*;import org.junit.Test;-import ghidra.app.util.bin.format.dwarf.NamespacePath;import ghidra.program.model.symbol.SymbolType;public class NamespacePathTest {diff --git a/Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/dwarf/StringTableTest.java b/Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/dwarf/StringTableTest.javaindex 33002c10b7..9a0e823bdc 100644--- a/Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/dwarf/StringTableTest.java+++ b/Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/dwarf/StringTableTest.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,6 @@ import org.junit.Test;import generic.test.AbstractGenericTest;import ghidra.app.util.bin.BinaryReader;import ghidra.app.util.bin.ByteArrayProvider;-import ghidra.app.util.bin.format.dwarf.StringTable;/*** Test reading DWARF string tablediff --git a/Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/golang/rtti/GoApiSnapshotGeneratorTest.java b/Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/golang/rtti/GoApiSnapshotGeneratorTest.javaindex d3a4402ac3..588a7c698e 100644--- a/Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/golang/rtti/GoApiSnapshotGeneratorTest.java+++ b/Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/golang/rtti/GoApiSnapshotGeneratorTest.java@@ -30,7 +30,6 @@ import java.util.stream.Collectors;import org.apache.commons.io.FileUtils;import org.apache.commons.io.FilenameUtils;import org.junit.Before;-import org.junit.Test;import generic.test.AbstractGenericTest;import ghidra.app.util.bin.format.golang.GoVer;diff --git a/Ghidra/Features/Base/src/test/java/ghidra/base/project/FakeSharedProject.java b/Ghidra/Features/Base/src/test/java/ghidra/base/project/FakeSharedProject.javaindex 4802c8075b..19d0b7b246 100644--- a/Ghidra/Features/Base/src/test/java/ghidra/base/project/FakeSharedProject.java+++ b/Ghidra/Features/Base/src/test/java/ghidra/base/project/FakeSharedProject.java@@ -38,7 +38,6 @@ import ghidra.test.TestEnv;import ghidra.test.TestProgramManager;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;-import junit.framework.AssertionFailedError;import utilities.util.FileUtilities;/**diff --git a/Ghidra/Features/Base/src/test/java/ghidra/program/model/data/StructureDataTypeTest.java b/Ghidra/Features/Base/src/test/java/ghidra/program/model/data/StructureDataTypeTest.javaindex 945e6443fa..683aba0566 100644--- a/Ghidra/Features/Base/src/test/java/ghidra/program/model/data/StructureDataTypeTest.java+++ b/Ghidra/Features/Base/src/test/java/ghidra/program/model/data/StructureDataTypeTest.java@@ -23,7 +23,6 @@ import org.apache.commons.compress.utils.Sets;import org.junit.*;import generic.test.AbstractGenericTest;-import ghidra.util.task.TaskMonitorAdapter;public class StructureDataTypeTest extends AbstractGenericTest {diff --git a/Ghidra/Features/Base/src/test/java/ghidra/program/util/ConstantPropogationReferenceTest.java b/Ghidra/Features/Base/src/test/java/ghidra/program/util/ConstantPropogationReferenceTest.javaindex ba5686876b..ccc13646f4 100644--- a/Ghidra/Features/Base/src/test/java/ghidra/program/util/ConstantPropogationReferenceTest.java+++ b/Ghidra/Features/Base/src/test/java/ghidra/program/util/ConstantPropogationReferenceTest.java@@ -35,7 +35,6 @@ import ghidra.program.model.pcode.Varnode;import ghidra.program.model.symbol.Reference;import ghidra.program.model.symbol.ReferenceIterator;import ghidra.program.util.SymbolicPropogator.Value;-import ghidra.util.exception.NotFoundException;import ghidra.util.task.TaskMonitor;/**diff --git a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FunctionBitPatternsGTreeRootNode.java b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FunctionBitPatternsGTreeRootNode.javaindex 60092f8430..13480a6295 100644--- a/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FunctionBitPatternsGTreeRootNode.java+++ b/Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FunctionBitPatternsGTreeRootNode.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,6 @@ import java.util.*;import javax.swing.Icon;-import docking.widgets.tree.GTreeNode;import docking.widgets.tree.GTreeNode;/**diff --git a/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/ByteSequenceLengthFilterTest.java b/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/ByteSequenceLengthFilterTest.javaindex 2de85534df..fc79fc02a6 100644--- a/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/ByteSequenceLengthFilterTest.java+++ b/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/ByteSequenceLengthFilterTest.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,6 @@ import static org.junit.Assert.*;import org.junit.Test;import generic.test.AbstractGenericTest;-import ghidra.bitpatterns.info.ByteSequenceLengthFilter;public class ByteSequenceLengthFilterTest extends AbstractGenericTest {diff --git a/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/ContextRegisterExtentTest.java b/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/ContextRegisterExtentTest.javaindex 7003c346c1..c15aee97cc 100644--- a/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/ContextRegisterExtentTest.java+++ b/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/ContextRegisterExtentTest.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,8 +24,6 @@ import java.util.List;import org.junit.Test;import generic.test.AbstractGenericTest;-import ghidra.bitpatterns.info.ContextRegisterExtent;-import ghidra.bitpatterns.info.ContextRegisterInfo;public class ContextRegisterExtentTest extends AbstractGenericTest {diff --git a/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/DataGatheringParamsTest.java b/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/DataGatheringParamsTest.javaindex e550d63bee..a9ddeb0dbf 100644--- a/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/DataGatheringParamsTest.java+++ b/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/DataGatheringParamsTest.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,8 +21,6 @@ import java.util.*;import org.junit.Test;-import ghidra.bitpatterns.info.DataGatheringParams;-public class DataGatheringParamsTest extends generic.test.AbstractGenericTest {@Testdiff --git a/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/PercentageFilterTest.java b/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/PercentageFilterTest.javaindex 1e16b191d9..2a02f8db3c 100644--- a/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/PercentageFilterTest.java+++ b/Ghidra/Features/BytePatterns/src/test/java/ghidra/bitpatterns/info/PercentageFilterTest.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,6 @@ import static org.junit.Assert.*;import org.junit.Test;import generic.test.AbstractGenericTest;-import ghidra.bitpatterns.info.PercentageFilter;public class PercentageFilterTest extends AbstractGenericTest {diff --git a/Ghidra/Features/BytePatterns/src/test/java/ghidra/closedpatternmining/SequenceItemTest.java b/Ghidra/Features/BytePatterns/src/test/java/ghidra/closedpatternmining/SequenceItemTest.javaindex 32f6786d8b..5e4649f143 100644--- a/Ghidra/Features/BytePatterns/src/test/java/ghidra/closedpatternmining/SequenceItemTest.java+++ b/Ghidra/Features/BytePatterns/src/test/java/ghidra/closedpatternmining/SequenceItemTest.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.@@ -23,7 +23,6 @@ import java.util.List;import org.junit.Test;import generic.test.AbstractGenericTest;-import ghidra.closedpatternmining.SequenceItem;public class SequenceItemTest extends AbstractGenericTest {diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/ShowConstantUse.java b/Ghidra/Features/Decompiler/ghidra_scripts/ShowConstantUse.javaindex ebfc4f0ff2..a02dbd6ab3 100644--- a/Ghidra/Features/Decompiler/ghidra_scripts/ShowConstantUse.java+++ b/Ghidra/Features/Decompiler/ghidra_scripts/ShowConstantUse.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,13 +25,11 @@import java.util.*;-import docking.options.OptionsService;import generic.jar.ResourceFile;import ghidra.app.decompiler.*;import ghidra.app.decompiler.component.DecompilerUtils;import ghidra.app.script.*;import ghidra.app.tablechooser.*;-import ghidra.framework.options.ToolOptions;import ghidra.program.model.address.Address;import ghidra.program.model.address.AddressSpace;import ghidra.program.model.lang.Register;diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParameterIdCmd.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParameterIdCmd.javaindex b91b95d2f3..f418edefc7 100644--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParameterIdCmd.java+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParameterIdCmd.java@@ -26,8 +26,6 @@ import ghidra.app.decompiler.*;import ghidra.app.plugin.core.analysis.AutoAnalysisManager;import ghidra.framework.cmd.BackgroundCommand;import ghidra.program.model.address.*;-import ghidra.program.model.data.DataType;-import ghidra.program.model.data.VoidDataType;import ghidra.program.model.lang.CompilerSpec;import ghidra.program.model.listing.*;import ghidra.program.model.mem.MemoryBlock;diff --git a/Ghidra/Features/Decompiler/src/test.slow/java/ghidra/app/plugin/core/decompile/DecompilerSwitchAnalyzerTest.java b/Ghidra/Features/Decompiler/src/test.slow/java/ghidra/app/plugin/core/decompile/DecompilerSwitchAnalyzerTest.javaindex 720b176183..b0b97824c2 100644--- a/Ghidra/Features/Decompiler/src/test.slow/java/ghidra/app/plugin/core/decompile/DecompilerSwitchAnalyzerTest.java+++ b/Ghidra/Features/Decompiler/src/test.slow/java/ghidra/app/plugin/core/decompile/DecompilerSwitchAnalyzerTest.java@@ -17,31 +17,18 @@ package ghidra.app.plugin.core.decompile;import static org.junit.Assert.*;-import java.math.BigInteger;--import org.apache.commons.lang3.ArrayUtils;-import org.junit.*;+import org.junit.Test;import generic.test.AbstractGenericTest;-import ghidra.app.plugin.core.analysis.*;-import ghidra.framework.cmd.Command;+import ghidra.app.plugin.core.analysis.DecompilerSwitchAnalyzer;import ghidra.framework.options.Options;-import ghidra.framework.plugintool.PluginTool;import ghidra.program.database.ProgramBuilder;import ghidra.program.model.address.Address;import ghidra.program.model.address.AddressSet;-import ghidra.program.model.lang.Register;-import ghidra.program.model.lang.RegisterValue;import ghidra.program.model.listing.*;-import ghidra.program.model.mem.MemoryBlock;-import ghidra.program.model.pcode.Varnode;-import ghidra.program.model.symbol.*;-import ghidra.program.util.SymbolicPropogator.Value;-import ghidra.test.TestEnv;-import ghidra.util.TaskUtilities;-import ghidra.util.exception.NotFoundException;+import ghidra.program.model.symbol.Reference;+import ghidra.program.model.symbol.Symbol;import ghidra.util.task.TaskMonitor;-import junit.framework.AssertionFailedError;/*** Test of DecompilerSwitchAnalyzerdiff --git a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/extension/datatype/finder/VariableAccessDR.java b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/extension/datatype/finder/VariableAccessDR.javaindex cb62fd64d2..b2a17d8105 100644--- a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/extension/datatype/finder/VariableAccessDR.java+++ b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/extension/datatype/finder/VariableAccessDR.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,6 @@ import ghidra.app.services.FieldMatcher;import ghidra.program.model.address.Address;import ghidra.program.model.data.DataType;import ghidra.program.model.listing.Function;-import ghidra.program.model.pcode.HighGlobal;import ghidra.program.model.pcode.HighVariable;import ghidra.util.StringUtilities;import ghidra.util.exception.AssertException;diff --git a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintClearAction.java b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintClearAction.javaindex ce17896d1d..ea4283553b 100644--- a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintClearAction.java+++ b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintClearAction.java@@ -22,7 +22,6 @@ import docking.action.KeyBindingData;import docking.action.MenuData;import ghidra.app.plugin.core.decompile.DecompilerActionContext;import ghidra.app.plugin.core.decompiler.taint.TaintPlugin;-import ghidra.app.plugin.core.decompiler.taint.TaintState;import ghidra.util.HelpLocation;/**diff --git a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintGateAction.java b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintGateAction.javaindex c55497d576..ac41abca25 100644--- a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintGateAction.java+++ b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintGateAction.java@@ -23,7 +23,6 @@ import docking.action.MenuData;import ghidra.app.decompiler.*;import ghidra.app.plugin.core.decompile.DecompilerActionContext;import ghidra.app.plugin.core.decompiler.taint.TaintPlugin;-import ghidra.app.plugin.core.decompiler.taint.TaintState;import ghidra.app.plugin.core.decompiler.taint.TaintState.MarkType;import ghidra.program.model.listing.Function;import ghidra.util.HelpLocation;diff --git a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintQueryCustomAction.java b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintQueryCustomAction.javaindex ba4c2a31e6..28de03be3f 100644--- a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintQueryCustomAction.java+++ b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintQueryCustomAction.java@@ -20,7 +20,6 @@ import java.awt.event.KeyEvent;import docking.action.KeyBindingData;import ghidra.app.plugin.core.decompiler.taint.TaintPlugin;-import ghidra.app.plugin.core.decompiler.taint.TaintState;import ghidra.app.plugin.core.decompiler.taint.TaintState.QueryType;public class TaintQueryCustomAction extends TaintAbstractQueryAction {diff --git a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintQueryDefaultAction.java b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintQueryDefaultAction.javaindex 2760b841e9..022c364e35 100644--- a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintQueryDefaultAction.java+++ b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintQueryDefaultAction.java@@ -22,7 +22,6 @@ import docking.action.KeyBindingData;import docking.action.ToolBarData;import generic.theme.GIcon;import ghidra.app.plugin.core.decompiler.taint.TaintPlugin;-import ghidra.app.plugin.core.decompiler.taint.TaintState;import ghidra.app.plugin.core.decompiler.taint.TaintState.QueryType;public class TaintQueryDefaultAction extends TaintAbstractQueryAction {diff --git a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintSinkBySymbolAction.java b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintSinkBySymbolAction.javaindex 0756e40647..bd86dbe672 100644--- a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintSinkBySymbolAction.java+++ b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintSinkBySymbolAction.java@@ -19,7 +19,6 @@ import docking.action.MenuData;import ghidra.app.decompiler.*;import ghidra.app.plugin.core.decompile.DecompilerActionContext;import ghidra.app.plugin.core.decompiler.taint.TaintPlugin;-import ghidra.app.plugin.core.decompiler.taint.TaintState;import ghidra.app.plugin.core.decompiler.taint.TaintState.MarkType;import ghidra.program.model.listing.Function;import ghidra.util.HelpLocation;diff --git a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintSliceTreeAction.java b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintSliceTreeAction.javaindex b54aba5e53..5772cd5128 100644--- a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintSliceTreeAction.java+++ b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintSliceTreeAction.java@@ -19,7 +19,6 @@ import docking.action.MenuData;import ghidra.app.decompiler.ClangToken;import ghidra.app.plugin.core.decompile.DecompilerActionContext;import ghidra.app.plugin.core.decompiler.taint.TaintPlugin;-import ghidra.app.plugin.core.decompiler.taint.TaintState;import ghidra.program.model.listing.Program;import ghidra.program.model.pcode.HighVariable;import ghidra.util.HelpLocation;diff --git a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintSourceBySymbolAction.java b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintSourceBySymbolAction.javaindex 29a1c353ce..d09e07c8b6 100644--- a/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintSourceBySymbolAction.java+++ b/Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/actions/TaintSourceBySymbolAction.java@@ -19,7 +19,6 @@ import docking.action.MenuData;import ghidra.app.decompiler.*;import ghidra.app.plugin.core.decompile.DecompilerActionContext;import ghidra.app.plugin.core.decompiler.taint.TaintPlugin;-import ghidra.app.plugin.core.decompiler.taint.TaintState;import ghidra.app.plugin.core.decompiler.taint.TaintState.MarkType;import ghidra.program.model.listing.Function;import ghidra.util.HelpLocation;diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/apport/DecodedProvider.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/apport/DecodedProvider.javaindex a487b098d2..1ef63119f8 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/apport/DecodedProvider.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/apport/DecodedProvider.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.@@ -29,7 +29,6 @@ import aQute.lib.io.IO;import ghidra.app.util.bin.ByteProvider;import ghidra.app.util.bin.FileByteProvider;import ghidra.file.formats.dump.DumpFile;-import ghidra.util.Msg;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;diff --git a/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/db/FidDB.java b/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/db/FidDB.javaindex c0afb03c25..363ba3fe3c 100644--- a/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/db/FidDB.java+++ b/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/db/FidDB.java@@ -31,7 +31,6 @@ import ghidra.util.Msg;import ghidra.util.ReadOnlyException;import ghidra.util.exception.*;import ghidra.util.task.TaskMonitor;-import ghidra.util.task.TaskMonitorAdapter;public class FidDB implements Closeable {private static final String FID_CONTENT_TYPE = "Function ID Database";diff --git a/Ghidra/Features/MicrosoftCodeAnalyzer/src/test/java/ghidra/app/cmd/data/exceptionhandling/AbstractEHTest.java b/Ghidra/Features/MicrosoftCodeAnalyzer/src/test/java/ghidra/app/cmd/data/exceptionhandling/AbstractEHTest.javaindex af9e0ac2f9..74b8c01684 100644--- a/Ghidra/Features/MicrosoftCodeAnalyzer/src/test/java/ghidra/app/cmd/data/exceptionhandling/AbstractEHTest.java+++ b/Ghidra/Features/MicrosoftCodeAnalyzer/src/test/java/ghidra/app/cmd/data/exceptionhandling/AbstractEHTest.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.@@ -16,7 +16,6 @@package ghidra.app.cmd.data.exceptionhandling;import ghidra.app.cmd.data.AbstractCreateDataTypeModelTest;-import ghidra.app.cmd.data.rtti.RttiUtil;import ghidra.program.database.ProgramBuilder;import ghidra.program.database.ProgramDB;import ghidra.program.model.address.Address;diff --git a/Ghidra/Framework/DB/src/main/java/db/buffers/LocalManagedBufferFile.java b/Ghidra/Framework/DB/src/main/java/db/buffers/LocalManagedBufferFile.javaindex 376e9c3cd1..7d82990e81 100644--- a/Ghidra/Framework/DB/src/main/java/db/buffers/LocalManagedBufferFile.java+++ b/Ghidra/Framework/DB/src/main/java/db/buffers/LocalManagedBufferFile.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,6 @@ import ghidra.util.Msg;import ghidra.util.exception.AssertException;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;-import ghidra.util.task.TaskMonitorAdapter;/*** <code>LocalManagedBufferFile</code> implements a BufferFile as block-orienteddiff --git a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/BooleanValueTest.java b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/BooleanValueTest.javaindex fd40edab8c..88ffaf8f2c 100644--- a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/BooleanValueTest.java+++ b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/BooleanValueTest.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,9 +21,6 @@ import javax.swing.JCheckBox;import org.junit.Test;-import docking.widgets.values.AbstractValue;-import docking.widgets.values.BooleanValue;-public class BooleanValueTest extends AbstractValueTest {private static final String NAME = "YesNo";diff --git a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/ChoiceValueTest.java b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/ChoiceValueTest.javaindex 5ec2d01a5c..774e236e90 100644--- a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/ChoiceValueTest.java+++ b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/ChoiceValueTest.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,6 @@ import static org.junit.Assert.*;import org.junit.Test;import docking.widgets.combobox.GComboBox;-import docking.widgets.values.AbstractValue;-import docking.widgets.values.ChoiceValue;public class ChoiceValueTest extends AbstractValueTest {private static final String NAME = "Choice";diff --git a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/DoubleValueTest.java b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/DoubleValueTest.javaindex f5fcc84693..124401df9a 100644--- a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/DoubleValueTest.java+++ b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/DoubleValueTest.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,6 @@ import static org.junit.Assert.*;import org.junit.Test;-import docking.widgets.values.DoubleValue;-public class DoubleValueTest extends AbstractValueTest {private static final String NAME = "Fraction";private static double DELTA = 0.0001;diff --git a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/FileValueTest.java b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/FileValueTest.javaindex 3ca0a8c612..ddd528da68 100644--- a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/FileValueTest.java+++ b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/FileValueTest.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.@@ -23,8 +23,6 @@ import java.io.IOException;import org.junit.Test;import docking.widgets.filechooser.GhidraFileChooser;-import docking.widgets.values.AbstractValue;-import docking.widgets.values.FileValue;import docking.widgets.values.FileValue.FileValuePanel;public class FileValueTest extends AbstractValueTest {diff --git a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/IntValueTest.java b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/IntValueTest.javaindex 5a4f9d9bf2..f3d64ac19a 100644--- a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/IntValueTest.java+++ b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/IntValueTest.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,6 @@ import static org.junit.Assert.*;import org.junit.Test;-import docking.widgets.values.IntValue;-public class IntValueTest extends AbstractValueTest {private static final String NAME = "Count";diff --git a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/LongValueTest.java b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/LongValueTest.javaindex 3b59f75b87..045081f047 100644--- a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/LongValueTest.java+++ b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/LongValueTest.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,6 @@ import static org.junit.Assert.*;import org.junit.Test;-import docking.widgets.values.LongValue;-public class LongValueTest extends AbstractValueTest {private static final String NAME = "Count";diff --git a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/StringValueTest.java b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/StringValueTest.javaindex 690738345a..2131ebfb80 100644--- a/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/StringValueTest.java+++ b/Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/values/StringValueTest.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,6 @@ import static org.junit.Assert.*;import org.junit.Test;-import docking.widgets.values.StringValue;-public class StringValueTest extends AbstractValueTest {private static final String NAME = "Name";diff --git a/Ghidra/Framework/Docking/src/test/java/docking/widgets/table/threaded/CoalescingAddRemoveStrategyTest.java b/Ghidra/Framework/Docking/src/test/java/docking/widgets/table/threaded/CoalescingAddRemoveStrategyTest.javaindex 1ff41f4ccf..f312fbc9e5 100644--- a/Ghidra/Framework/Docking/src/test/java/docking/widgets/table/threaded/CoalescingAddRemoveStrategyTest.java+++ b/Ghidra/Framework/Docking/src/test/java/docking/widgets/table/threaded/CoalescingAddRemoveStrategyTest.java@@ -24,7 +24,6 @@ import org.junit.Before;import org.junit.Test;import docking.widgets.table.*;-import docking.widgets.table.threaded.CoalescingAddRemoveStrategy;import ghidra.util.task.TaskMonitor;public class CoalescingAddRemoveStrategyTest {diff --git a/Ghidra/Framework/Docking/src/test/java/ghidra/util/task/TaskMonitorSplitterTest.java b/Ghidra/Framework/Docking/src/test/java/ghidra/util/task/TaskMonitorSplitterTest.javaindex 58f266bbf4..5739d2c4f8 100644--- a/Ghidra/Framework/Docking/src/test/java/ghidra/util/task/TaskMonitorSplitterTest.java+++ b/Ghidra/Framework/Docking/src/test/java/ghidra/util/task/TaskMonitorSplitterTest.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,12 +15,11 @@*/package ghidra.util.task;-import static org.junit.Assert.assertEquals;+import static org.junit.Assert.*;import org.junit.Test;import docking.test.AbstractDockingTest;-import generic.test.AbstractGenericTest;public class TaskMonitorSplitterTest extends AbstractDockingTest {TaskMonitor baseMonitor;diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/loadimage/LoadImage.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/loadimage/LoadImage.javaindex 4c5160e8ae..e540dc16ec 100644--- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/loadimage/LoadImage.java+++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/loadimage/LoadImage.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,6 @@*/package ghidra.pcode.loadimage;-import ghidra.pcode.memstate.MemoryPage;import ghidra.program.model.address.Address;// API for accessing a binary load imagediff --git a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/FutureTaskMonitor.java b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/FutureTaskMonitor.javaindex 2968d30737..006f92f442 100644--- a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/FutureTaskMonitor.java+++ b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/FutureTaskMonitor.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,6 @@ package generic.concurrent;import java.util.concurrent.Callable;import java.util.concurrent.FutureTask;-import ghidra.util.Msg;import ghidra.util.exception.CancelledException;import ghidra.util.task.CancelledListener;import ghidra.util.task.TaskMonitor;diff --git a/Ghidra/Framework/Generic/src/main/java/generic/io/JarWriter.java b/Ghidra/Framework/Generic/src/main/java/generic/io/JarWriter.javaindex e3a064db40..181412ddfa 100644--- a/Ghidra/Framework/Generic/src/main/java/generic/io/JarWriter.java+++ b/Ghidra/Framework/Generic/src/main/java/generic/io/JarWriter.java@@ -15,14 +15,13 @@*/package generic.io;-import ghidra.util.Msg;-import ghidra.util.task.TaskMonitor;-import ghidra.util.task.TaskMonitorAdapter;-import java.io.*;import java.util.jar.JarOutputStream;import java.util.zip.ZipEntry;+import ghidra.util.Msg;+import ghidra.util.task.TaskMonitor;+/*** JarWriter is a class for writing to a jar output stream.*/diff --git a/Ghidra/Framework/Generic/src/test/java/ghidra/util/timer/WatchdogTest.java b/Ghidra/Framework/Generic/src/test/java/ghidra/util/timer/WatchdogTest.javaindex c04192b862..4d6a5361fb 100644--- a/Ghidra/Framework/Generic/src/test/java/ghidra/util/timer/WatchdogTest.java+++ b/Ghidra/Framework/Generic/src/test/java/ghidra/util/timer/WatchdogTest.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.@@ -23,7 +23,6 @@ import org.junit.Test;import generic.test.AbstractGTest;import ghidra.util.Msg;-import ghidra.util.timer.Watchdog;public class WatchdogTest extends AbstractGTest {diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/DBContentHandler.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/DBContentHandler.javaindex 3136f8cd2c..d616316fe4 100644--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/DBContentHandler.java+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/DBContentHandler.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,8 +17,6 @@ package ghidra.framework.data;import java.io.IOException;-import javax.help.UnsupportedOperationException;-import db.DBHandle;import db.buffers.ManagedBufferFile;import ghidra.framework.store.*;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/CodeBlockImpl.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/CodeBlockImpl.javaindex 88f0a3671e..772af5e676 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/CodeBlockImpl.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/CodeBlockImpl.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,6 @@ import ghidra.program.model.symbol.FlowType;import ghidra.util.Msg;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;-import ghidra.util.task.TaskMonitorAdapter;/*** CodeBlockImpl is an implementation of a CodeBlock.diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/PartitionCodeSubModel.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/PartitionCodeSubModel.javaindex e2e0f7675b..2e83e9812e 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/PartitionCodeSubModel.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/PartitionCodeSubModel.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.@@ -27,7 +27,6 @@ import ghidra.util.graph.*;import ghidra.util.graph.attributes.AttributeManager;import ghidra.util.graph.attributes.IntegerAttribute;import ghidra.util.task.TaskMonitor;-import ghidra.util.task.TaskMonitorAdapter;/*** <CODE>PartitionCodeSubModel</CODE> (Model-P) defines subroutines which do not share code withdiff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractDataType.javaindex 6ecc4cdd11..cb6d4a95bd 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractDataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractDataType.java@@ -21,7 +21,6 @@ import ghidra.docking.settings.Settings;import ghidra.program.model.mem.MemBuffer;import ghidra.util.InvalidNameException;import ghidra.util.UniversalID;-import ghidra.util.exception.DuplicateNameException;/*** Base class for DataType classes. Many of the DataType methods are stubbed out so simple datatypediff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataType.javaindex 24a2395b29..8957bb7f99 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataType.java@@ -15,7 +15,6 @@*/package ghidra.program.model.data;-import java.net.URL;import java.util.Collection;import ghidra.docking.settings.Settings;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/WideChar16DataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/WideChar16DataType.javaindex 6ae4622afc..079c442ff2 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/WideChar16DataType.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/WideChar16DataType.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,9 +15,6 @@*/package ghidra.program.model.data;-import java.nio.CharBuffer;-import java.nio.charset.Charset;-import ghidra.docking.settings.Settings;import ghidra.docking.settings.SettingsDefinition;import ghidra.program.model.mem.MemBuffer;diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/GlobalSymbolMap.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/GlobalSymbolMap.javaindex 5ec7be12da..98340f24b4 100644--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/GlobalSymbolMap.java+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/GlobalSymbolMap.java@@ -22,7 +22,6 @@ import ghidra.program.database.symbol.CodeSymbol;import ghidra.program.database.symbol.FunctionSymbol;import ghidra.program.model.address.Address;import ghidra.program.model.data.DataType;-import ghidra.program.model.listing.Data;import ghidra.program.model.listing.Program;import ghidra.program.model.symbol.Symbol;import ghidra.program.model.symbol.SymbolTable;diff --git a/Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/database/data/DataTypeUtilities2Test.java b/Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/database/data/DataTypeUtilities2Test.javaindex eae71859bb..0562dcbfda 100644--- a/Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/database/data/DataTypeUtilities2Test.java+++ b/Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/database/data/DataTypeUtilities2Test.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,15 +15,13 @@*/package ghidra.program.database.data;-import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertNull;+import static org.junit.Assert.*;import java.util.Collection;import org.junit.Test;import generic.test.AbstractGTest;-import ghidra.program.database.data.DataTypeUtilities;import ghidra.program.model.data.*;public class DataTypeUtilities2Test extends AbstractGTest {diff --git a/Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/database/data/DataTypeUtilitiesTest.java b/Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/database/data/DataTypeUtilitiesTest.javaindex b3b315c46a..13dbbe4585 100644--- a/Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/database/data/DataTypeUtilitiesTest.java+++ b/Ghidra/Framework/SoftwareModeling/src/test.slow/java/ghidra/program/database/data/DataTypeUtilitiesTest.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,6 @@ import static org.junit.Assert.*;import org.junit.*;import generic.test.AbstractGenericTest;-import ghidra.program.database.ProgramDB;-import ghidra.program.database.data.DataTypeUtilities;import ghidra.program.model.data.*;/**diff --git a/Ghidra/Processors/MIPS/src/test.slow/java/ghidra/app/plugin/core/analysis/MipsPreAnalyzerTest.java b/Ghidra/Processors/MIPS/src/test.slow/java/ghidra/app/plugin/core/analysis/MipsPreAnalyzerTest.javaindex 2d99099295..b0832d56ab 100644--- a/Ghidra/Processors/MIPS/src/test.slow/java/ghidra/app/plugin/core/analysis/MipsPreAnalyzerTest.java+++ b/Ghidra/Processors/MIPS/src/test.slow/java/ghidra/app/plugin/core/analysis/MipsPreAnalyzerTest.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.@@ -28,7 +28,6 @@ import ghidra.program.model.listing.ProgramContext;import ghidra.test.AbstractGhidraHeadlessIntegrationTest;import ghidra.test.TestEnv;import ghidra.util.task.TaskMonitor;-import ghidra.util.task.TaskMonitorAdapter;/*** Analyzer Test for Mips Pre-Analyzerdiff --git a/Ghidra/Processors/PIC/src/main/java/ghidra/app/plugin/core/analysis/Pic16Analyzer.java b/Ghidra/Processors/PIC/src/main/java/ghidra/app/plugin/core/analysis/Pic16Analyzer.javaindex 2a42b481b3..30e6743939 100644--- a/Ghidra/Processors/PIC/src/main/java/ghidra/app/plugin/core/analysis/Pic16Analyzer.java+++ b/Ghidra/Processors/PIC/src/main/java/ghidra/app/plugin/core/analysis/Pic16Analyzer.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,11 +20,12 @@ import java.math.BigInteger;import ghidra.app.services.AnalysisPriority;import ghidra.app.util.importer.MessageLog;import ghidra.program.model.address.*;-import ghidra.program.model.data.DataType;import ghidra.program.model.lang.*;import ghidra.program.model.listing.*;-import ghidra.program.model.symbol.*;-import ghidra.program.util.*;+import ghidra.program.model.symbol.FlowType;+import ghidra.program.model.symbol.Reference;+import ghidra.program.util.SymbolicPropogator;+import ghidra.program.util.VarnodeContext;import ghidra.util.exception.CancelledException;import ghidra.util.task.TaskMonitor;diff --git a/Ghidra/Processors/RISCV/src/main/java/ghidra/app/util/bin/format/elf/extend/RISCV_ElfExtension.java b/Ghidra/Processors/RISCV/src/main/java/ghidra/app/util/bin/format/elf/extend/RISCV_ElfExtension.javaindex 766a3dbe16..06b657770b 100644--- a/Ghidra/Processors/RISCV/src/main/java/ghidra/app/util/bin/format/elf/extend/RISCV_ElfExtension.java+++ b/Ghidra/Processors/RISCV/src/main/java/ghidra/app/util/bin/format/elf/extend/RISCV_ElfExtension.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.@@ -16,10 +16,7 @@package ghidra.app.util.bin.format.elf.extend;import ghidra.app.util.bin.format.elf.*;-import ghidra.program.model.address.Address;-import ghidra.program.model.lang.*;-import ghidra.program.model.listing.Program;-import ghidra.program.model.listing.ContextChangeException;+import ghidra.program.model.lang.Language;public class RISCV_ElfExtension extends ElfExtension {