Bug 378402: Implementation of ControlFlow view and Resources view for

LTTng 2.0.

diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java
index 56464358be3021f190b10abb165c96d9d3d29ea6..362fd5d83b720e2ab671e6dd50cd430bb33b7949 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java
@@ -268,7 +268,7 @@ public class ControlFlowView extends TmfView {
         }\r
 \r
         private void zoom(ControlFlowEntry entry, IProgressMonitor monitor) {\r
-            if (fZoomStartTime <= entry.getStartTime() && fZoomEndTime >= entry.getEndTime()) {\r
+            if (fZoomStartTime <= fStartTime && fZoomEndTime >= fEndTime) {\r
                 entry.setZoomedEventList(null);\r
                 return;\r
             }\r

diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java
index e7045b2c147cd5a34d7a30f69a3a6da7cb628a11..f5c7893f532b0b1f86530f23fe82377f6d91aebe 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java
@@ -228,9 +228,9 @@ public class ResourcesView extends TmfView {
             for (TraceEntry traceEntry : entryList) {\r
                 for (ITimeGraphEntry child : traceEntry.getChildren()) {\r
                     ResourcesEntry entry = (ResourcesEntry) child;\r
-                    if (fZoomStartTime <= entry.getStartTime() && fZoomEndTime >= entry.getEndTime()) {\r
+                    if (fZoomStartTime <= fStartTime && fZoomEndTime >= fEndTime) {\r
                         entry.setZoomedEventList(null);\r
-                        return;\r
+                        continue;\r
                     }\r
                     if (fMonitor.isCanceled()) {\r
                         break;\r
@@ -240,9 +240,9 @@ public class ResourcesView extends TmfView {
                         break;\r
                     }\r
                     entry.setZoomedEventList(zoomedEventList);\r
-                    redraw();\r
                 }\r
             }\r
+            redraw();\r
         }\r
 \r
         public void cancel() {\r