Refactoring of selection elements. Additional minor refactoring. Fixed a bug with...

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / occurrence / DerivedUnitBaseDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
index 8b4bca90649552582425c9700a7bbcdf1455fd20..8422ed5d958656970fb44e6c26698f2738505a55 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
@@ -14,17 +14,18 @@ import org.eclipse.ui.forms.widgets.Section;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException;
+import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.SelectionType;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 
 /**
  * <p>
@@ -44,7 +45,7 @@ public class DerivedUnitBaseDetailElement extends
 
        private TextWithLabelElement text_catalogNumber;
 
-       private NameSelectionElement selection_storedUnder;
+       private EntitySelectionElement<TaxonNameBase> selection_storedUnder;
 
        private TextWithLabelElement text_exsicatum;
 
@@ -54,8 +55,6 @@ public class DerivedUnitBaseDetailElement extends
 
        private SourceCollectionDetailSection section_source;
 
-       private TextWithLabelElement text_collectorsNumber;
-
        /**
         * <p>
         * Constructor for DerivedUnitBaseDetailElement.
@@ -98,10 +97,10 @@ public class DerivedUnitBaseDetailElement extends
                        // we ignore this
                        StoreUtil.info(e.getMessage());
                }
-               selection_storedUnder = (NameSelectionElement) formFactory
-                               .createSelectionElement(SelectionType.NAME,
+               selection_storedUnder = formFactory
+                               .createSelectionElement(TaxonNameBase.class,
                                                getConversationHolder(), formElement, "Stored Under",
-                                               entity.getStoredUnder(), NameSelectionElement.DEFAULT,
+                                               entity.getStoredUnder(), EntitySelectionElement.ALL,
                                                style);
 
                try {
@@ -117,14 +116,14 @@ public class DerivedUnitBaseDetailElement extends
                                                EntityDetailType.SPECIMEN_COLLECTION,
                                                getConversationHolder(), formElement, Section.TWISTIE);
                section_duplicates
-                               .setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2, 1));
+                               .setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
                section_duplicates.setEntity(entity);
 
                section_source = (SourceCollectionDetailSection) formFactory
                                .createEntityDetailSection(
                                                EntityDetailType.IDENTIFIABLE_SOURCE_COLLECTION,
                                                getConversationHolder(), formElement, Section.TWISTIE);
-               section_source.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2, 1));
+               section_source.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
                section_source.setEntity(entity);
        }