Add "Open in..." to referencing objects view

 - fix potential NPE

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
index 2fbde553ffd633de3c2ab3158e686e510b23b313..4869f718f708c836da07c80dcedda77ff609f01a 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
@@ -221,6 +221,9 @@
                class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
                id="eu.etaxonomy.taxeditor.referencingObjectsView.cdmViewerContextMenu">
          </dynamic>
+         <separator
+               name="eu.etaxonomy.taxeditor.bulkeditor.separator1">
+         </separator>
       </menuContribution>
       <menuContribution
             allPopups="false"

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerChooser.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerChooser.java
index 330301f8f7bc2ed7a62873640c8f3467139663cb..63017075fb5d5dbea3636b5b5378112a1fcc0317 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerChooser.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerChooser.java
@@ -32,7 +32,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.handlers.IHandlerService;
 
 import eu.etaxonomy.cdm.model.common.ICdmBase;
@@ -91,13 +90,19 @@ public class CdmViewerChooser extends PopupDialog implements ISelectionChangedLi
             String commandId = command.getId();
                        params.put(commandId+".uuid", ((ICdmBase) input).getUuid());
 
-            //build the parameterized command
-            ParameterizedCommand pc = ParameterizedCommand.generateCommand(command, params);
+                       if(command.isEnabled()) {
+
+                           //build the parameterized command
+                           ParameterizedCommand pc = ParameterizedCommand.generateCommand(command, params);
 
-            if(command.isEnabled()) {
                 IHandlerService handlerService = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
                 try {
-                    handlerService.executeCommand(pc, null);
+                    if(pc!=null){
+                        handlerService.executeCommand(pc, null);
+                    }
+                    else{
+                        handlerService.executeCommand(commandId, null);
+                    }
                 } catch (NotDefinedException nde) {
                     throw new RuntimeException("Could not find open command: " + commandId);
                 } catch (Exception exception) {