ref #8475 Remove empty element after first feature selection

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 39ce4598c576824facd341323b56de22c2e2fef2..37d59873d72634d2dfb1c8717d07428cdc751883 100644 (file)
--- 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 f4b114bc4575b248c0d0b68c14df0aa6a7a0e80b..8ffdf45d6f5b2b0e9e6c7e9d7f440fd01ed72ca3 100644 (file)
--- 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();
     }