From 6a724016f3c635b6738b80d4e874fdefbbcbfe42 Mon Sep 17 00:00:00 2001
From: "n.hoffmann" <n.hoffmann@localhost>
Date: Tue, 22 Dec 2009 12:11:04 +0000
Subject: [PATCH] fixes #1348

---
 .../termcombos/AbstractTermComboComposite.java      | 13 ++++++++++++-
 .../forms/termcombos/LanguageComboComposite.java    | 11 ++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/termcombos/AbstractTermComboComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/termcombos/AbstractTermComboComposite.java
index 313625753..bf4573e6f 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/termcombos/AbstractTermComboComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/termcombos/AbstractTermComboComposite.java
@@ -106,7 +106,7 @@ public abstract class AbstractTermComboComposite<T extends DefinedTermBase> exte
 		if(termComparator != null)
 			Collections.sort(preferredTerms, termComparator);
 		for (T term : preferredTerms) {
-			String label = term.getLabel(CdmStore.getDefaultLanguage()); 
+			String label = getLabel(term); 
 			if (label == null) {
 				logger.warn("No label for " + term + " - not added to combo");
 				continue;
@@ -143,6 +143,17 @@ public abstract class AbstractTermComboComposite<T extends DefinedTermBase> exte
 	 * @return
 	 */
 	protected abstract List<T> preferredTerms();
+	
+	/**
+	 * May be overridden by derived classes if the desired label string does not
+	 * reside in term.getLabel();
+	 * 
+	 * @param term
+	 * @return
+	 */
+	protected String getLabel(T term){
+		return term.getLabel(CdmStore.getDefaultLanguage());
+	}
 
 	private void createTermNotInPreferredTerms(T term) {
 		
diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/termcombos/LanguageComboComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/termcombos/LanguageComboComposite.java
index 14b83638f..424b59d04 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/termcombos/LanguageComboComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/termcombos/LanguageComboComposite.java
@@ -10,9 +10,10 @@ import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
- * @author nho
+ * @author n.hoffmann
  *
  */
 public class LanguageComboComposite extends AbstractTermComboComposite<Language> {
@@ -37,4 +38,12 @@ public class LanguageComboComposite extends AbstractTermComboComposite<Language>
 	protected List<Language> preferredTerms() {
 		return PreferencesUtil.getPreferredLanguages();
 	}
+	
+	/* (non-Javadoc)
+	 * @see eu.etaxonomy.taxeditor.forms.termcombos.AbstractTermComboComposite#getLabel(eu.etaxonomy.cdm.model.common.DefinedTermBase)
+	 */
+	@Override
+	protected String getLabel(Language term) {
+		return term.getDescription(CdmStore.getDefaultLanguage());
+	}
 }
-- 
2.34.1