Re-structure LTTng sub-project as per the Linux Tools guidelines

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.ui / src / org / eclipse / linuxtools / lttng / ui / model / trange / TimeRangeResourceFactory.java

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java
index 94f2340f4450f960affe5339f6967e6ce36cad29..cd761b2558ecc14299886760a78354965775669d 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java
@@ -12,10 +12,11 @@
 package org.eclipse.linuxtools.lttng.ui.model.trange;
 
 
-import org.eclipse.linuxtools.lttng.state.StateStrings;
-import org.eclipse.linuxtools.lttng.state.model.LttngIRQState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
-import org.eclipse.linuxtools.lttng.state.model.LttngTrapState;
+import org.eclipse.linuxtools.lttng.core.state.StateStrings;
+import org.eclipse.linuxtools.lttng.core.state.model.LTTngCPUState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngIRQState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState;
+import org.eclipse.linuxtools.lttng.core.state.model.LttngTrapState;
 import org.eclipse.linuxtools.lttng.ui.model.trange.TimeRangeEventResource.ResourceTypes;
 
 /**
@@ -108,7 +109,7 @@ public class TimeRangeResourceFactory {
                        public String getStateMode(LttngTraceState traceSt) {
                                LttngIRQState irqState = traceSt.getIrq_states().get(
                                                getResourceId());
-                               String statemode = "";
+                               String statemode = ""; //$NON-NLS-1$
                                if (irqState != null) {
                                        statemode = irqState.peekFromIrqStack().getInName();
                                }
@@ -132,7 +133,7 @@ public class TimeRangeResourceFactory {
                        @Override
                        public String getStateMode(LttngTraceState traceSt) {
                                // Determine the trap state.
-                               String trapStateMode = "";
+                               String trapStateMode = ""; //$NON-NLS-1$
                                LttngTrapState ts = traceSt.getTrap_states().get(getResourceId());
                                
                                // *** Note : 
@@ -234,9 +235,15 @@ public class TimeRangeResourceFactory {
                        @Override
                        public String getStateMode(LttngTraceState traceSt) {
                                // Get the resource state mode
-                               String cpuStateMode = traceSt.getCpu_states().get(
-                                               getResourceId())
-                                               .peekFromCpuStack().getInName();
+                           LTTngCPUState cpuState = traceSt.getCpu_states().get(
+                        getResourceId());
+                           
+                               String cpuStateMode = ""; //$NON-NLS-1$
+                               if (cpuState != null) { 
+                                   cpuStateMode = traceSt.getCpu_states().get(
+                                           getResourceId())
+                                           .peekFromCpuStack().getInName();
+                               }
 
                                return cpuStateMode;
                        }