From e8617cf03df8b87d9a05a7fe958df89fdd2f0c6e Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Wed, 28 Aug 2019 09:59:29 +0200
Subject: [PATCH] ref #8475 Remove empty element after first feature selection

---
 .../etaxonomy/taxeditor/ui/element/CdmFormFactory.java   | 9 +++++++++
 .../ui/section/feature/FeatureStateWizardPage.java       | 1 +
 2 files changed, 10 insertions(+)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index 39ce4598c..37d59873d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -944,6 +944,15 @@ public class CdmFormFactory extends FormToolkit {
             int style) {
         return  this.createDefinedTermComboElement(null, null, terms, parentElement, labelString, selection, true, style, false, null);
     }
+	public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
+	        List<T> terms,
+	        ICdmFormElement parentElement,
+	        String labelString,
+	        T selection,
+	        boolean addEmptyElement,
+	        int style) {
+	    return  this.createDefinedTermComboElement(null, null, terms, parentElement, labelString, selection, addEmptyElement, style, false, null);
+	}
     public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
 			TermType termType,
 			ICdmFormElement parentElement,
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java
index f4b114bc4..8ffdf45d6 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java
@@ -149,6 +149,7 @@ public class FeatureStateWizardPage extends AbstractEntityCollectionElementWizar
         if(event.getSource()==comboFeature){
             Feature feature = comboFeature.getSelection();
             updateStateCombo(feature);
+            comboFeature.removeEmptyElement();
         }
         getWizard().getContainer().updateButtons();
     }
-- 
2.34.1