- added derivate types to DerivateSearchView combo

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchCompositeController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchCompositeController.java
index 5fffd736f1cb844a4fd02174c64a79ac2f437f95..464389dd990024bfcec03e3bf042284f10aba328 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchCompositeController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchCompositeController.java
@@ -9,6 +9,8 @@
 */
 package eu.etaxonomy.taxeditor.ui.campanula.derivatesearch;
 
+import java.util.Arrays;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
@@ -29,6 +31,7 @@ import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.config.IdentifiableServiceConfiguratorImpl;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -52,6 +55,16 @@ public class DerivateSearchCompositeController {
     }
 
     private void init(){
+        LinkedHashMap<SpecimenOrObservationType, String> orderedTerms = AbstractUtility.orderTerms(Arrays.asList(SpecimenOrObservationType.values()));
+        String[] comboItems = new String[orderedTerms.size()];
+        int count = 0;
+        for(String termMessage:orderedTerms.values()){
+            comboItems[count] = termMessage;
+            count++;
+        }
+
+        derivateSearchComposite.getComboDerivateType().setItems(comboItems);
+
         derivateSearchComposite.getSearchField().addKeyListener(new KeyAdapter() {
             /*
              * (non-Javadoc)
@@ -89,7 +102,6 @@ public class DerivateSearchCompositeController {
 
             }
         });
-
         configurator = new IdentifiableServiceConfiguratorImpl<SpecimenOrObservationBase<DerivedUnitFacadeCacheStrategy>>();
 
     }