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

GP-1765 - Fixed sometimes incorrect Find Dialog result highlighting

Browse source
This commit is contained in:
dragonmacher 2022-03-03 18:42:23 -05:00
parent 026fad27ab
commit 68b7f88063
7 changed files with 534 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Framework/Docking/src/main/java/docking/widgets/FindDialog.java
View file

@ -136,6 +136,14 @@ public class FindDialog extends DialogComponentProvider {
textField.setText("");
}
public void next() {
doSearch(true);
}
public void previous() {
doSearch(false);
}
private void doSearch(boolean forward) {
if (!nextButton.isEnabled()) {

6
Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/FindDialogTest.java
View file

@ -21,7 +21,7 @@ import java.util.List;
import org.junit.Test;
import generic.test.AbstractGenericTest;
import ghidra.util.Swing;
public class FindDialogTest {
@ -32,8 +32,8 @@ public class FindDialogTest {
findDialog.setHistory(List.of("search1"));
String searchText = "search"; // a prefix of an existing history entry
findDialog.setSearchText(searchText);
assertEquals(searchText, AbstractGenericTest.runSwing(() -> findDialog.getSearchText()));
Swing.runNow(() -> findDialog.setSearchText(searchText));
assertEquals(searchText, Swing.runNow(() -> findDialog.getSearchText()));
}
private class DummySearcher implements FindDialogSearcher {