X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/360810ab7ecc45e9bf8d58205fa68525025295b9..e6e8883ab64ca425c7cd2a15ecbe3cfd0bb30f48:/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java?ds=sidebyside

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java
index 5c5ea7248..a1b051415 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java
@@ -71,16 +71,20 @@ public class StateDataElement extends AbstractEntityCollectionElement<StateData>
 		combo_state.setTerms(stateTerms);
 		combo_state.setSelection(entity.getState());
 		section_modifiers.setEntity(entity);
+		section_modifiers.setExpanded(!entity.getModifiers().isEmpty());
 		if(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {
             text_modifyingText.setText(getEntity().getModifyingText().get(CdmStore.getDefaultLanguage()).getText());
         }
+		if(getEntity().getId()>0){
+		    combo_state.removeEmptyElement();
+		}
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public void createControls(ICdmFormElement element, int style) {
-		combo_state = formFactory.createDefinedTermComboElement(TermType.State, element, "State", null, false, style);
-		section_modifiers = formFactory.createModifierSection(getConversationHolder(), element, ExpandableComposite.TWISTIE);
+		combo_state = formFactory.createDefinedTermComboElement(TermType.State, element, "State", null, style);
+		section_modifiers = formFactory.createModifierSection(getConversationHolder(), element, ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED);
 		section_modifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
 		text_modifyingText = formFactory.createTextWithLabelElement(element, "Modifying Text", null, style);
 	}
@@ -90,6 +94,7 @@ public class StateDataElement extends AbstractEntityCollectionElement<StateData>
 	public void handleEvent(Object eventSource) {
 		if(eventSource == combo_state){
 			getEntity().setState(combo_state.getSelection());
+			combo_state.removeEmptyElement();
 		}
 		if(eventSource == text_modifyingText){
 			getEntity().putModifyingText(LanguageString.NewInstance(text_modifyingText.getText(), CdmStore.getDefaultLanguage()));