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

GP-628 - Dialogs - test of greatly simplified parenting code

Browse source
This commit is contained in:
dragonmacher 2021-01-29 14:31:16 -05:00
parent d8166ff6ec
commit b956870432
13 changed files with 242 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/ProgramDiffPlugin.java
View file

@ -190,7 +190,7 @@ public class ProgramDiffPlugin extends ProgramPlugin
ProgramLocation p1Loc = p2Loc;
if (p2LocationAddress.getAddressSpace().isOverlaySpace()) {
ProgramLocation equivalentP1Loc = DiffUtility
.getCompatibleProgramLocation(secondaryDiffProgram, p2Loc, primaryProgram);
.getCompatibleProgramLocation(secondaryDiffProgram, p2Loc, primaryProgram);
if (equivalentP1Loc != null) {
AddressSpace p2Space = p2LocationAddress.getAddressSpace();
AddressSpace p1Space = equivalentP1Loc.getAddress().getAddressSpace();
@ -465,7 +465,7 @@ public class ProgramDiffPlugin extends ProgramPlugin
diffControl.setLocation(previousP1Location.getAddress());
}
ProgramLocation previousP1LocationAsP2 = DiffUtility
.getCompatibleProgramLocation(primaryProgram, location, secondaryDiffProgram);
.getCompatibleProgramLocation(primaryProgram, location, secondaryDiffProgram);
if (previousP1LocationAsP2 != null) {
diffListingPanel.setCursorPosition(previousP1LocationAsP2);
}
@ -804,8 +804,8 @@ public class ProgramDiffPlugin extends ProgramPlugin
AddressSet p2SelectionAsP1 =
DiffUtility.getCompatibleAddressSet(p2Selection, primaryProgram);
AddressSet p1ApplySet = p2SelectionAsP1.intersect(p1ViewAddrSet)
.subtract(addressesOnlyInP1)
.subtract(compatibleOnlyInP2);
.subtract(addressesOnlyInP1)
.subtract(compatibleOnlyInP2);
if (p1ApplySet.isEmpty()) {
Msg.showInfo(getClass(), tool.getToolFrame(), "Apply Differences",
(p2Selection.isEmpty()) ? "No diff selection in the current view."
@ -1882,7 +1882,7 @@ public class ProgramDiffPlugin extends ProgramPlugin
}
}
catch (CancelledException e) {
// For now do nothing if user cancels, the Diff.
// For now do nothing if user cancels
}
monitor.setMessage("");

1
Ghidra/Features/ProgramDiff/src/test.slow/java/ghidra/app/plugin/core/diff/DualProgramTest.java
View file

@ -204,6 +204,7 @@ public class DualProgramTest extends DiffTestAdapter {
TreeTestUtils.selectTreeNodeByText(tree, "OtherProgram");
pressButton(win, "OK");
waitForTasks();
win = waitForWindow("No Memory In Common");
assertNotNull(win);
MultiLineLabel mll = findComponent(win, MultiLineLabel.class);