Merge branch 'master' into lttng_2_0_control_dev

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng2.ui / src / org / eclipse / linuxtools / internal / lttng2 / ui / views / control / dialogs / EnableUstEventsComposite.java

diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java
index b76856868ec745a8eaaef0b45daca60d549d95fc..34571df59f6e95232fc865ce1f5aad017ac8c3b0 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java
+++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableUstEventsComposite.java
@@ -258,7 +258,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
     }
 
     /**
-    * Validates the kernel composite input data.
+    * Validates the UST composite input data.
     * @return true if configured data is valid and can be retrieved.
     */
     public boolean isValid() {
@@ -303,6 +303,18 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
           fLogLevelEventName = temp;
         }
 
+        TraceLogLevel[] levels = TraceLogLevel.values();
+        int id = fLogLevelCombo.getSelectionIndex();
+        if ((id < 0) && fIsLogLevel) {
+            MessageDialog.openError(getShell(),
+                    Messages.TraceControl_EnableEventsDialogTitle,
+                    Messages.TraceControl_InvalidLogLevel + " (" + temp + ") \n");  //$NON-NLS-1$ //$NON-NLS-2$
+
+            return false;
+        } else {
+            fLogLevel = levels[id];
+        }
+
         // initialize log level event name string
         fWildcard = null;
         temp = fWildcardText.getText();
@@ -524,7 +536,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
     /**
      * Content provider for the tracepoints tree. 
      */
-    final public class UstContentProvider extends TraceControlContentProvider {
+    final static public class UstContentProvider extends TraceControlContentProvider {
         @Override
         public Object[] getChildren(Object parentElement) {
             if (parentElement instanceof TargetNodeComponent) {
@@ -545,7 +557,7 @@ public class EnableUstEventsComposite extends Composite implements IEnableUstEve
     /**
      * Content label for the tracepoints tree. 
      */
-     final public class UstLabelProvider extends TraceControlLabelProvider {
+     final static public class UstLabelProvider extends TraceControlLabelProvider {
         @Override
         public Image getImage(Object element) {
             return null;