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 <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/63870
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

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 4f804f10a0f1f9749744abf4ca651e12947f6b8a..613a9edcad076ab4744ff2cbdf4257e687e42991 100644 (file)
--- 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 c39dede9dace38e45730f625c788bfdf9a983f22..b75a9f5ca11f29f74eb9092eb32e623694c935d9 100644 (file)
--- 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 cdf9c4bb8de857c1bf8f1be8a9917e5332f7cd04..e78920e24cd4c2e2b5b720340f3b5ce20d24c8cf 100644 (file)
--- 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