Remove character term editor menu item

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 1f26dd5a25e153f4524f716ad8e56ed00f166283..ffff2e297e93a31f27a5ad4e7d7ac06ef9f22b6f 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,7 +49,7 @@ public class DefinedTermMenuE4 {
         if(CdmStore.isActive()){
 
             //add Feature and NamedArea to top level
-            addChildTermsToMenuManager(items, TermType.Feature);
+            addChildTermsToMenuManager(items, TermType.Feature, true);
             addChildTermsToMenuManager(items, TermType.NamedArea);
 
             MMenu otherMenu = MMenuFactory.INSTANCE.createMenu();
@@ -57,7 +57,6 @@ public class DefinedTermMenuE4 {
             items.add(otherMenu);
 
             items.add(MMenuFactory.INSTANCE.createMenuSeparator());
-//            createFeatureTreeMenuItem(menu);
 
             List<TermType> ttList = new ArrayList<TermType>(EnumSet.allOf(TermType.class));
             Collections.sort(ttList,new SortByTermTypeMessage());
@@ -77,12 +76,16 @@ public class DefinedTermMenuE4 {
        }
 
     private void addChildTermsToMenuManager(List<MMenuElement> items, TermType termType) {
+        addChildTermsToMenuManager(items, termType, false);
+    }
+
+    private void addChildTermsToMenuManager(List<MMenuElement> items, TermType termType, boolean skipChildren) {
 
         //FIXME : need a better way to find out if a term type can be editable (ticket 3853)
         if(termType.getEmptyDefinedTermBase() != null) {
             Set<TermType> children = termType.getGeneralizationOf();
             // term type has no children, so create menu item
-            if(children.isEmpty()) {
+            if(skipChildren || children.isEmpty()) {
                 items.add(createMenuItem(termType));
             }
             else{
@@ -117,55 +120,6 @@ public class DefinedTermMenuE4 {
         return menuItem;
        }
 
-       private void createFeatureTreeMenuItem() {
-
-//            String commandId = "eu.etaxonomy.taxeditor.workbench.commandparameter.partName";
-//
-//            MDirectMenuItem directMenuItem = MMenuFactory.INSTANCE.createDirectMenuItem();
-//            directMenuItem.
-//             MHandledMenuItem menuItem = MMenuFactory.INSTANCE.createHandledMenuItem();
-//             menuItem.setLabel(Messages.DefinedTermMenu_FEATURE_TREE);
-//             MCommand mCommand = MCommandsFactory.INSTANCE.createCommand();
-//             mCommand.setElementId(commandId);
-//             mCommand.getParameters().add(MCommandsFactory.INSTANCE.createCommandParameter().);
-//
-//             MCommandParameter commandParameter = MCommandsFactory.INSTANCE.createCommandParameter();
-//             commandParameter.setName("eu.etaxonomy.taxeditor.workbench.commandparameter.partName");
-//             commandParameter.set
-//
-//             //set params
-//             menuItem.getTransientData().put(commandId+"termTypeUuid", termType.getUuid());
-//
-//             menuItem.setCommand(mCommand);
-//             menu.getChildren().add(menuItem);
-//
-//
-//             Map<String, String> params = new HashMap<String, String>();
-//             params.put("eu.etaxonomy.taxeditor.workbench.commandparameter.partName", //$NON-NLS-1$
-//                             "eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeEditor"); //$NON-NLS-1$
-//
-//        CommandContributionItemParameter p = new CommandContributionItemParameter(
-//                PlatformUI.getWorkbench(),
-//                "eu.etaxonomy.taxeditor.featuretree.commandContributionItemParameter", //$NON-NLS-1$
-//                "eu.etaxonomy.taxeditor.command.openPart", //$NON-NLS-1$
-//                params,
-//                null,
-//                null,
-//                null,
-//                Messages.DefinedTermMenu_FEATURE_TREE,
-//                "", //$NON-NLS-1$
-//                "", //$NON-NLS-1$
-//                SWT.PUSH,
-//                "", //$NON-NLS-1$
-//                true);
-//
-//
-//
-//        CommandContributionItem item = new CommandContributionItem(p);
-//        return item;
-
-       }
-
        private MHandledMenuItem createDefaultMenuItem(TermType termType) {
 
         MHandledMenuItem menuItem = MMenuFactory.INSTANCE.createHandledMenuItem();