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

Merge remote-tracking branch

Browse source 
'origin/GT-3411-dragonmacher-dt-keybindings' (fixes #1355)
This commit is contained in:
Ryan Kurtz 2019-12-27 13:03:33 -05:00
commit cbe5b9e9ca
38 changed files with 575 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import java.awt.Color;
import java.awt.Font;
import java.beans.PropertyEditor;
import java.io.File;
import java.lang.reflect.Constructor;
import java.util.*;
import javax.swing.KeyStroke;
@ -98,9 +99,9 @@ public class ToolOptions extends AbstractOptions {
try {
Element elem = (Element) iter.next();
String optionName = elem.getAttributeValue("NAME");
Class<?> c = Class.forName(elem.getAttributeValue("CLASS"));
WrappedOption wo = (WrappedOption) c.newInstance();
Constructor<?> constructor = c.getDeclaredConstructor();
WrappedOption wo = (WrappedOption) constructor.newInstance();
wo.readState(new SaveState(elem));
Option option = createUnregisteredOption(optionName, wo.getOptionType(), null);
option.doSetCurrentValue(wo.getObject());// use doSet versus set so that it is not registered