X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/1d716a84abc881cc199736d18bf1dd89d4b05b84..599261fd1ededbb954a28a2d85eee0e1a062a893:/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
index 39993d70a..02243a6cb 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
@@ -20,7 +20,6 @@ import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
@@ -67,6 +66,8 @@ public class TermComboElement<T extends DefinedTermBase>
 
 	private Comparator<T> termComparator;
 
+	private final TermType termType;
+	private final TermVocabulary termVocabulary;
 	private final Class<T> termClass;
 
 	private List<T> customPreferredTerms;
@@ -96,12 +97,9 @@ public class TermComboElement<T extends DefinedTermBase>
 	        int style) {
         super(formFactory, parentElement);
 
-        if(termClass!=null){
-            this.termClass = termClass;
-        }
-        else{
-            this.termClass =  (Class<T>) DefinedTerm.class;
-        }
+        this.termType = termType;
+        this.termVocabulary = termVocabulary;
+        this.termClass = termClass;
         this.addEmptyElement = addEmptyElement;
 
         if (labelString != null) {
@@ -265,10 +263,20 @@ public class TermComboElement<T extends DefinedTermBase>
 	 * @return a {@link java.util.List} object.
 	 */
 	protected List<T> getPreferredTerms(){
+	    List<T> preferredTerms = new ArrayList<T>();
 		if (customPreferredTerms != null){
 			return customPreferredTerms;
 		}
-		return getTermManager().getPreferredTerms(termClass);
+		else if(termType!=null){
+		    preferredTerms = getTermManager().getPreferredTerms(termType);
+		}
+		else if(termVocabulary!=null){
+		    preferredTerms = getTermManager().getPreferredTerms(termVocabulary);
+		}
+		if(termClass!=null){
+		    preferredTerms = getTermManager().getPreferredTerms(termClass);
+		}
+		return preferredTerms;
 	}
 
 	/**