public int compare(UuidAndTitleCache entity1,
UuidAndTitleCache entity2) {
Collator collator = Collator.getInstance();
- return collator.compare(entity1.getAbbrevTitleCache(), entity2.getAbbrevTitleCache());
+ String compareString1 = "";
+ if (entity1.getAbbrevTitleCache() != null){
+ compareString1 = entity1.getAbbrevTitleCache();
+ }
+ if (entity1.getTitleCache() != null){
+ compareString1 += entity1.getTitleCache();
+ }
+
+
+ String compareString2 = "";
+ if (entity2.getAbbrevTitleCache() != null){
+ compareString2 = entity2.getAbbrevTitleCache();
+ }
+ if (entity2.getTitleCache() != null){
+ compareString2 += entity2.getTitleCache();
+ }
+
+
+ return collator.compare(compareString1, compareString2);
}
};
}