X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=org.eclipse.linuxtools.lttng.ui%2Fsrc%2Forg%2Feclipse%2Flinuxtools%2Flttng%2Fui%2Fviews%2Fcontrol%2Fmodel%2Fimpl%2FTraceChannelComponent.java;h=d3572a81dd46f06f44692eb5c4103f503e246a91;hb=d132bcc71fa0ff07cf2a3f0b6258f38abb546fb7;hp=7f4a08195bdebefb69fb1266e9fe8baa27c52757;hpb=f1e23c542e9b00f6dab15b7aa2960315a22d9bc4;p=deliverable%2Ftracecompass.git

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceChannelComponent.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceChannelComponent.java
index 7f4a08195b..d3572a81dd 100644
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceChannelComponent.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/TraceChannelComponent.java
@@ -99,7 +99,13 @@ public class TraceChannelComponent extends TraceControlComponent {
         fChannelInfo = channelInfo;
         IEventInfo[] events = fChannelInfo.getEvents();
         for (int i = 0; i < events.length; i++) {
-            TraceEventComponent event = new TraceEventComponent(events[i].getName(), this);
+            TraceEventComponent event = null;
+            if (events[i].getClass() == ProbeEventInfo.class) {
+                event = new TraceProbeEventComponent(events[i].getName(), this);
+            } else {
+                event = new TraceEventComponent(events[i].getName(), this);
+            }
+
             event.setEventInfo(events[i]);
             addChild(event);
         }
@@ -286,45 +292,26 @@ public class TraceChannelComponent extends TraceControlComponent {
     /**
      * Enables a dynamic probe (for kernel domain)
      * @param eventName - event name for probe
+     * @param isFunction - true for dynamic function entry/return probe else false
      * @param probe - the actual probe
      * @throws ExecutionException
      */
-    public void enableProbe(String eventName, String probe) throws ExecutionException {
-        enableProbe(eventName, probe, new NullProgressMonitor());
+    public void enableProbe(String eventName, boolean isFunction, String probe) throws ExecutionException {
+        enableProbe(eventName, isFunction, probe, new NullProgressMonitor());
     }
 
     /**
      * Enables a dynamic probe (for kernel domain)
      * @param eventName - event name for probe
+     * @param isFunction - true for dynamic function entry/return probe else false 
      * @param probe - the actual probe
      * @param monitor - a progress monitor
      * @throws ExecutionException
      */
-    public void enableProbe(String eventName, String probe, IProgressMonitor monitor) throws ExecutionException {
-        getControlService().enableProbe(getSessionName(), getName(), eventName, probe, monitor);
+    public void enableProbe(String eventName, boolean isFunction, String probe, IProgressMonitor monitor) throws ExecutionException {
+        getControlService().enableProbe(getSessionName(), getName(), eventName, isFunction, probe, monitor);
     }
 
-    /**
-     * Enables a dynamic function entry/return probe (for kernel domain)
-     * @param eventName - event name for probe
-     * @param probe - the actual probe
-     * @throws ExecutionException
-     */
-    public void enableFunctionProbe(String eventName, String probe) throws ExecutionException {
-        enableFunctionProbe(eventName, probe, new NullProgressMonitor());
-    }
-    
-    /**
-     * Enables a dynamic function entry/return probe (for kernel domain)
-     * @param eventName - event name for probe
-     * @param probe - the actual probe
-     * @param monitor - a progress monitor
-     * @throws ExecutionException
-     */
-    public void enableFunctionProbe(String eventName, String probe, IProgressMonitor monitor) throws ExecutionException {
-        getControlService().enableFunctionProbe(getSessionName(), getName(), eventName, probe, monitor);
-    }
-    
     /**
      * Enables events using log level.
      * @param eventName - a event name