From fe13246f6520fc3bcbe8452fd13fb297e5bc48b9 Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Thu, 21 Nov 2013 16:28:05 -0500
Subject: [PATCH] lttng rcp: Add Batch Import to File menu

Change-Id: I95e7c6f40aeb0c10c4ce92eabe9f8e3c3e39c0ac
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/18697
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
IP-Clean: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
---
 org.eclipse.linuxtools.tmf.ui/plugin.xml      | 14 -------
 .../handlers/BatchImportTraceHandler.java     | 41 +++++++++++--------
 .../plugin.properties                         |  1 +
 .../plugin.xml                                |  5 +++
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.xml b/org.eclipse.linuxtools.tmf.ui/plugin.xml
index 9876d7291e..f130c158b6 100644
--- a/org.eclipse.linuxtools.tmf.ui/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.xml
@@ -1217,20 +1217,6 @@
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.BatchImportTraceHandler"
             commandId="org.eclipse.linuxtools.tmf.ui.batch_import">
-         <activeWhen>
-            <and>
-               <count
-                     value="1">
-               </count>
-               <iterate
-                     ifEmpty="false"
-                     operator="and">
-                  <instanceof
-                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">
-                  </instanceof>
-               </iterate>
-            </and>
-         </activeWhen>
       </handler>
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.commands.ExportToTextCommandHandler"
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/BatchImportTraceHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/BatchImportTraceHandler.java
index 362f869ad9..ec7c8a5c7f 100644
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/BatchImportTraceHandler.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/BatchImportTraceHandler.java
@@ -14,14 +14,15 @@ package org.eclipse.linuxtools.internal.tmf.ui.project.handlers;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder;
 import org.eclipse.linuxtools.tmf.ui.project.wizards.importtrace.BatchImportTraceWizard;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
 
 /**
  * Batch import handler, spawn a wizard
@@ -33,26 +34,32 @@ public class BatchImportTraceHandler extends ImportTraceHandler {
 
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
-        TmfTraceFolder traceFolder = getTraceFolder();
-        if (traceFolder == null) {
+        // Fire the Import Trace Wizard
+        IWorkbench workbench = PlatformUI.getWorkbench();
+        if (workbench == null) {
             return null;
         }
 
-        // Fire the Import Trace Wizard
-        IWorkbench workbench = PlatformUI.getWorkbench();
-        if (workbench != null) {
-            final IWorkbenchWindow activeWorkbenchWindow = workbench.getActiveWorkbenchWindow();
-            if (activeWorkbenchWindow != null) {
-                Shell shell = activeWorkbenchWindow.getShell();
-
-                BatchImportTraceWizard wizard = new BatchImportTraceWizard();
-                wizard.init(PlatformUI.getWorkbench(), new StructuredSelection(traceFolder));
-                WizardDialog dialog = new WizardDialog(shell, wizard);
-                dialog.open();
-
-                traceFolder.refresh();
-            }
+        final IWorkbenchWindow activeWorkbenchWindow = workbench.getActiveWorkbenchWindow();
+        if (activeWorkbenchWindow == null) {
+            return null;
         }
+
+        IStructuredSelection selection = new StructuredSelection(HandlerUtil.getCurrentSelection(event));
+        TmfTraceFolder traceFolder = getTraceFolder();
+        if (traceFolder != null) {
+            selection = new StructuredSelection(traceFolder);
+        }
+
+        BatchImportTraceWizard wizard = new BatchImportTraceWizard();
+        wizard.init(PlatformUI.getWorkbench(), selection);
+        WizardDialog dialog = new WizardDialog(activeWorkbenchWindow.getShell(), wizard);
+        dialog.open();
+
+        if (traceFolder != null) {
+            traceFolder.refresh();
+        }
+
         return null;
     }
 
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/plugin.properties b/org.eclipse.linuxtools.tracing.rcp.ui/plugin.properties
index febe050c60..5e8145fa0b 100644
--- a/org.eclipse.linuxtools.tracing.rcp.ui/plugin.properties
+++ b/org.eclipse.linuxtools.tracing.rcp.ui/plugin.properties
@@ -38,6 +38,7 @@ command.OpenDirectory.description = Opens a directory
 command.OpenDirectory.name = Open Directory
 command.OpenFile.label = Open Trace File...
 command.OpenDirectory.label = Open Trace Directory...
+command.batch_import = Batch Import...
 menu.mnemonic = F
 menu.label = Open
 menu.mnemonic.0 = H
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.tracing.rcp.ui/plugin.xml b/org.eclipse.linuxtools.tracing.rcp.ui/plugin.xml
index 1472c8fd05..abf3cc2d77 100644
--- a/org.eclipse.linuxtools.tracing.rcp.ui/plugin.xml
+++ b/org.eclipse.linuxtools.tracing.rcp.ui/plugin.xml
@@ -66,6 +66,11 @@
                   label="%command.OpenDirectory.label"
                   style="push">
             </command>
+            <command
+                  commandId="org.eclipse.linuxtools.tmf.ui.batch_import"
+                  label="%command.batch_import"
+                  style="push">
+            </command>
             <separator
                   name="OpenSeparator"
                   visible="true">
-- 
2.34.1