tmf: Fix incorrect TimeGraphFilterDialog result when dialog shell closed

[deliverable/tracecompass.git] / tmf / org.eclipse.tracecompass.tmf.ui / src / org / eclipse / tracecompass / tmf / ui / widgets / timegraph / dialogs / TimeGraphFilterDialog.java

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/dialogs/TimeGraphFilterDialog.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/dialogs/TimeGraphFilterDialog.java
index 76a3f3bcb192e019a0ffc0b167b5bf7820fc18e8..fe01b8458495709a8d507f9b977ea14cd07d8570 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/dialogs/TimeGraphFilterDialog.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/dialogs/TimeGraphFilterDialog.java
@@ -113,7 +113,6 @@ public class TimeGraphFilterDialog extends SelectionStatusDialog {
      */
     public TimeGraphFilterDialog(Shell parent) {
         super(parent);
-        setResult(new ArrayList<>(0));
         setStatusLineAboveButtons(true);
         setHelpAvailable(false);
         fExpandedElements = null;
@@ -282,16 +281,11 @@ public class TimeGraphFilterDialog extends SelectionStatusDialog {
     @Override
     public int open() {
         fIsEmpty = evaluateIfTreeEmpty(fInput);
+        setResult(null);
         super.open();
         return getReturnCode();
     }
 
-    @Override
-    protected void cancelPressed() {
-        setResult(null);
-        super.cancelPressed();
-    }
-
     @Override
     protected void computeResult() {
         setResult(Arrays.asList(fTree.getCheckedElements()));