From 3b5e96d817fb12f640c4f5f53c3238c552165c7f Mon Sep 17 00:00:00 2001 From: Bernd Hufmann Date: Fri, 8 Jan 2016 10:55:02 -0500 Subject: [PATCH] control: Update MI parsing for configured event filters The MI for filter element contains true if a filter has been configured and false if not. Change-Id: I146c7b1da4ecdd8aa3df66f443bd7fe9d9772813 Signed-off-by: Bernd Hufmann Reviewed-on: https://git.eclipse.org/r/63870 Reviewed-by: Hudson CI Reviewed-by: Matthew Khouzam Tested-by: Matthew Khouzam --- .../internal/lttng2/control/ui/views/messages/Messages.java | 2 ++ .../lttng2/control/ui/views/messages/messages.properties | 1 + .../control/ui/views/service/LTTngControlServiceMI.java | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/messages/Messages.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/messages/Messages.java index 4f804f10a0..613a9edcad 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/messages/Messages.java +++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/messages/Messages.java @@ -343,6 +343,8 @@ public final class Messages extends NLS { public static String TraceControl_DeleteProfileTitle; public static String TraceControl_DeleteQuery; + public static String TraceControl_DefaultEventFilterString; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/messages/messages.properties b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/messages/messages.properties index c39dede9da..b75a9f5ca1 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/messages/messages.properties +++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/messages/messages.properties @@ -327,3 +327,4 @@ TraceControl_OverwriteQuery=Do you want to overwrite file {0}? TraceControl_DeleteProfileTitle=Delete LTTng Profiles TraceControl_DeleteQuery=Do you want to delete the following profiles? +TraceControl_DefaultEventFilterString=with filter \ No newline at end of file diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/service/LTTngControlServiceMI.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/service/LTTngControlServiceMI.java index cdf9c4bb8d..e78920e24c 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/service/LTTngControlServiceMI.java +++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/service/LTTngControlServiceMI.java @@ -841,7 +841,9 @@ public class LTTngControlServiceMI extends LTTngControlService { // LTTng // For now we emulate the non-mi behavior and simply put // "with filter" - eventInfo.setFilterExpression("with filter"); //$NON-NLS-1$ + if (Boolean.TRUE.toString().equals(infoNode.getTextContent())) { + eventInfo.setFilterExpression(Messages.TraceControl_DefaultEventFilterString); + } break; case MIStrings.EXCLUSION: // TODO: Currently not supported by tmf -- 2.34.1