development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-10-04 01:15:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_ghizard_master_20240227_CategoryPath_changes'

Browse source
This commit is contained in:
Ryan Kurtz 2024-02-27 10:59:57 -05:00
parent 58f1f01799 2fc8f67835
commit 34a9be906b
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/CategoryPath.java
View file

@ -229,7 +229,7 @@ public class CategoryPath implements Comparable<CategoryPath> {
/**
* Return the {@link String} representation of this category path including the category name,
* where components are delimited with a forward slash. Any occurance of a forward slash
* where components are delimited with a forward slash. Any occurrence of a forward slash
* within individual path components will be escaped (e.g., {@code "\/"}).
* @return the full category path
*/
@ -241,9 +241,9 @@ public class CategoryPath implements Comparable<CategoryPath> {
}
/**
* Return the {@link String} representation of the specified {@code childName} within this
* category path where all path components are delimited with a forward slash. Any occurance
* of a forward slash within individual path components, including the {@code childName}, will
* Return the {@link String} representation of the specified {@code childName} within this
* category path where all path components are delimited with a forward slash. Any occurrence
* of a forward slash within individual path components, including the {@code childName}, will
* be escaped (e.g., {@code "\/"}).
* @param childName child name
* @return full path for a child within this category
@ -307,7 +307,7 @@ public class CategoryPath implements Comparable<CategoryPath> {
*/
public boolean isAncestorOrSelf(CategoryPath candidateAncestorPath) {
// Result categoryPath This
// Result candidateAncestor This
// ------ --------------------- ------------------------
// True / /
// True / /apple
@ -344,12 +344,12 @@ public class CategoryPath implements Comparable<CategoryPath> {
*/
@Override
public int compareTo(CategoryPath other) {
if (isRoot() && other.isRoot()) {
return 0;
if (isRoot()) {
return other.isRoot() ? 0 : -1;
}
if (isRoot() || other.isRoot()) {
return isRoot() ? -1 : 1;
if (other.isRoot()) {
return 1;
}
int result = parent.compareTo(other.getParent());