From f8e7a6be665dcda94eee4e49283bf7a778f262cf Mon Sep 17 00:00:00 2001
From: Alexandre Montplaisir <alexmonthy@efficios.com>
Date: Sun, 5 Jun 2016 22:47:03 -0400
Subject: [PATCH] analysis.lami: Use openResource command to run analyses

Bug: 493941

Change-Id: I628c5f7aef0674f4e83dbd9e611ec3616754f758
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-on: https://git.eclipse.org/r/74615
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-by: Hudson CI
---
 .../plugin.xml                                   | 16 ++++++----------
 .../tmf/ui/project/handlers/OpenAction.java      |  3 +++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/analysis/org.eclipse.tracecompass.analysis.lami.ui/plugin.xml b/analysis/org.eclipse.tracecompass.analysis.lami.ui/plugin.xml
index f6d1909d02..3cfaba2f47 100644
--- a/analysis/org.eclipse.tracecompass.analysis.lami.ui/plugin.xml
+++ b/analysis/org.eclipse.tracecompass.analysis.lami.ui/plugin.xml
@@ -14,7 +14,7 @@
          point="org.eclipse.ui.handlers">
       <handler
             class="org.eclipse.tracecompass.internal.provisional.analysis.lami.ui.handler.RunAnalysisHandler"
-            commandId="org.eclipse.tracecompass.tmf.ui.command.analysis_run">
+            commandId="org.eclipse.ui.navigate.openResource">
          <activeWhen>
             <and>
                <count
@@ -94,12 +94,6 @@
    </extension>
    <extension
          point="org.eclipse.ui.commands">
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.category"
-            description="%command.analysis_run.description"
-            id="org.eclipse.tracecompass.tmf.ui.command.analysis_run"
-            name="%command.analysis_run">
-      </command>
       <command
             categoryId="org.eclipse.linuxtools.tmf.ui.commands.category"
             description="%command.analysis_remove.description"
@@ -122,9 +116,9 @@
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+            locationURI="popup:org.eclipse.ui.popup.any?after=group.open">
          <command
-               commandId="org.eclipse.tracecompass.tmf.ui.command.analysis_run"
+               commandId="org.eclipse.ui.navigate.openResource"
                label="%command.analysis_run"
                mnemonic="%command.analysis_run.mnemonic"
                style="push"
@@ -136,7 +130,9 @@
                   <count
                         value="1">
                   </count>
-                  <iterate>
+                  <iterate
+                        ifEmpty="false"
+                        operator="and">
                      <instanceof
                            value="org.eclipse.tracecompass.tmf.ui.project.model.TmfOnDemandAnalysisElement">
                      </instanceof>
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/OpenAction.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/OpenAction.java
index d385fd8b94..f7f001bba6 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/OpenAction.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/OpenAction.java
@@ -23,6 +23,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.tracecompass.internal.tmf.ui.Activator;
 import org.eclipse.tracecompass.tmf.ui.project.model.TmfAnalysisOutputElement;
 import org.eclipse.tracecompass.tmf.ui.project.model.TmfExperimentElement;
+import org.eclipse.tracecompass.tmf.ui.project.model.TmfOnDemandAnalysisElement;
 import org.eclipse.tracecompass.tmf.ui.project.model.TmfProjectModelElement;
 import org.eclipse.tracecompass.tmf.ui.project.model.TmfReportElement;
 import org.eclipse.tracecompass.tmf.ui.project.model.TmfTraceElement;
@@ -58,6 +59,7 @@ public class OpenAction extends Action {
             Object firstElement = sSelection.getFirstElement();
             if ((sSelection.size() == 1) && (firstElement instanceof TmfTraceElement ||
                     firstElement instanceof TmfExperimentElement ||
+                    firstElement instanceof TmfOnDemandAnalysisElement ||
                     firstElement instanceof TmfAnalysisOutputElement ||
                     firstElement instanceof TmfReportElement)) {
                 element = (TmfProjectModelElement) firstElement;
@@ -73,6 +75,7 @@ public class OpenAction extends Action {
             Object service = page.getActivePart().getSite().getService(IHandlerService.class);
             IHandlerService handlerService = (IHandlerService) service;
             boolean executeCommand = (element instanceof TmfTraceElement ||
+                    element instanceof TmfOnDemandAnalysisElement ||
                     element instanceof TmfAnalysisOutputElement ||
                     element instanceof TmfReportElement);
 
-- 
2.34.1