tmf: Bug 494589: Event table loses focus when pressing Ctrl+Enter or Esc

This gives back focus to the table after pressing Ctrl+Enter or Esc from
a header row cell editor.

Change-Id: I85fe91739a0b4422de3168dd9ea2fbb197853a6b
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/73953
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/tmf/ui/viewers/events/TmfEventsTable.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsTable.java
index 3fb761e788c983683cbc8fa2bf4081c93b8a67e7..dd863abdba364703022a8532a7ea43e93330c62b 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsTable.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsTable.java
@@ -1796,15 +1796,15 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS
                                 applyHeader();
                                 if ((e.stateMask & SWT.CTRL) != 0) {
                                     applySearchAsFilter();
-                                } else {
-                                    /*
-                                     * Set focus on the table so that the next
-                                     * carriage return goes to the next result
-                                     */
-                                    TmfEventsTable.this.getTable().setFocus();
                                 }
+                                /*
+                                 * Set focus on the table so that the next
+                                 * carriage return goes to the next result
+                                 */
+                                TmfEventsTable.this.getTable().setFocus();
                             } else if (e.character == SWT.ESC) {
                                 tableEditor.getEditor().dispose();
+                                TmfEventsTable.this.getTable().setFocus();
                             }
                         }
                     });