X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=org.eclipse.linuxtools.lttng.ui%2Fsrc%2Forg%2Feclipse%2Flinuxtools%2Flttng%2Fui%2Fviews%2Fcontrol%2Fdialogs%2FEnableEventsDialog.java;h=99bd3a20037af71083cfcd8cd09470136ba183f8;hb=d132bcc71fa0ff07cf2a3f0b6258f38abb546fb7;hp=dbeb8586e0e1442cb527b6f34186c4c5406102cc;hpb=f1e23c542e9b00f6dab15b7aa2960315a22d9bc4;p=deliverable%2Ftracecompass.git

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/EnableEventsDialog.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/EnableEventsDialog.java
index dbeb8586e0..99bd3a2003 100644
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/EnableEventsDialog.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/EnableEventsDialog.java
@@ -96,28 +96,11 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
      * @param shell - a shell for the display of the dialog
      * @param providerGroup - the trace provider group
      */
-    public EnableEventsDialog(Shell shell, TraceProviderGroup providerGroup) {
-        this(shell, providerGroup, null);
-    }
-    
-    /**
-     * Constructor
-     * @param shell - a shell for the display of the dialog
-     * @param providerGroup - a trace provider group
-     * @param domain - a domain of the events (null if not known) 
-     */
-    public EnableEventsDialog(Shell shell, TraceProviderGroup providerGroup, TraceDomainComponent domain) {
+    public EnableEventsDialog(Shell shell) {
         super(shell);
-        fProviderGroup = providerGroup;
         setShellStyle(SWT.RESIZE);
-        fDomain = domain;
-        if (fDomain != null) {
-            fIsKernel = fDomain.isKernel();
-        } else {
-            fIsKernel = true;
-        }
     }
-
+    
     // ------------------------------------------------------------------------
     // Accessors
     // ------------------------------------------------------------------------
@@ -331,6 +314,29 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
     public boolean isKernel() {
         return fIsKernel;
     }
+    
+    /*
+     * (non-Javadoc)
+     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableEventsDialog#setTraceProviderGroup(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceProviderGroup)
+     */
+    @Override
+    public void setTraceProviderGroup(TraceProviderGroup providerGroup) {
+        fProviderGroup = providerGroup;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.IEnableEventsDialog#setTraceDomainComponent(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent)
+     */
+    @Override
+    public void setTraceDomainComponent(TraceDomainComponent domain) {
+        fDomain = domain;
+        if (fDomain != null) {
+            fIsKernel = fDomain.isKernel();
+        } else {
+            fIsKernel = true;
+        }
+    }
 
     // ------------------------------------------------------------------------
     // Operations
@@ -391,8 +397,11 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
         // ------------------------------------------------------------------------
         // Kernel or UST event data group 
         // ------------------------------------------------------------------------
+        fUstComposite = null;
+        fKernelComposite = null;
         if (fIsKernel) {
             createKernelComposite();
+            fUstComposite = null;
         } else {
             createUstComposite();
         }