switched to cdmlib 2.0

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/EditorController.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/EditorController.java
index d746037705897d8644bf1f1a67dc882c563f4af5..4797ab9413244c952c4bd1259a2a97463b1c336e 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/EditorController.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/EditorController.java
@@ -24,7 +24,9 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;\r
 \r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.taxeditor.datasource.CdmTransactionController;\r
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;\r
 import eu.etaxonomy.taxeditor.editor.name.CdmParserController;\r
@@ -139,6 +141,22 @@ public class EditorController {
                }\r
                return null;\r
        }\r
+       \r
+       public static IEditorPart openTaxonEditor(TaxonBase taxonBase) {\r
+\r
+               Taxon taxon = null;\r
+               if (taxonBase instanceof Synonym) {\r
+                       // TODO: in case of pro parte synonym or any other where we might have multiple\r
+                       // accepted taxa we have to provide a mechanism that can deal with that\r
+                       // TODO set focus to the synonym\r
+                       taxon = (Taxon) ((Synonym) taxonBase).getAcceptedTaxa().toArray()[0];\r
+               } else {\r
+                       taxon = (Taxon) taxonBase;\r
+               }\r
+\r
+               // Open a taxon editor\r
+               return EditorController.open(taxon);\r
+       }\r
 \r
        /**\r
         * Redraws an open editor if it exists for the given taxon\r

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 137c09c54e116d67b43130fde49081a0418b018b..421f1e5e1d2d081107102a414b1f20467acadba0 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 3c25fea442c9c7c495cc25d2b30461e8f3f6748b..fe93afaac655ca0c568438736e183a99f14cb796 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
@@ -69,7 +69,7 @@ public class SearchResultView extends ViewPart {
                                        IdentifiableEntity selection = (IdentifiableEntity) ((StructuredSelection) event.getSelection()).getFirstElement();\r
                                        \r
                                        if(selection instanceof TaxonBase){\r
-                                               openTaxonEditor((TaxonBase) selection);\r
+                                               EditorController.openTaxonEditor((TaxonBase) selection);\r
                                        }\r
                                } catch (Exception e) {\r
                                        logger.error("Error opening editor from search result", e);\r
@@ -78,29 +78,11 @@ public class SearchResultView extends ViewPart {
                });\r
        }\r
 \r
-       protected void openTaxonEditor(TaxonBase taxonBase) {\r
-\r
-               Taxon taxon = null;\r
-               if (taxonBase instanceof Synonym) {\r
-                       // TODO: in case of pro parte synonym or any other where we might have multiple\r
-                       // accepted taxa we have to provide a mechanism that can deal with that\r
-                       // TODO set focus to the synonym\r
-                       taxon = (Taxon) ((Synonym) taxonBase).getAcceptedTaxa().toArray()[0];\r
-               } else {\r
-                       taxon = (Taxon) taxonBase;\r
-               }\r
-\r
-               // Open a taxon editor\r
-               EditorController.open(taxon);\r
-\r
-       }\r
-\r
        /* (non-Javadoc)\r
         * @see org.eclipse.ui.part.WorkbenchPart#setFocus()\r
         */\r
        @Override\r
        public void setFocus() {\r
-               // TODO Auto-generated method stub\r
 \r
        }\r
        private void initializeToolBar() {\r