From: Andreas Müller <a.mueller@bgbm.org>
Date: Tue, 24 Jun 2014 14:52:32 +0000 (+0000)
Subject: improved handling for missing representation for certain language #4249
X-Git-Tag: 3.6.0~538
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/9e392c73cd2f62d59746a7a9b5b957a4fd436042

improved handling for missing representation for certain language #4249
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
index bc3e90e21..a00d87b25 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
@@ -42,19 +42,11 @@ public abstract class AbstractTermBaseDetailElement<T extends TermBase> extends
 		super(formFactory, formElement);
 	}
 	
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#createControls(eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement, java.lang.Object, int)
-	 */
 	@Override
 	protected void createControls(ICdmFormElement formElement,
 			T entity, int style) {
 		
-		Representation representation = getEntity().getRepresentation(CdmStore.getDefaultLanguage());
-		
-		if(representation == null){
-			//formFactory.createLabel(formElement, "No represantation for the current default Language, english version is used.");
-			representation = getEntity().getRepresentation(Language.ENGLISH());
-		}
+		Representation representation = getEntity().getPreferredRepresentation(CdmStore.getDefaultLanguage());
 		
 		text_label = formFactory.createTextWithLabelElement(formElement, "Label", representation.getLabel(), style);
 		text_abbreviatedLabel = formFactory.createTextWithLabelElement(formElement, "Abbrev. Label", representation.getAbbreviatedLabel(), style);