commit f59b9a4e26e612e9cbe4c5440101f4772b1d324d
Author: Patrick Plitzner
Date: Fri Mar 2 11:43:49 2018 +0100
fix #6838 show labels according selected language
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeLabelProvider.java
index f436a4e83..fdbf920cb 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeLabelProvider.java
@@ -9,11 +9,16 @@
package eu.etaxonomy.taxeditor.featuretree;
+import java.util.ArrayList;
+
import org.eclipse.jface.viewers.LabelProvider;
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.Representation;
import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.description.FeatureNode;
import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
/**
*
@@ -30,10 +35,11 @@ public class FeatureTreeLabelProvider extends LabelProvider {
return ((FeatureTree) element).getTitleCache();
}else if(element instanceof FeatureNode){
Feature feature = ((FeatureNode) element).getFeature();
- if(feature != null) {
- //FIXME why is there no titleCache already in the DB?
- return feature.generateTitle();
+ Representation rep = feature.getRepresentation(PreferencesUtil.getGlobalLanguage());
+ if (rep == null){
+ rep = feature.getPreferredRepresentation(new ArrayList());
}
+ return rep != null? rep.getLabel() : feature.getTitleCache();
}
return "No label provided";