mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Test fixes

Browse Source
This commit is contained in:
dragonmacher
2024-09-10 16:59:44 -04:00
committed by Ryan Kurtz
parent 30d7c9b38d
commit 328b4d03ff
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/archive/DataTypeIndexer.java
View File

@@ -119,31 +119,37 @@ public class DataTypeIndexer {
// which depended on how the binary search traversed the list. If there is a reason to use that // which depended on how the binary search traversed the list. If there is a reason to use that
// comparator over this one, then we need to re-think how this list is sorted. // comparator over this one, then we need to re-think how this list is sorted.
private class CaseInsensitiveDataTypeComparator implements Comparator<DataType> { private class CaseInsensitiveDataTypeComparator implements Comparator<DataType> {
@Override @Override
public int compare(DataType dt1, DataType dt2) { public int compare(DataType dt1, DataType dt2) {
String name1 = dt1.getName(); String name1 = dt1.getName();
String name2 = dt2.getName(); String name2 = dt2.getName();
// if the names are the same, then sort by the path int result = name1.compareToIgnoreCase(name2);
if (name1.equalsIgnoreCase(name2)) { if (result != 0) {
return result;
if (!name1.equals(name2)) {
// let equivalent names be sorted by case ('-' for lower-case first)
return -name1.compareTo(name2);
} }
result = name1.compareTo(name2);
if (result != 0) {
// let equivalent names be sorted by case ('-' for lower-case first)
return -result;
}
// if the names are the same, then sort by data type manager
String dtmName1 = dt1.getDataTypeManager().getName(); String dtmName1 = dt1.getDataTypeManager().getName();
String dtmName2 = dt2.getDataTypeManager().getName(); String dtmName2 = dt2.getDataTypeManager().getName();
result = dtmName1.compareToIgnoreCase(dtmName2);
if (result != 0) {
return result;
}
// if they have the same name, and are in the same DTM, then compare paths // if they have the same name, and are in the same DTM, then compare paths
if (dtmName1.equalsIgnoreCase(dtmName2)) { CategoryPath cp1 = dt1.getCategoryPath();
return dt1.getPathName().compareToIgnoreCase(dt2.getPathName()); CategoryPath cp2 = dt2.getCategoryPath();
} String p1 = cp1.getPath();
String p2 = cp2.getPath();
return dtmName1.compareToIgnoreCase(dtmName2); return p1.compareToIgnoreCase(p2);
}
return name1.compareToIgnoreCase(name2);
} }
} }