Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 06:41:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-20220712-1'

Browse Source
This commit is contained in:
Ryan Kurtz
2022-07-12 13:40:41 -04:00
parent 3f351eed41 1134981d4c
commit cf63740630
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectTreeModel.java
+16 -1
View File
@@ -26,6 +26,7 @@ import docking.widgets.tree.GTreeLazyNode;
import docking.widgets.tree.GTreeNode; import docking.widgets.tree.GTreeNode;
import ghidra.app.plugin.core.debug.gui.DebuggerResources; import ghidra.app.plugin.core.debug.gui.DebuggerResources;
import ghidra.dbg.target.*; import ghidra.dbg.target.*;
import ghidra.framework.model.DomainObjectClosedListener;
import ghidra.trace.database.DBTraceUtils; import ghidra.trace.database.DBTraceUtils;
import ghidra.trace.model.Trace; import ghidra.trace.model.Trace;
import ghidra.trace.model.Trace.TraceObjectChangeType; import ghidra.trace.model.Trace.TraceObjectChangeType;
@@ -37,7 +38,8 @@ import utilities.util.IDKeyed;
public class ObjectTreeModel implements DisplaysModified { public class ObjectTreeModel implements DisplaysModified {
class ListenerForChanges extends TraceDomainObjectListener { class ListenerForChanges extends TraceDomainObjectListener
implements DomainObjectClosedListener {
public ListenerForChanges() { public ListenerForChanges() {
listenFor(TraceObjectChangeType.CREATED, this::objectCreated); listenFor(TraceObjectChangeType.CREATED, this::objectCreated);
listenFor(TraceObjectChangeType.VALUE_CREATED, this::valueCreated); listenFor(TraceObjectChangeType.VALUE_CREATED, this::valueCreated);
@@ -45,6 +47,11 @@ public class ObjectTreeModel implements DisplaysModified {
listenFor(TraceObjectChangeType.VALUE_LIFESPAN_CHANGED, this::valueLifespanChanged); listenFor(TraceObjectChangeType.VALUE_LIFESPAN_CHANGED, this::valueLifespanChanged);
} }
@Override
public void domainObjectClosed() {
setTrace(null);
}
protected boolean isEventValue(TraceObjectValue value) { protected boolean isEventValue(TraceObjectValue value) {
if (!value.getParent() if (!value.getParent()
.getTargetSchema() .getTargetSchema()
@@ -174,6 +181,11 @@ public class ObjectTreeModel implements DisplaysModified {
} }
return byObject.get(new IDKeyed<>(object)); return byObject.get(new IDKeyed<>(object));
} }
public void invalidate() {
byObject.clear();
byValue.clear();
}
} }
public abstract class AbstractNode extends GTreeLazyNode { public abstract class AbstractNode extends GTreeLazyNode {
@@ -600,12 +612,14 @@ public class ObjectTreeModel implements DisplaysModified {
protected void removeOldListeners() { protected void removeOldListeners() {
if (trace != null) { if (trace != null) {
trace.removeListener(listenerForChanges); trace.removeListener(listenerForChanges);
trace.removeCloseListener(listenerForChanges);
} }
} }
protected void addNewListeners() { protected void addNewListeners() {
if (trace != null) { if (trace != null) {
trace.addListener(listenerForChanges); trace.addListener(listenerForChanges);
trace.addCloseListener(listenerForChanges);
} }
} }
@@ -616,6 +630,7 @@ public class ObjectTreeModel implements DisplaysModified {
} }
protected void reload() { protected void reload() {
nodeCache.invalidate();
root.unloadChildren(); root.unloadChildren();
} }
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerModulesProviderTest.java
+1 -1
View File
@@ -232,7 +232,7 @@ public class DebuggerModulesProviderTest extends AbstractGhidraHeadedDebuggerGUI
waitForDomainObject(program); waitForDomainObject(program);
waitForPass(() -> assertEquals(4, modulesProvider.sectionTable.getRowCount())); waitForPass(() -> assertEquals(4, modulesProvider.sectionTable.getRowCount()));
modulesProvider.setSelectedSections(Set.of(secExeText)); runSwing(() -> modulesProvider.setSelectedSections(Set.of(secExeText)));
performAction(modulesProvider.actionMapSections, false); performAction(modulesProvider.actionMapSections, false);
DebuggerSectionMapProposalDialog propDialog = DebuggerSectionMapProposalDialog propDialog =