mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-19 16:40:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GT-3225_ghidravore_tree_filtering'

Browse Source
This commit is contained in:
Ryan Kurtz
2019-10-24 08:40:24 -04:00
parent f6462ebdf3 5c6b32714c
commit 7b76afee93
137 changed files with 2834 additions and 3081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FunctionBitPatternsGTreeNode.java
View File

@@ -15,12 +15,11 @@
*/
package ghidra.bitpatterns.info;
import java.util.Collections;
import java.util.List;
import java.util.*;
import javax.swing.Icon;
import docking.widgets.tree.AbstractGTreeNode;
import docking.widgets.tree.GTreeNode;
import docking.widgets.tree.GTreeNode;
import resources.ResourceManager;
@@ -29,7 +28,7 @@ import resources.ResourceManager;
* An object of this class represents a node in a tree of instruction sequences.
*
*/
public class FunctionBitPatternsGTreeNode extends AbstractGTreeNode {
public class FunctionBitPatternsGTreeNode extends GTreeNode {
private static final Icon DISABLED_ICON = ResourceManager.loadImage("images/ledred.png");
@@ -65,7 +64,7 @@ public class FunctionBitPatternsGTreeNode extends AbstractGTreeNode {
for (GTreeNode node : getChildren()) {
((FunctionBitPatternsGTreeNode) node).sortAndSetFields();
}
List<GTreeNode> children = getChildren();
List<GTreeNode> children = new ArrayList<>(getChildren());
Collections.sort(children);
setChildren(children);
//now set isLeaf

9
Ghidra/Features/BytePatterns/src/main/java/ghidra/bitpatterns/info/FunctionBitPatternsGTreeRootNode.java
View File

@@ -15,12 +15,11 @@
*/
package ghidra.bitpatterns.info;
import java.util.Collections;
import java.util.List;
import java.util.*;
import javax.swing.Icon;
import docking.widgets.tree.AbstractGTreeRootNode;
import docking.widgets.tree.GTreeNode;
import docking.widgets.tree.GTreeNode;
/**
@@ -30,7 +29,7 @@ import docking.widgets.tree.GTreeNode;
*
*/
public class FunctionBitPatternsGTreeRootNode extends AbstractGTreeRootNode {
public class FunctionBitPatternsGTreeRootNode extends GTreeNode {
@Override
public String getName() {
@@ -54,7 +53,7 @@ public class FunctionBitPatternsGTreeRootNode extends AbstractGTreeRootNode {
for (GTreeNode node : getChildren()) {
((FunctionBitPatternsGTreeNode) node).sortAndSetFields();
}
List<GTreeNode> children = getChildren();
List<GTreeNode> children = new ArrayList<>(getChildren());
Collections.sort(children);
setChildren(children);
}