also add null check in comparator of nomenclaturalReferenceSelectionDialog

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / dialog / selection / NomenclaturalReferenceSelectionDialog.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalReferenceSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalReferenceSelectionDialog.java
index e61943255dd5e209ff5ab037ef1bd9a0c7135424..b112fe4de42944c6adc2fff62adcca2e191760c2 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalReferenceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalReferenceSelectionDialog.java
@@ -157,18 +157,20 @@ public class NomenclaturalReferenceSelectionDialog extends
                        public int compare(UuidAndTitleCache entity1,
                                        UuidAndTitleCache entity2) {
                                Collator collator = Collator.getInstance();
-                               String compareString1 = null;
-                               if (entity1.getAbbrevTitleCache() == null){
-                                       compareString1 = entity1.getTitleCache();
-                               }else{
+                               String compareString1 = "";
+                               if (entity1.getAbbrevTitleCache() != null){
                                        compareString1 = entity1.getAbbrevTitleCache();
                                }
-                               String compareString2 = null;
-                               if (entity2.getAbbrevTitleCache() == null){
-                                       compareString2 = entity2.getTitleCache();
-                               }else{
+                               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);
                        }
                };