Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-18 08:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-3529_ghizard_Make_DataTypePath_comparable--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz 2023-06-09 12:22:00 -04:00
commit 427714cd85
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypePath.java
View File

@ -15,11 +15,13 @@
*/
package ghidra.program.model.data;
import java.util.Objects;
/**
* Object to hold a category path and a datatype name. They are held separately so that
* the datatype name can contain a categoryPath delimiter ("/") character.
*/
public class DataTypePath {
public class DataTypePath implements Comparable<DataTypePath> {
private final CategoryPath categoryPath;
private final String dataTypeName;
@ -43,8 +45,8 @@ public class DataTypePath {
if (dataTypeName == null || categoryPath == null) {
throw new IllegalArgumentException("null not allowed for categoryPath or datatypeName");
}
this.categoryPath = categoryPath;
this.dataTypeName = dataTypeName;
this.categoryPath = Objects.requireNonNull(categoryPath, "Category path cannot be null");
this.dataTypeName = Objects.requireNonNull(dataTypeName, "Data type name cannot be null");
}
/**
@ -125,6 +127,15 @@ public class DataTypePath {
return true;
}
@Override
public int compareTo(DataTypePath other) {
int result = categoryPath.compareTo(other.categoryPath);
if (result == 0) {
result = dataTypeName.compareTo(other.dataTypeName);
}
return result;
}
@Override
public String toString() {
return getPath();