From: Katja Luther <k.luther@bgbm.org>
Date: Thu, 12 Mar 2020 08:54:00 +0000 (+0100)
Subject: ref #8890: fix referencing objects view open in menu
X-Git-Tag: 5.13.0^2~13
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/86627d3153f9b5124dd2e5f9a8d8c756fd9048ae

ref #8890: fix referencing objects view open in menu
---

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForIdentifiableEntityE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForIdentifiableEntityE4.java
index eceacdc92..2718fee19 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForIdentifiableEntityE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForIdentifiableEntityE4.java
@@ -30,6 +30,7 @@ public class OpenBulkEditorForIdentifiableEntityE4 extends DefaultOpenHandlerBas
      */
     @Override
     protected void open(Object entity, Shell shell, EPartService partService) {
+        @SuppressWarnings("rawtypes")
         AbstractBulkEditorInput input = null;
         if (entity instanceof UuidAndTitleCache){
             AbstractBulkEditorInput.NewInstance(((UuidAndTitleCache)entity).getClass(), ((UuidAndTitleCache)entity).getUuid());
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/e4/DefaultOpenHandlerBaseE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/e4/DefaultOpenHandlerBaseE4.java
index 0d4892e09..9f565fec8 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/e4/DefaultOpenHandlerBaseE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/e4/DefaultOpenHandlerBaseE4.java
@@ -14,6 +14,7 @@ import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Shell;
 
+import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 
 public abstract class DefaultOpenHandlerBaseE4 <T> {
@@ -41,7 +42,7 @@ public abstract class DefaultOpenHandlerBaseE4 <T> {
             for (Object element: ((IStructuredSelection)transientData).toArray()) {
                open((T)element, shell, partService);
             }
-        }else if (transientData instanceof UuidAndTitleCache){
+        }else if (transientData instanceof UuidAndTitleCache || transientData instanceof CdmBase){
 //            T entity = getEntity(((UuidAndTitleCache)transientData).getUuid());
             open((T)transientData, shell, partService);
         }
@@ -59,11 +60,7 @@ public abstract class DefaultOpenHandlerBaseE4 <T> {
         //check for correct entity
         String commandId = menuItem.getCommand().getElementId();
         Object transientData = menuItem.getTransientData().get(commandId+".uuid");
-        if(transientData instanceof IStructuredSelection){
-            canExecute = canExecute(transientData)
-                    && (partId!=null?!partId.equals(activePart.getElementId()):true);
-        }else if (transientData instanceof UuidAndTitleCache){
-
+        if(transientData instanceof IStructuredSelection || transientData instanceof UuidAndTitleCache || transientData instanceof CdmBase){
             canExecute = canExecute(transientData)
                     && (partId!=null?!partId.equals(activePart.getElementId()):true);
         }