ref 6061: using * at the beginning of search pattern triggers a search on abbrevTitle...

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java
index baad25d457b4510f88f30aa531799b6c88e86a32..7fb99183a2a453c205df9013a14912fd8daa6ef7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java
@@ -188,17 +188,21 @@ public class NomenclaturalAuthorSelectionDialog extends AgentSelectionDialog {
 
                        @Override
                        public boolean matchItem(Object item) {
-                               String text = null;
+                               String textTitleCache = null;
+                               String abbrevTitleCache = null;
                                if(item instanceof UuidAndTitleCache){
                                        if (((UuidAndTitleCache) item).getAbbrevTitleCache() != null){
-                                               text = ((UuidAndTitleCache) item).getAbbrevTitleCache();
-                                       } else{
-                                               text = ((UuidAndTitleCache) item).getTitleCache();
+                                               abbrevTitleCache = ((UuidAndTitleCache) item).getAbbrevTitleCache();
+                                       } 
+                                       if (((UuidAndTitleCache) item).getTitleCache() != null ){
+                                               textTitleCache = ((UuidAndTitleCache) item).getTitleCache();
                                        }
                                }else if(item instanceof String){
-                                       text = (String) item;
+                                       textTitleCache = (String) item;
                                }
-                               return text != null ? matches(text) : false;
+                               
+                               return  (matches(textTitleCache) || matches(abbrevTitleCache)) ;
+                               
                        }
 
                };