adapt context menu to navigator changes

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
index a68bf15619515c4384dc64ead62f4cedc220f7e2..7942b7ba75963ee319b82aa1837a63c7d83776c6 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
@@ -204,7 +204,7 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
                }
 
            }
-           showEmptyPage();
+           //showEmptyPage();
                currentJob = new Job("Update Referencing Objects") {
 
                        @Override
@@ -440,6 +440,9 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
                if(firstElement instanceof TreeNode){
                    firstElement = ((TreeNode) firstElement).getValue();
                }
+               if (firstElement instanceof TaxonNode && !((TaxonNode)firstElement).hasTaxon()){
+                       firstElement = ((TaxonNode)firstElement).getClassification();
+               }
                if(firstElement instanceof CdmBase){
                    CdmBase referencedCdmObject = (CdmBase) firstElement;
                    if (referencedCdmObject.getUuid() == actualUuid){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerContextMenu.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerContextMenu.java
index bd1cdb26ad15663ba85fc29c3c18991248ea9167..26926e89ccc78a5e81d9c1a32ff1f0301338be63 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerContextMenu.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerContextMenu.java
@@ -26,6 +26,7 @@ import org.eclipse.ui.handlers.IHandlerService;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
@@ -49,6 +50,9 @@ public class CdmViewerContextMenu extends CompoundContributionItem {
                                final ISelection selection = activePage.getSelection();
                                if(selection instanceof IStructuredSelection){
                                        Object firstElement = ((IStructuredSelection) selection).getFirstElement();
+                                       if (firstElement instanceof TaxonNode && !((TaxonNode)firstElement).hasTaxon()){
+                                               firstElement = ((TaxonNode)firstElement).getClassification();
+                                }
                                        Map<Command, String> enabledCommands = CdmViewerUtil.getAvailableViewers(firstElement);
 
                                        //check if only one or multiple viewers/commands are available