Refactor generic "open in..." framework

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / view / CdmViewerContextMenu.java

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 59082ad86eb3fc3ffd822d0dbc0c24333f69b9c4..bfe10e7cd4b71689bd8a9f8c55d66e599dbf7c25 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
@@ -20,10 +20,10 @@ import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.CompoundContributionItem;
-import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.handlers.IHandlerService;
 
 import eu.etaxonomy.cdm.model.common.ICdmBase;
+import eu.etaxonomy.taxeditor.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 
 /**
@@ -42,8 +42,7 @@ public class CdmViewerContextMenu extends CompoundContributionItem {
                         final ISelection selection = window.getActivePage().getSelection();
                         if(selection instanceof IStructuredSelection){
                             Object firstElement = ((IStructuredSelection) selection).getFirstElement();
-                            Map<String, String> availableViewers = CdmViewerUtil.getAvailableViewers(firstElement);
-                            Map<Command, String> enabledCommands = getEnabledCommands(availableViewers);
+                            Map<Command, String> enabledCommands = CdmViewerUtil.getAvailableViewers(firstElement);
 
                             //check if only one or multiple viewers/commands are available
                             if(enabledCommands.size()==1){
@@ -52,12 +51,12 @@ public class CdmViewerContextMenu extends CompoundContributionItem {
                                 String viewerName = entry.getValue();
 
                                 MenuItem addItem = new MenuItem(menu, SWT.CASCADE);
-                                addItem.setText(String.format("Open (%s)", viewerName));
+                                addItem.setText(String.format(Messages.CdmViewerContextMenu_OPEN, viewerName));
                                 addItem.addSelectionListener(new CommandInvoker(command, firstElement)) ;
                             }
                             else if(enabledCommands.size()>1){
                                 MenuItem addItem = new MenuItem(menu, SWT.CASCADE);
-                                addItem.setText("Open in...");
+                                addItem.setText(Messages.CdmViewerContextMenu_OPEN_IN);
                                 Menu addMenu = new Menu(menu);
                                 addItem.setMenu(addMenu);
                                 for(Entry<Command, String> entry:enabledCommands.entrySet()){
@@ -77,19 +76,6 @@ public class CdmViewerContextMenu extends CompoundContributionItem {
         return contributionItems;
     }
 
-    private Map<Command, String> getEnabledCommands(Map<String, String> availableViewers) {
-        Map<Command, String> enabledCommands = new HashMap<Command, String>();
-        for(Entry<String, String> entry:availableViewers.entrySet()){
-            final String commandId = entry.getKey();
-            ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
-            Command command = commandService.getCommand(commandId);
-            if(command.isEnabled()){
-                enabledCommands.put(command, entry.getValue());
-            }
-        }
-        return enabledCommands;
-    }
-
     private final class CommandInvoker extends SelectionAdapter {
         private final Command command;
         private final Object selectedObject;
@@ -104,15 +90,20 @@ public class CdmViewerContextMenu extends CompoundContributionItem {
             IHandlerService handlerService = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
             Map<String, UUID> params = new HashMap<String, UUID>();
             if(selectedObject instanceof ICdmBase){
-                params.put(command.getId()+".uuid", ((ICdmBase) selectedObject).getUuid());
+                params.put(command.getId()+".uuid", ((ICdmBase) selectedObject).getUuid()); //$NON-NLS-1$
             }
             ParameterizedCommand parameterizedCommand = ParameterizedCommand.generateCommand(command, params);
             try {
-                handlerService.executeCommand(parameterizedCommand, null);
+                if(parameterizedCommand!=null){
+                    handlerService.executeCommand(parameterizedCommand, null);
+                }
+                else{
+                    handlerService.executeCommand(command.getId(), null);
+                }
             } catch (NotDefinedException nde) {
-                throw new RuntimeException("Could not find open command: " + command.getId());
+                throw new RuntimeException("Could not find open command: " + command.getId()); //$NON-NLS-1$
             } catch (Exception exception) {
-                MessagingUtils.error(getClass(), "An exception occured while trying execute "+command.getId(), exception);
+                MessagingUtils.error(getClass(), "An exception occured while trying execute "+command.getId(), exception); //$NON-NLS-1$
             }
             PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getSelection();
         }