Merge branch 'release/5.28.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / vocabulary / RecommendedModifierVocabulariesElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesElement.java
index 2bae0dcb108c4d7a315881d64021a9b53432384f..a2a35edc5e06990428b23d71c235195b02d3dd80 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesElement.java
@@ -49,12 +49,15 @@ public class RecommendedModifierVocabulariesElement extends AbstractEntityCollec
     @Override
     public void createControls(ICdmFormElement element, int style) {
         comboStateVocabulary = formFactory.createVocabularyComboElement(TermType.Modifier, "Modifier Vocabulary", null, element, style);
+        if (entity != null){
+               setEntity(entity);
+        }
     }
 
     @Override
     public void setEntity(TermVocabulary<DefinedTerm> entity) {
         this.entity = entity;
-        if(entity.getId()!=0){
+        if(entity.getId()!=0 && comboStateVocabulary != null){
             comboStateVocabulary.setSelection(entity);
             comboStateVocabulary.removeEmptyElement();
         }