Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-28 07:46:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-3349_ghidragon_adding_support_for_mutliple_default_contexts--SQUASHED'

Conflicts:
	Ghidra/Features/ByteViewer/src/test.slow/java/ghidra/app/plugin/core/byteviewer/ByteViewerPlugin2Test.java
This commit is contained in:
Ryan Kurtz
2023-05-11 06:43:59 -04:00
parent 5708d69834 5da5af23fb
commit 78d9a6c6e3
149 changed files with 1354 additions and 1232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/functionassociation/VTFunctionAssociationContext.java
+3 -2
View File
@@ -15,12 +15,13 @@
*/
package ghidra.feature.vt.gui.provider.functionassociation;
import docking.DefaultActionContext;
import ghidra.feature.vt.api.main.VTMatch;
import ghidra.framework.plugintool.PluginTool;
import ghidra.program.model.listing.Function;
import docking.ActionContext;
public class VTFunctionAssociationContext extends ActionContext implements FunctionAssociationContext {
public class VTFunctionAssociationContext extends DefaultActionContext
implements FunctionAssociationContext {
private final PluginTool tool;
private final Function selectedSourceFunction;
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/markuptable/VTMarkupItemContext.java
+3 -2
View File
@@ -17,7 +17,7 @@ package ghidra.feature.vt.gui.provider.markuptable;
import java.util.List;
import docking.ActionContext;
import docking.DefaultActionContext;
import docking.widgets.fieldpanel.internal.FieldPanelCoordinator;
import ghidra.app.util.viewer.util.CodeComparisonPanel;
import ghidra.app.util.viewer.util.CodeComparisonPanelActionContext;
@@ -26,7 +26,8 @@ import ghidra.feature.vt.api.main.VTMarkupItem;
/**
* Action context for the version tracking markup item provider.
*/
public class VTMarkupItemContext extends ActionContext implements CodeComparisonPanelActionContext {
public class VTMarkupItemContext extends DefaultActionContext
implements CodeComparisonPanelActionContext {
private final List<VTMarkupItem> selectedItems;
private CodeComparisonPanel<? extends FieldPanelCoordinator> codeComparisonPanel = null;
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/matchtable/VTMatchContext.java
+4 -6
View File
@@ -1,6 +1,5 @@
/* ###
* 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.
@@ -16,14 +15,13 @@
*/
package ghidra.feature.vt.gui.provider.matchtable;
import java.util.List;
import docking.DefaultActionContext;
import ghidra.feature.vt.api.main.VTMatch;
import ghidra.feature.vt.api.main.VTSession;
import java.util.List;
import docking.ActionContext;
public class VTMatchContext extends ActionContext {
public class VTMatchContext extends DefaultActionContext {
private final List<VTMatch> selectedMatches;
private final VTSession session;
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/onetomany/VTMatchOneToManyContext.java
+3 -5
View File
@@ -1,6 +1,5 @@
/* ###
* 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.
@@ -16,13 +15,12 @@
*/
package ghidra.feature.vt.gui.provider.onetomany;
import ghidra.feature.vt.api.main.VTMatch;
import java.util.List;
import docking.ActionContext;
import docking.DefaultActionContext;
import ghidra.feature.vt.api.main.VTMatch;
public class VTMatchOneToManyContext extends ActionContext {
public class VTMatchOneToManyContext extends DefaultActionContext {
private final List<VTMatch> selectedItems;
Ghidra/Features/VersionTracking/src/screen/java/help/screenshot/VersionTrackingPluginScreenShots.java
+3 -3
View File
@@ -743,7 +743,7 @@ public class VersionTrackingPluginScreenShots extends GhidraScreenShotGenerator
ToggleDockingAction action =
(ToggleDockingAction) getLocalAction(provider, "Toggle Dual Listing Visibility");
assertNotNull(action);
setToggleActionSelected(action, new ActionContext(), false);
setToggleActionSelected(action, new DefaultActionContext(), false);
waitForSwing();
waitForCondition(() -> !dualListingIsVisible(provider));
}
@@ -778,7 +778,7 @@ public class VersionTrackingPluginScreenShots extends GhidraScreenShotGenerator
ToggleDockingAction action =
(ToggleDockingAction) getLocalAction(provider, "Dual Listing Toggle Orientation");
assertNotNull(action);
setToggleActionSelected(action, new ActionContext(), vertical);
setToggleActionSelected(action, new DefaultActionContext(), vertical);
waitForSwing();
return action;
}
@@ -792,7 +792,7 @@ public class VersionTrackingPluginScreenShots extends GhidraScreenShotGenerator
ToggleDockingAction action =
(ToggleDockingAction) getLocalAction(provider, "Dual Listing Toggle Header");
assertNotNull(action);
setToggleActionSelected(action, new ActionContext(), showing);
setToggleActionSelected(action, new DefaultActionContext(), showing);
waitForSwing();
return action;
}