mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-6783_Dan_delintTransientState--SQUASHED'
This commit is contained in:
Ryan Kurtz
2026-05-12 12:23:26 -04:00
parent 2a0613dd3f 4446724bf7
commit 944b779de3
10 changed files with 201 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/AbstractByteViewerPlugin.java
View File

@@ -21,12 +21,12 @@ import org.jdom2.Element;
import ghidra.app.events.AbstractLocationPluginEvent;
import ghidra.app.events.AbstractSelectionPluginEvent;
import ghidra.app.plugin.core.byteviewer.AbstractByteViewerPlugin.ByteViewerTransientState;
import ghidra.app.services.*;
import ghidra.framework.model.DomainFile;
import ghidra.framework.model.DomainObject;
import ghidra.framework.options.SaveState;
import ghidra.framework.plugintool.Plugin;
import ghidra.framework.plugintool.PluginTool;
import ghidra.framework.plugintool.*;
import ghidra.program.model.listing.Program;
import ghidra.program.util.ProgramLocation;
import ghidra.program.util.ProgramSelection;
@@ -34,7 +34,7 @@ import ghidra.util.SystemUtilities;
import utility.function.Callback;
public abstract class AbstractByteViewerPlugin<P extends ProgramByteViewerComponentProvider>
extends Plugin {
extends Plugin implements PluginWithTransientState<ByteViewerTransientState> {
protected Program currentProgram;
private boolean areEventsDisabled;
@@ -216,26 +216,20 @@ public abstract class AbstractByteViewerPlugin<P extends ProgramByteViewerCompon
}
}
@Override
public Object getTransientState() {
Object[] state = new Object[2];
protected record ByteViewerTransientState(SaveState ss, ProgramSelection selection) {}
@Override
public ByteViewerTransientState getTransientState() {
SaveState ss = new SaveState();
connectedProvider.writeDataState(ss);
state[0] = ss;
state[1] = connectedProvider.getCurrentSelection();
return state;
return new ByteViewerTransientState(ss, connectedProvider.getCurrentSelection());
}
@Override
public void restoreTransientState(Object objectState) {
public void restoreTransientState(ByteViewerTransientState state) {
doWithEventsDisabled(() -> {
Object[] state = (Object[]) objectState;
connectedProvider.restoreLocation((SaveState) state[0]);
connectedProvider.setSelection((ProgramSelection) state[1]);
connectedProvider.restoreLocation(state.ss);
connectedProvider.setSelection(state.selection);
});
}