mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-09-28 17:11:11 -09:00
Merge remote-tracking branch
'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:
@@ -24,6 +24,7 @@ import javax.swing.*;
|
||||
import javax.swing.tree.TreePath;
|
||||
|
||||
import docking.ActionContext;
|
||||
import docking.DefaultActionContext;
|
||||
import docking.action.DockingAction;
|
||||
import docking.action.MenuData;
|
||||
import docking.tool.ToolConstants;
|
||||
@@ -488,7 +489,7 @@ public class FunctionBitPatternsMainProvider extends ComponentProviderAdapter
|
||||
return super.getActionContext(event);
|
||||
}
|
||||
|
||||
class EvaluateContext extends ActionContext {
|
||||
class EvaluateContext extends DefaultActionContext {
|
||||
List<PatternInfoRowObject> selectedRows;
|
||||
|
||||
public EvaluateContext(List<PatternInfoRowObject> selectedRowObjects) {
|
||||
@@ -510,7 +511,7 @@ public class FunctionBitPatternsMainProvider extends ComponentProviderAdapter
|
||||
}
|
||||
}
|
||||
|
||||
class ByteSequenceContext extends ActionContext {
|
||||
class ByteSequenceContext extends DefaultActionContext {
|
||||
ByteSequencePanelBuilder builder;
|
||||
List<ByteSequenceRowObject> selectedRows;
|
||||
|
||||
@@ -532,7 +533,7 @@ public class FunctionBitPatternsMainProvider extends ComponentProviderAdapter
|
||||
}
|
||||
}
|
||||
|
||||
class InstructionTreeContext extends ActionContext {
|
||||
class InstructionTreeContext extends DefaultActionContext {
|
||||
private FunctionBitPatternsGTree tree;
|
||||
private TreePath path;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user