mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-10-22 18:22:23 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_ghidragon_move_SaveState_to_generic'

Browse Source
This commit is contained in:
ghidra1
2023-02-03 17:26:34 -05:00
parent 2103924d71 8d210b232b
commit 2075df60fb
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Ghidra/Framework/Gui/src/main/java/ghidra/framework/options/SaveState.java → Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/SaveState.java
View File

@@ -250,8 +250,7 @@ public class SaveState {
boolean[] vals = new boolean[list.size()];
while (it.hasNext()) {
Element e = (Element) it.next();
vals[i++] =
Boolean.valueOf(e.getAttributeValue(VALUE)).booleanValue();
vals[i++] = Boolean.valueOf(e.getAttributeValue(VALUE)).booleanValue();
}
map.put(name, vals);
}
@@ -566,9 +565,8 @@ public class SaveState {
else if (value instanceof KeyStroke) {
elem = setAttributes(key, "KeyStroke", value.toString());
}
else if (value instanceof Font) {
elem =
setAttributes(key, "Font", OptionType.FONT_TYPE.convertObjectToString(value));
else if (value instanceof Font font) {
elem = setAttributes(key, "Font", toFontString(font));
}
else if (value instanceof byte[]) {
elem = new Element("BYTES");
@@ -682,9 +680,9 @@ public class SaveState {
types.addProperty(key, "KeyStroke");
values.addProperty(key, value.toString());
}
else if (value instanceof Font) {
else if (value instanceof Font font) {
types.addProperty(key, "Font");
values.addProperty(key, OptionType.FONT_TYPE.convertObjectToString(value));
values.addProperty(key, toFontString(font));
}
else if (value instanceof Byte) {
types.addProperty(key, "byte");
@@ -1436,4 +1434,22 @@ public class SaveState {
return true;
}
private String toFontString(Font font) {
return String.format("%s-%s-%s", font.getName(), getStyleString(font), font.getSize());
}
private String getStyleString(Font font) {
boolean bold = font.isBold();
boolean italic = font.isItalic();
if (bold && italic) {
return "BOLDITALIC";
}
if (bold) {
return "BOLD";
}
if (italic) {
return "ITALIC";
}
return "PLAIN";
}
}