From 128891d74a44b8fac2fad9d146a1d280207a9956 Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 23 Jan 2017 15:19:15 +0100
Subject: [PATCH] Correctly set default values for EntitySelectionElements

---
 .../etaxonomy/taxeditor/ui/element/CdmFormFactory.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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 27f16fde2..137e36afd 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
@@ -902,8 +902,7 @@ public class CdmFormFactory extends FormToolkit {
     @Deprecated
     public <T extends DefinedTermBase> TermComboElement<T> createTermComboElement(Class<T> termComboType,
             ICdmFormElement parentElement, String labelString, T selection, int style) {
-        TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termComboType, labelString,
-                selection, true,  style);
+        TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termComboType, labelString, selection, true, style);
         adapt(element);
         parentElement.addElement(element);
         return element;
@@ -915,7 +914,7 @@ public class CdmFormFactory extends FormToolkit {
             String labelString,
             T selection,
             int style) {
-        return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, false, style, false);
+        return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, true, style, false);
     }
 
     public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
@@ -925,7 +924,7 @@ public class CdmFormFactory extends FormToolkit {
 			T selection,
 			boolean addEmptyElement,
 			int style) {
-        return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, addEmptyElement, style, true);
+        return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, addEmptyElement, style, false);
 	}
     public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
 			TermType termType,
@@ -945,7 +944,7 @@ public class CdmFormFactory extends FormToolkit {
             String labelString,
             T selection,
             int style) {
-        return this.createDefinedTermComboElement(null, termVocabulary, parentElement, labelString, selection, false, style, true);
+        return this.createDefinedTermComboElement(null, termVocabulary, parentElement, labelString, selection, true, style, false);
     }
 
 	public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
-- 
2.34.1