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 362fd5d83b720e2ab671e6dd50cd430bb33b7949..d46072a2c0d2b0bbcea5d61aca54a105e7e5bfe9 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
@@ -260,7 +260,7 @@ public class ControlFlowView extends TmfView {
             }\r
             for (ControlFlowEntry entry : entryList) {\r
                 if (fMonitor.isCanceled()) {\r
-                    return;\r
+                    break;\r
                 }\r
                 zoom(entry, fMonitor);\r
             }\r
@@ -270,13 +270,12 @@ public class ControlFlowView extends TmfView {
         private void zoom(ControlFlowEntry entry, IProgressMonitor monitor) {\r
             if (fZoomStartTime <= fStartTime && fZoomEndTime >= fEndTime) {\r
                 entry.setZoomedEventList(null);\r
-                return;\r
-            }\r
-            List<ITimeEvent> zoomedEventList = getEventList(entry, fZoomStartTime, fZoomEndTime, fResolution, monitor);\r
-            if (fMonitor.isCanceled()) {\r
-                return;\r
+            } else {\r
+                List<ITimeEvent> zoomedEventList = getEventList(entry, fZoomStartTime, fZoomEndTime, fResolution, monitor);\r
+                if (zoomedEventList != null) {\r
+                    entry.setZoomedEventList(zoomedEventList);\r
+                }\r
             }\r
-            entry.setZoomedEventList(zoomedEventList);\r
             for (ControlFlowEntry child : entry.getChildren()) {\r
                 if (fMonitor.isCanceled()) {\r
                     return;\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 f5c7893f532b0b1f86530f23fe82377f6d91aebe..6b8e11e9cf8f13cca50afd36b334273b33fd5f9b 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
@@ -227,19 +227,18 @@ public class ResourcesView extends TmfView {
             long resolution = Math.max(1, (fZoomEndTime - fZoomStartTime) / fDisplayWidth);\r
             for (TraceEntry traceEntry : entryList) {\r
                 for (ITimeGraphEntry child : traceEntry.getChildren()) {\r
-                    ResourcesEntry entry = (ResourcesEntry) child;\r
-                    if (fZoomStartTime <= fStartTime && fZoomEndTime >= fEndTime) {\r
-                        entry.setZoomedEventList(null);\r
-                        continue;\r
-                    }\r
                     if (fMonitor.isCanceled()) {\r
                         break;\r
                     }\r
-                    List<ITimeEvent> zoomedEventList = getEventList(entry, fZoomStartTime, fZoomEndTime, resolution, true, fMonitor);\r
-                    if (fMonitor.isCanceled()) {\r
-                        break;\r
+                    ResourcesEntry entry = (ResourcesEntry) child;\r
+                    if (fZoomStartTime <= fStartTime && fZoomEndTime >= fEndTime) {\r
+                        entry.setZoomedEventList(null);\r
+                    } else {\r
+                        List<ITimeEvent> zoomedEventList = getEventList(entry, fZoomStartTime, fZoomEndTime, resolution, true, fMonitor);\r
+                        if (zoomedEventList != null) { \r
+                            entry.setZoomedEventList(zoomedEventList);\r
+                        }\r
                     }\r
-                    entry.setZoomedEventList(zoomedEventList);\r
                 }\r
             }\r
             redraw();\r