merge-update from trunk

[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 0c10b9ad7df145bd2f37f166c3d583d5a79120d6..7c3a65669a66ab367ac873fafb7c3083510c8209 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
@@ -29,7 +29,6 @@ import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.FeatureNode;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
-import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateDescriptionElementOperation;
@@ -48,9 +47,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class DynamicFeatureMenu extends CompoundContributionItem {
 
-       private ISelectionService selectionService = EditorUtil.getActivePart()
+       private final ISelectionService selectionService = EditorUtil.getActivePart()
                        .getSite().getWorkbenchWindow().getSelectionService();
-       private IHandlerService handlerService = (IHandlerService) EditorUtil
+       private final IHandlerService handlerService = (IHandlerService) EditorUtil
                        .getService(IHandlerService.class);
 
        /*
@@ -75,8 +74,8 @@ public class DynamicFeatureMenu extends CompoundContributionItem {
                                        Object selectedElement = structuredSelection
                                                        .getFirstElement();
 
-                                       if (selectedElement instanceof TaxonDescription) {
-                                               FeatureTree featureTree = getFeatureTree((TaxonDescription) selectedElement);
+                                       if (selectedElement instanceof DescriptionBase<?>) {
+                                               FeatureTree featureTree = getFeatureTree((DescriptionBase<?>) selectedElement);
 
                                                for (FeatureNode childNode : featureTree.getRootChildren()) {
                                                        createMenuItem(menu, childNode.getFeature());