fix doubled title in DefinedTerm Details and fix filling of menu items for multilangu...

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / descriptive / handler / DynamicFeatureMenu.java

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 d67e421692702c5a30d7b73989cc1c465d661d94..d34eee5ce87df80eb3640d7c86a33a982ab1f032 100644 (file)
--- 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