ref #8774: move all term editor menu items to vocabularies

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermMenuE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermMenuE4.java
index 115f16b3f0a2dfd22a306596061f67d06c7686a4..e89d8853206a54f60b35b55a9ba64f886ca0d298 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermMenuE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermMenuE4.java
@@ -49,11 +49,11 @@ public class DefinedTermMenuE4 {
         if(CdmStore.isActive()){
 
             //add Feature and NamedArea to top level
-            addChildTermsToMenuManager(items, TermType.Feature, true);
-            addChildTermsToMenuManager(items, TermType.NamedArea);
+//            addChildTermsToMenuManager(items, TermType.Feature, true);
+//            addChildTermsToMenuManager(items, TermType.NamedArea);
 
             MMenu otherMenu = MMenuFactory.INSTANCE.createMenu();
-            otherMenu.setLabel(Messages.DefinedTermMenu_OTHERS);
+            otherMenu.setLabel(Messages.DefinedTermMenu_Vocabularies);
             items.add(otherMenu);
 
             items.add(MMenuFactory.INSTANCE.createMenuSeparator());
@@ -63,9 +63,9 @@ public class DefinedTermMenuE4 {
             for (TermType tt : ttList)
             {
                 //skip Feature and NamedArea as they have already been added to top level
-                if(tt.equals(TermType.Feature) || tt.equals(TermType.NamedArea)){
-                    continue;
-                }
+//                if(tt.equals(TermType.Feature) || tt.equals(TermType.NamedArea)){
+//                    continue;
+//                }
                 // if term type has a parent, do not add it
                 // it will be added in the recursive call
                 if(tt.getKindOf() == null

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermTreeMenu.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermTreeMenu.java
index 692249cb102c33d4b7b3948c58459004fdb54e21..6ad87e59f9e839ef2a5eb7e01adcc8822ea7e7e9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermTreeMenu.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermTreeMenu.java
@@ -49,11 +49,11 @@ public class DefinedTermTreeMenu {
         if(CdmStore.isActive()){
 
             //add Feature and NamedArea to top level
-            addChildTermsToMenuManager(items, TermType.Feature, true);
-            addChildTermsToMenuManager(items, TermType.NamedArea);
+//            addChildTermsToMenuManager(items, TermType.Feature, true);
+//            addChildTermsToMenuManager(items, TermType.NamedArea);
 
             MMenu otherMenu = MMenuFactory.INSTANCE.createMenu();
-            otherMenu.setLabel(Messages.DefinedTermMenu_OTHERS);
+            otherMenu.setLabel(Messages.DefinedTermMenu_Vocabularies);
             items.add(otherMenu);
 
             items.add(MMenuFactory.INSTANCE.createMenuSeparator());
@@ -63,9 +63,9 @@ public class DefinedTermTreeMenu {
             for (TermType tt : ttList)
             {
                 //skip Feature and NamedArea as they have already been added to top level
-                if(tt.equals(TermType.Feature) || tt.equals(TermType.NamedArea)){
-                    continue;
-                }
+//                if(tt.equals(TermType.Feature) || tt.equals(TermType.NamedArea)){
+//                    continue;
+//                }
                 // if term type has a parent, do not add it
                 // it will be added in the recursive call
                 if(tt.getKindOf() == null) {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index 42b27f1214603cf0f4d875d1125c348c42b581da..1c9a9cf58483a6078f395b6a3228f8a26e8e5dcc 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -163,7 +163,7 @@ public class Messages extends NLS {
     public static String DefinedTermMenu_FEATURE_TREE;
     public static String DefinedTermMenu_MENU;
     public static String DefinedTermMenu_OTHER_S;
-    public static String DefinedTermMenu_OTHERS;
+    public static String DefinedTermMenu_Vocabularies;
     public static String DefinedTermMenu_TERM_EDITOR;
 
     public static String DetailsViewerE4_TAXON_HAS_NO_NAME;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
index f7628c7ead120056bff0514e625724c0cfa29718..77da7a25f6d8c10be0c5e395c87bd81ce0ffb987 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
@@ -190,7 +190,7 @@ DefinedTermEditorE4_SAVE_TITLE=Save changes
 DefinedTermMenu_FEATURE_TREE=Term Tree
 DefinedTermMenu_MENU=Menu
 DefinedTermMenu_OTHER_S=Other %ss
-DefinedTermMenu_OTHERS=Others
+DefinedTermMenu_Vocabularies=Vocabularies
 DefinedTermMenu_TERM_EDITOR=Term Editor
 DetailsViewerE4_TAXON_HAS_NO_NAME=Taxon has no name. Details can not be shown.
 DetailsViewPart_VIEWER_NAME=Details

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
index 082a171cc578c20284fa96185cf480c49fd5f584..3a0679513873cf4036f836e96ce7a468dd40a270 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
@@ -189,7 +189,7 @@ DefinedTermEditorE4_SAVE_TITLE=
 DefinedTermMenu_FEATURE_TREE=Termbaum
 DefinedTermMenu_MENU=Menü
 DefinedTermMenu_OTHER_S=Weitere %ss
-DefinedTermMenu_OTHERS=Weitere
+DefinedTermMenu_Vocabularies=Vokabulare
 DefinedTermMenu_TERM_EDITOR=Term-Editor
 DetailsViewerE4_TAXON_HAS_NO_NAME=Taxon hat keinen Namen. Details können nicht angezeigt werden.
 DetailsViewPart_VIEWER_NAME=Details

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalSourceElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalSourceElement.java
index a7a62bb886bb2edd0ded3179ab7a9d14c1777a5f..214c35b9a15e49a339781e3f381c44878cf87dd3 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalSourceElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalSourceElement.java
@@ -106,6 +106,7 @@ public class NomenclaturalSourceElement extends OriginalSourceElement {
         advancedSection.setLayoutData(layoutData);
         advancedSection.setBackground(this.getPersistentBackground());
         advancedSection.setEntity(entity);
+        advancedSection.setFont(AbstractUtility.getFont(Resources.COLOR_FONT_DEFAULT));
         addControl(advancedSection);
         addElement(advancedSection);