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

Fix for recent tool xml restoring change

Browse source
This commit is contained in:
dragonmacher 2025-09-26 20:03:31 -04:00
parent e8ba7c3e45
commit 6660cc75f1
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/ToolOptions.java
View file

@ -114,24 +114,32 @@ public class ToolOptions extends AbstractOptions {
private void readNonWrappedOptions(AttributedSaveState saveState) { private void readNonWrappedOptions(AttributedSaveState saveState) {
for (String optionName : saveState.getNames()) { for (String optionName : saveState.getNames()) {
Object object = saveState.getObject(optionName); Object object = saveState.getObject(optionName);
// Get the last registered date. No date implies an old xml format.
LocalDate date = LocalDate.now();
Map<String, String> attrs = saveState.getAttributes(optionName);
String dateString = attrs.get(LAST_REGISTERED_DATE_ATTIBUTE);
if (dateString != null) {
date = LocalDate.parse(dateString, LAST_REGISTERED_DATE_FORMATTER);
}
OptionType type = OptionType.getOptionType(object); OptionType type = OptionType.getOptionType(object);
Option option = createUnregisteredOption(optionName, type, null); Option option = createUnregisteredOption(optionName, type, null);
option.doSetCurrentValue(object); // use doSet versus set so that it is not registered option.doSetCurrentValue(object); // use doSet versus set so that it is not registered
LocalDate date = getLastRegisteredDateString(saveState, optionName);
option.setLastRegisteredDate(date); option.setLastRegisteredDate(date);
valueMap.put(optionName, option); valueMap.put(optionName, option);
} }
} }
private LocalDate getLastRegisteredDateString(AttributedSaveState saveState,
String optionName) {
// Get the last registered date. No date implies an old xml format.
Map<String, String> attrs = saveState.getAttributes(optionName);
if (attrs != null) {
String dateString = attrs.get(LAST_REGISTERED_DATE_ATTIBUTE);
if (dateString != null) {
return LocalDate.parse(dateString, LAST_REGISTERED_DATE_FORMATTER);
}
}
return LocalDate.now();
}
private void readWrappedOptions(Element root) throws ReflectiveOperationException { private void readWrappedOptions(Element root) throws ReflectiveOperationException {
Iterator<?> it = root.getChildren(WRAPPED_OPTION_NAME).iterator(); Iterator<?> it = root.getChildren(WRAPPED_OPTION_NAME).iterator();