Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-29 07:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-8-9-23'

Browse Source
This commit is contained in:
Ryan Kurtz 2023-08-09 12:35:13 -04:00
commit 8cbfb888e7
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/table/TableServicePlugin.java
View File

@ -138,13 +138,7 @@ public class TableServicePlugin extends ProgramPlugin
GhidraProgramTableModel<T> model, String windowSubMenu, Navigatable navigatable) {
GoToService gotoService = tool.getService(GoToService.class);
if (gotoService != null && navigatable == null) {
navigatable = gotoService.getDefaultNavigatable();
}
Program program = model.getProgram();
TableComponentProvider<T> cp = new TableComponentProvider<>(this, title, tableTypeName,
model, program.getDomainFile().getName(), gotoService, windowSubMenu, navigatable);
addProvider(program, cp);
@ -157,14 +151,8 @@ public class TableServicePlugin extends ProgramPlugin
String windowSubMenu, Navigatable navigatable) {
GoToService gotoService = tool.getService(GoToService.class);
if (gotoService != null && navigatable == null) {
navigatable = gotoService.getDefaultNavigatable();
}
MarkerService markerService = tool.getService(MarkerService.class);
Program program = model.getProgram();
TableComponentProvider<T> cp = new TableComponentProvider<>(this, title, tableTypeName,
model, program.getDomainFile().getName(), gotoService, markerService, markerColor,
markerIcon, windowSubMenu, navigatable);

2
Ghidra/Features/Base/src/main/java/ghidra/util/table/GhidraTable.java
View File

@ -127,7 +127,7 @@ public class GhidraTable extends GTable {
return;
}
if (this.navigatable == null) {
if (navigationKeyListener == null) {
navigationKeyListener = new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {