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

Merge remote-tracking branch 'origin/GP-1-dragonmacher-dt-filter-updates--SQUASHED'

Browse source
This commit is contained in:
ghidra1 2025-05-08 17:48:06 -04:00
commit 9a7d3eb93f
11 changed files with 545 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/GProperties.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -494,9 +494,7 @@ public class GProperties {
*/
public Element saveToXml() {
Element root = new Element(propertiesName);
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String key = iter.next();
for (String key : map.keySet()) {
Object value = map.get(key);
Element elem = createElement(key, value);
root.addContent(elem);
@ -638,9 +636,7 @@ public class GProperties {
JsonObject types = new JsonObject();
JsonObject values = new JsonObject();
JsonObject enumClasses = new JsonObject();
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
String key = iter.next();
for (String key : map.keySet()) {
Object value = map.get(key);
if (value == null) {
types.addProperty(key, "null");
@ -835,15 +831,22 @@ public class GProperties {
}
/**
* Return the names of the properties in this GProperties.
* @return the names of the properties in this GProperties.
* Returns the name of this GProperties
* @return the name of this GProperties
*/
public String getName() {
return propertiesName;
}
/**
* Return the names of the properties in this GProperties
* @return the names of the properties in this GProperties
*/
public String[] getNames() {
String[] names = new String[map.size()];
int idx = 0;
Iterator<String> iter = map.keySet().iterator();
while (iter.hasNext()) {
names[idx] = iter.next();
for (String element : map.keySet()) {
names[idx] = element;
++idx;
}
return names;

5
Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/SaveState.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -114,6 +114,7 @@ public class SaveState extends XmlProperties {
return getAsType(name, null, SaveState.class);
}
@Override
protected void processElement(Element element) {
String tag = element.getName();