From db940f1c2e264440860c786b1551dbfceae427b9 Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Tue, 12 Apr 2016 06:36:04 +0200
Subject: [PATCH] Add "Open in..." menu to polytomous key editors and navigator
 #5610

---
 .../referencingobjects/ReferencingObjectsView.java    |  8 ++++++++
 eu.etaxonomy.taxeditor.editor/plugin.xml              | 11 +++++++----
 .../key/polytomous/PolytomousKeyListEditor.java       |  1 +
 eu.etaxonomy.taxeditor.navigation/plugin.xml          |  4 ++++
 .../key/polytomous/PolytomousKeyViewPart.java         |  1 +
 5 files changed, 21 insertions(+), 4 deletions(-)

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 9c977a78e..9db3b0b84 100644
--- 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
@@ -49,6 +49,8 @@ import eu.etaxonomy.cdm.api.service.IGroupService;
 import eu.etaxonomy.cdm.api.service.IMediaService;
 import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
+import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;
+import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.ITermService;
@@ -64,6 +66,8 @@ import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
+import eu.etaxonomy.cdm.model.description.PolytomousKey;
+import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.molecular.Sequence;
 import eu.etaxonomy.cdm.model.name.NonViralName;
@@ -239,6 +243,10 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
                 referencedObject = CdmStore.getService(IDescriptionService.class).loadDescriptionElement(entity, null);
             } else if (objectClass.equals(Sequence.class)){
                 referencedObject = CdmStore.getService(ISequenceService.class).load(entity, null);
+            } else if (PolytomousKey.class.isAssignableFrom(objectClass)){
+                referencedObject = CdmStore.getService(IPolytomousKeyService.class).load(entity, null);
+            } else if (PolytomousKeyNode.class.isAssignableFrom(objectClass)){
+                referencedObject = CdmStore.getService(IPolytomousKeyNodeService.class).load(entity, null);
             } else if (DefinedTermBase.class.isAssignableFrom(objectClass)){
                 referencedObject = CdmStore.getService(ITermService.class).load(entity, null);
             } else if (EventBase.class.isAssignableFrom(objectClass)){
diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index 22b08f193..a2287eda7 100644
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -649,10 +649,6 @@
                label="%command.label.20"
                style="push">
          </command>
-         <separator
-               name="taxeditor-editor.separator1"
-               visible="true">
-         </separator>
          <command
                commandId="eu.etaxonomy.taxeditor.key.polytomous.delete"
                label="%command.label.21"
@@ -684,6 +680,10 @@
                label="%command.label.24"
                style="push">
          </command>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.editor.polytomous.list.cdmViewerContextMenu">
+         </dynamic>
          <command
                commandId="eu.etaxonomy.taxeditor.key.polytomous.command.refresh"
                label="%command.label.25"
@@ -694,6 +694,9 @@
                label="%command.label.26"
                style="push">
          </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.editor.separator1">
+         </separator>
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.descriptive">
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java
index c86490ead..69883cbf0 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java
@@ -277,6 +277,7 @@ public class PolytomousKeyListEditor extends EditorPart implements
 
 		Control control = viewer.getControl();
 		Menu menu = menuManager.createContextMenu(control);
+		menuManager.setRemoveAllWhenShown(true);
 		control.setMenu(menu);
 	}
 
diff --git a/eu.etaxonomy.taxeditor.navigation/plugin.xml b/eu.etaxonomy.taxeditor.navigation/plugin.xml
index c01bb7ad9..e34d01f06 100644
--- a/eu.etaxonomy.taxeditor.navigation/plugin.xml
+++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml
@@ -367,6 +367,10 @@
                label="%command.label.15"
                style="push">
          </command>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.navigation.polytomous.cdmViewerContextMenu">
+         </dynamic>
          <command
                commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.editNodes"
                label="%command.label.16"
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java
index e6757a31b..6dc27291f 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java
@@ -197,6 +197,7 @@ public class PolytomousKeyViewPart extends ViewPart implements
 
 		Control control = viewer.getControl();
 		Menu menu = menuManager.createContextMenu(control);
+		menuManager.setRemoveAllWhenShown(true);
 
 		control.setMenu(menu);
 	}
-- 
2.34.1