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

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

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 29e251f6a510cd044dd69858b72b3f50106faaf1..3f19c7543bef9e088a0742b2c7707d58d7cc7c9c 100644 (file)
--- 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
         */\r
        @Override\r
        public String getHeading() {\r
-               String result = null;\r
+               /*String result = null;\r
                result = getEntity() != null ? getEntity().getLabel() : "";\r
                if (result == null){\r
                        result = getEntity().getTitleCache();\r
-               } \r
+               } */\r
                \r
-               return "Defined Term: "+ result;\r
+               return "Defined Term ";//+ result;\r
        }\r
 \r
        //FIXME clean up create element methods\r