development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-11-05 18:30:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
ghidra1 2022-01-05 22:41:57 -05:00
commit a290a4c8ae
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsTreeNode.java
View file

@ -144,6 +144,10 @@ class OptionsTreeNode extends GTreeLazyNode {
if (obj.getClass() != getClass()) {
return false;
}
return getName().equals(((OptionsTreeNode) obj).getName());
OptionsTreeNode other = (OptionsTreeNode) obj;
if (!getName().equals(other.getName())) {
return false;
}
return Objects.equals(options, other.options);
}
}

23
Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/SubOptions.java
View file

@ -368,4 +368,27 @@ public class SubOptions implements Options {
Set<String> leaves = AbstractOptions.getLeaves(optionPaths);
return new ArrayList<String>(leaves);
}
@Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
}
if (obj == null) {
return false;
}
if (obj.getClass() != getClass()) {
return false;
}
SubOptions other = (SubOptions) obj;
if (!options.equals(other.options)) {
return false;
}
return prefix.equals(other.prefix);
}
@Override
public int hashCode() {
return prefix.hashCode();
}
}