ref #10222 adapt taxeditor to changes (DerivedUnitFacade and CondensedDistributionRec...

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
index 51c0c9135f8a3c26aecf06e0ef9c0893f1baeee2..2f85aefa262dd98492ed4532f0f5fa49d711beb6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
@@ -53,20 +53,22 @@ public class DeterminationEventDetailElement
        @Override
        public void setEntity(DeterminationEvent entity) {
                this.entity = entity;
-               combo_determinationModifier.setSelection(entity.getModifier());
-               selection_taxonBase.setEntity(entity.getTaxon());
-               selectionTaxonNameBase.setEntity(entity.getTaxonName());
+               if (combo_determinationModifier != null){
+                       combo_determinationModifier.setSelection(entity.getModifier());
+                       selection_taxonBase.setEntity(entity.getTaxon());
+                       selectionTaxonNameBase.setEntity(entity.getTaxonName());
+               }
                super.setEntity(entity);
        }
 
        @Override
        public void createControls(ICdmFormElement element, int style) {
            selectionTaxonNameBase = formFactory
-                   .createSelectionElement(TaxonName.class,//getConversationHolder(),
+                   .createSelectionElement(TaxonName.class,
                             element, "Taxon Name", null,
                            EntitySelectionElement.ALL, style);
                selection_taxonBase = formFactory
-                               .createSelectionElement(TaxonBase.class,//getConversationHolder(),
+                               .createSelectionElement(TaxonBase.class,
                                                 element, "Taxon", null,
                                                EntitySelectionElement.ALL, style);
 
@@ -80,6 +82,11 @@ public class DeterminationEventDetailElement
 
                combo_determinationModifier = formFactory.createDefinedTermComboElement(TermType.DeterminationModifier,
                                element, "Modifier", null, style);
+               if (entity != null){
+                       combo_determinationModifier.setSelection(entity.getModifier());
+                       selection_taxonBase.setEntity(entity.getTaxon());
+                       selectionTaxonNameBase.setEntity(entity.getTaxonName());
+               }
        }
 
        @Override