From: Katja Luther <k.luther@bgbm.org>
Date: Wed, 29 Jun 2016 09:00:11 +0000 (+0200)
Subject: fix doubled title in DefinedTerm Details and fix filling of menu items for multilangu... 
X-Git-Tag: 4.2.0^2~23
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/0238c919a209b9b50be7595a873a70875a5301d5

fix doubled title in DefinedTerm Details and fix filling of menu items for multilanguage support
---

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java
index d67e42169..d34eee5ce 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java
@@ -105,10 +105,14 @@ public class DynamicFeatureMenu extends CompoundContributionItem {
 
 	private void createMenuItem(Menu menu, final Feature feature) {
 		MenuItem menuItem = new MenuItem(menu, -1);
-		final Feature deproxiedFeature = (Feature) HibernateProxyHelper
-				.deproxy(feature);
-
-		menuItem.setText(deproxiedFeature.getLabel());
+		final Feature deproxiedFeature = HibernateProxyHelper.deproxy(feature, Feature.class);
+				
+		String label = deproxiedFeature.getLabel(PreferencesUtil.getGlobalLanguage());
+		if (label == null){
+			menuItem.setText(deproxiedFeature.getLabel());
+		}else{
+			menuItem.setText(label);
+		}
 		menuItem.addSelectionListener(new SelectionListener() {
 
 			@Override
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java
index 29e251f6a..3f19c7543 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java
@@ -44,13 +44,13 @@ public class DefinedTermDetailSection<T extends DefinedTermBase> extends Abstrac
 	 */
 	@Override
 	public String getHeading() {
-		String result = null;
+		/*String result = null;
 		result = getEntity() != null ? getEntity().getLabel() : "";
 		if (result == null){
 			result = getEntity().getTitleCache();
-		} 
+		} */
 		
-		return "Defined Term: "+ result;
+		return "Defined Term ";//+ result;
 	}
 
 	//FIXME clean up create element methods