yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 12:00:04 +02:00
Code Issues Releases Wiki Activity

Test fixes for intermittent key binding options failure

Browse source
This commit is contained in:
dragonmacher 2021-06-09 14:59:37 -04:00
parent 066b285446
commit 26dc7b62b7
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Features/Base/src/test.slow/java/ghidra/framework/plugintool/dialog/KeyBindingUtilsTest.java
View file

@ -514,9 +514,11 @@ public class KeyBindingUtilsTest extends AbstractGhidraHeadedIntegrationTest {
private void selectRowForAction(DockingActionIf action) throws Exception { private void selectRowForAction(DockingActionIf action) throws Exception {
String actionName = action.getName(); String actionName = action.getName();
String owner = action.getOwnerDescription();
for (int i = 0; i < model.getRowCount(); i++) { for (int i = 0; i < model.getRowCount(); i++) {
if (actionName.equals(model.getValueAt(i, 0))) { if (actionName.equals(model.getValueAt(i, 0)) &&
owner.equals(model.getValueAt(i, 2))) {
final int idx = i; final int idx = i;
SwingUtilities.invokeAndWait(() -> { SwingUtilities.invokeAndWait(() -> {
table.setRowSelectionInterval(idx, idx); table.setRowSelectionInterval(idx, idx);

4
Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/FileChooserActionManager.java
View file

@ -44,7 +44,7 @@ class FileChooserActionManager {
} }
private void createActions() { private void createActions() {
renameAction = new DockingAction("Rename", OWNER) { renameAction = new DockingAction("Rename", OWNER, false) {
@Override @Override
public void actionPerformed(ActionContext context) { public void actionPerformed(ActionContext context) {
@ -87,7 +87,7 @@ class FileChooserActionManager {
renameAction.markHelpUnnecessary(); renameAction.markHelpUnnecessary();
chooser.addAction(renameAction); chooser.addAction(renameAction);
removeRecentAction = new DockingAction("Remove Recent", OWNER) { removeRecentAction = new DockingAction("Remove Recent", OWNER, false) {
@Override @Override
public void actionPerformed(ActionContext context) { public void actionPerformed(ActionContext context) {