Add "Open in..." menu to polytomous key editors and navigator #5610

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 9c977a78efc8391fd9e5f39c207c4cf744528284..9db3b0b84fdd32baa70f0d61941df40c1eee9bfc 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
@@ -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.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;
 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.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;
 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);
                 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)){
             } 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 22b08f1933de631fb02b789fb6967a0fea5ddb21..a2287eda7ae2c61d616aec6def07f5005258f8ed 100644 (file)
--- 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>
                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"
          <command
                commandId="eu.etaxonomy.taxeditor.key.polytomous.delete"
                label="%command.label.21"


@@ -684,6 +680,10 @@
                label="%command.label.24"
                style="push">
          </command>
                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"
          <command
                commandId="eu.etaxonomy.taxeditor.key.polytomous.command.refresh"
                label="%command.label.25"


@@ -694,6 +694,9 @@
                label="%command.label.26"
                style="push">
          </command>
                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">
       </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 c86490eadfd07a4f1ed1113227534ab41cc353a3..69883cbf0edee151d2d92a361545b0dd26a165cc 100644 (file)
--- 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);
 
                Control control = viewer.getControl();
                Menu menu = menuManager.createContextMenu(control);

+               menuManager.setRemoveAllWhenShown(true);

                control.setMenu(menu);
        }
 
                control.setMenu(menu);
        }
 

diff --git a/eu.etaxonomy.taxeditor.navigation/plugin.xml b/eu.etaxonomy.taxeditor.navigation/plugin.xml
index c01bb7ad94cae5787c4123353518b419f71c59b9..e34d01f06c54eb39fb7d00c6c73d0e16ebdaec00 100644 (file)
--- 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>
                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"
          <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 e6757a31ba5d57fcb2b4071587dab500ac2706a9..6dc27291f4ebf1018645483116dab8b357b10725 100644 (file)
--- 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);
 
                Control control = viewer.getControl();
                Menu menu = menuManager.createContextMenu(control);

+               menuManager.setRemoveAllWhenShown(true);

 
                control.setMenu(menu);
        }
 
                control.setMenu(menu);
        }