From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Wed, 22 Jun 2016 14:53:49 +0000 (-0400)
Subject: tmf: Convert Delete trace dialog to a JFace dialog
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=539506a1778cbf6978dc7188b49a31c97a98eabb;p=deliverable%2Ftracecompass.git

tmf: Convert Delete trace dialog to a JFace dialog

It's the same functionality as before when it was a native dialog. But
now it allows us to control it in SWTBot.

Change-Id: I44af835a15bb00d2be6b294c837399caa23c83fb
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/75736
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
---

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/DeleteTraceFolderElementHandler.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/DeleteTraceFolderElementHandler.java
index f483e7b8e1..e1cd672a8a 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/DeleteTraceFolderElementHandler.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/DeleteTraceFolderElementHandler.java
@@ -27,6 +27,8 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -238,10 +240,13 @@ public class DeleteTraceFolderElementHandler extends AbstractHandler {
 
         // Confirm the operation
         Shell shell = window.getShell();
-        MessageBox confirmOperation = new MessageBox(shell, SWT.ICON_QUESTION | SWT.CANCEL | SWT.OK);
-        confirmOperation.setText(getTitle(deleteType));
-        confirmOperation.setMessage(getMessage(deleteType));
-        if (confirmOperation.open() != SWT.OK) {
+        MessageDialog dialog = new MessageDialog(shell, getTitle(deleteType), null, getMessage(deleteType), MessageDialog.QUESTION, 1, new String[] { IDialogConstants.YES_LABEL,
+                IDialogConstants.NO_LABEL }) {
+            {
+                setShellStyle(SWT.SHEET);
+            }
+        };
+        if (dialog.open() != 0) {
             return null;
         }