application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/FlavorSelector.java

@@ -1,7 +1,8 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Red Hat Inc. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The contents of this file are subject to the terms of either the Universal Permissive License
  * v 1.0 as shown at http://oss.oracle.com/licenses/upl

@@ -63,11 +64,13 @@
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
 import org.eclipse.ui.forms.widgets.Form;
 
 import org.openjdk.jmc.common.IDisplayable;
 import org.openjdk.jmc.common.IMCThread;
 import org.openjdk.jmc.common.item.IAttribute;

@@ -299,11 +302,10 @@
                 sameThreadsButton.setEnabled(showConcurrentButton.getSelection());
                 sameThreadsButton.setSelection(flavorSelectorState.sameThreads);
                 sameThreadsButton.addSelectionListener(new SameThreadsSelectionListener());
 
                 // FIXME: Persist state for above checkboxes?
-
                 onShow.ifPresent(on -> {
                         Label rangeLabel = new Label(selectorRow, SWT.NONE);
                         rangeLabel.setLayoutData(GridDataFactory.swtDefaults().create());
                         rangeLabel.setText(Messages.FlavorSelector_LABEL_TIMERANGE);
                         showButton = new Button(selectorRow, SWT.PUSH);

@@ -312,10 +314,16 @@
                         showButton.setLayoutData(GridDataFactory.swtDefaults().create());
                         resetButton = new Button(selectorRow, SWT.PUSH);
                         resetButton.setText(Messages.FlavorSelector_BUTTON_TIMERANGE_CLEAR);
                         resetButton.setToolTipText(Messages.FlavorSelector_BUTTON_TIMERANGE_CLEAR_TOOLTIP);
                         resetButton.addListener(SWT.Selection, e -> on.accept(false));
+                        resetButton.addListener(SWT.Selection, new Listener() {
+                                @Override
+                                public void handleEvent(Event event) {
+                                        on.accept(false);
+                                }
+                        });
                         resetButton.setLayoutData(GridDataFactory.swtDefaults().create());
                         showButton.addListener(SWT.Selection, e -> on.accept(true));
                 });
 
                 canvas = new Canvas(container, SWT.NO_BACKGROUND);