switched to cdmlib 2.0

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmUtil.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmUtil.java
index 421f1e5e1d2d081107102a414b1f20467acadba0..852f9cb3cfa015313eb0d33573ff6cf9f93ddebd 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmUtil.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmUtil.java
@@ -259,7 +259,7 @@ public class CdmUtil {
                \r
                configurator.setSearchString(name.replace("*", "%"));\r
                configurator.setDoTaxa(true);\r
-//             configurator.setDoNamesWithoutTaxa(true);\r
+               configurator.setDoNamesWithoutTaxa(true);\r
                configurator.setDoSynonyms(true);\r
                configurator.setPageNumber(1);\r
                // TODO currently limit results to 1000 for now\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/SearchResultView.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/SearchResultView.java
index fe93afaac655ca0c568438736e183a99f14cb796..c37d0e033f76ab4bbfe529097e787b2d1ceb9d8f 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/SearchResultView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/SearchResultView.java
@@ -51,12 +51,16 @@ public class SearchResultView extends ViewPart {
                resultViewer.setLabelProvider(new LabelProvider() {\r
                        public String getText(Object element) {\r
                                if (element instanceof IdentifiableEntity) {\r
-                                       // TODO we want to stylize the text (color, font-style etc.)\r
-                                       if(element instanceof Taxon){\r
-                                               return "Taxon: " + ((TaxonBase) element).getTitleCache();\r
+                                       if(element instanceof TaxonBase){\r
+                                               // TODO we want to stylize the text (color, font-style etc.)\r
+                                               if(element instanceof Taxon){\r
+                                                       return "Taxon: " + ((TaxonBase) element).getTitleCache();\r
+                                               }else{\r
+                                                       return "Synonym: " + ((TaxonBase) element).getTitleCache();\r
+                                               }\r
                                        }else{\r
-                                               return "Synonym: " + ((TaxonBase) element).getTitleCache();\r
-                                       }                                       \r
+                                               return "Name: " + super.getText(element);\r
+                                       }\r
                                }\r
                                return super.getText(element);\r
                        }\r