mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-2986-dragonmacher-component-provider-methods--SQUASHED'
This commit is contained in:
ghidra1
2023-02-03 17:55:23 -05:00
parent 2075df60fb c252e3b905
commit 7143f64c51
174 changed files with 1393 additions and 1455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/filters/AncillaryFilterDialogComponentProvider.java
View File

@@ -20,16 +20,17 @@ import java.util.Map.Entry;
import javax.swing.JComponent;
import docking.DialogComponentProvider;
import docking.ReusableDialogComponentProvider;
import ghidra.feature.vt.gui.filters.Filter.FilterShortcutState;
import ghidra.feature.vt.gui.plugin.VTController;
public abstract class AncillaryFilterDialogComponentProvider<T> extends DialogComponentProvider {
public abstract class AncillaryFilterDialogComponentProvider<T>
extends ReusableDialogComponentProvider {
private FilterChangedListener filterChangedListener;
private Set<AncillaryFilter<T>> ancillaryFilters = new HashSet<AncillaryFilter<T>>();
private Set<AncillaryFilter<T>> ancillaryFilters = new HashSet<>();
private Map<AncillaryFilter<T>, FilterState> originalState =
new HashMap<AncillaryFilter<T>, FilterState>();
new HashMap<>();
protected final VTController controller;
private final FilterDialogModel<T> dialogModel;
@@ -38,7 +39,7 @@ public abstract class AncillaryFilterDialogComponentProvider<T> extends DialogCo
protected AncillaryFilterDialogComponentProvider(VTController controller, String title,
FilterDialogModel<T> dialogModel) {
super(title, true);
super(title);
this.controller = controller;
this.dialogModel = dialogModel;
@@ -141,7 +142,7 @@ public abstract class AncillaryFilterDialogComponentProvider<T> extends DialogCo
}
private Map<AncillaryFilter<T>, FilterState> getCurrentState() {
Map<AncillaryFilter<T>, FilterState> state = new HashMap<AncillaryFilter<T>, FilterState>();
Map<AncillaryFilter<T>, FilterState> state = new HashMap<>();
for (AncillaryFilter<T> filter : ancillaryFilters) {
state.put(filter, filter.getFilterState());
}

2
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/VTMarkupItemsTableProvider.java
View File

@@ -535,6 +535,8 @@ public class VTMarkupItemsTableProvider extends ComponentProviderAdapter
filter.dispose();
}
ancillaryFilterDialog.dispose();
tool.removePopupActionProvider(this);
}

2
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/matchtable/VTMatchTableProvider.java
View File

@@ -456,6 +456,8 @@ public class VTMatchTableProvider extends ComponentProviderAdapter
for (Filter<VTMatch> filter : filters) {
filter.dispose();
}
ancillaryFilterDialog.dispose();
}
@Override