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 'origin/GP-1453_ghidra1_XmlExportCustomProperties' into patch

Browse Source
This commit is contained in:
Ryan Kurtz
2023-02-01 07:43:14 -05:00
parent d21790b492 0ac639f504
commit 0ebd0adef2
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Ghidra/Features/Base/src/main/java/ghidra/app/util/xml/PropertiesXmlMgr.java
View File

@@ -1,6 +1,5 @@
/* ### /* ###
* IP: GHIDRA * IP: GHIDRA
* REVIEWED: YES
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -16,6 +15,15 @@
*/ */
package ghidra.app.util.xml; package ghidra.app.util.xml;
import java.awt.Color;
import java.awt.Font;
import java.io.File;
import java.util.*;
import javax.swing.KeyStroke;
import org.xml.sax.SAXParseException;
import ghidra.app.util.importer.MessageLog; import ghidra.app.util.importer.MessageLog;
import ghidra.framework.options.*; import ghidra.framework.options.*;
import ghidra.program.model.address.*; import ghidra.program.model.address.*;
@@ -28,15 +36,6 @@ import ghidra.util.xml.*;
import ghidra.xml.XmlElement; import ghidra.xml.XmlElement;
import ghidra.xml.XmlPullParser; import ghidra.xml.XmlPullParser;
import java.awt.Color;
import java.awt.Font;
import java.io.File;
import java.util.*;
import javax.swing.KeyStroke;
import org.xml.sax.SAXParseException;
class PropertiesXmlMgr { class PropertiesXmlMgr {
private final static String PROPERTY_LIST_CATEGORY_DELIMITER = Options.DELIMITER_STRING; private final static String PROPERTY_LIST_CATEGORY_DELIMITER = Options.DELIMITER_STRING;
@@ -406,7 +405,7 @@ class PropertiesXmlMgr {
case CUSTOM_TYPE: case CUSTOM_TYPE:
attrs.addAttribute("TYPE", "custom"); attrs.addAttribute("TYPE", "custom");
CustomOption custom = propList.getCustomOption(name, null); CustomOption custom = propList.getCustomOption(name, null);
xmlString = OptionType.KEYSTROKE_TYPE.convertObjectToString(custom); xmlString = OptionType.CUSTOM_TYPE.convertObjectToString(custom);
attrs.addAttribute("VALUE", XmlUtilities.escapeElementEntities(xmlString)); attrs.addAttribute("VALUE", XmlUtilities.escapeElementEntities(xmlString));
break; break;
case BYTE_ARRAY_TYPE: case BYTE_ARRAY_TYPE: