Add null checks for methods missing them

In preparation of annotation-enforced @Nullable Map.get() etc.

Change-Id: I81385aba7007baf8ad94fc1519689621f1945493
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/58880
Reviewed-by: Hudson CI

diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.ui/src/org/eclipse/tracecompass/internal/analysis/graph/ui/criticalpath/view/CriticalPathView.java b/analysis/org.eclipse.tracecompass.analysis.graph.ui/src/org/eclipse/tracecompass/internal/analysis/graph/ui/criticalpath/view/CriticalPathView.java
index f00b205b776a11d888b607a1520dacf8f33c7dc0..64afc95099fae183f599e7ee0b54b34ecf61c279 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.graph.ui/src/org/eclipse/tracecompass/internal/analysis/graph/ui/criticalpath/view/CriticalPathView.java
+++ b/analysis/org.eclipse.tracecompass.analysis.graph.ui/src/org/eclipse/tracecompass/internal/analysis/graph/ui/criticalpath/view/CriticalPathView.java
@@ -9,6 +9,8 @@
 
 package org.eclipse.tracecompass.internal.analysis.graph.ui.criticalpath.view;
 
+import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -135,7 +137,7 @@ public class CriticalPathView extends AbstractTimeGraphView {
                 if (!fHostEntries.containsKey(host)) {
                     fHostEntries.put(host, new CriticalPathEntry(host, fTrace, getStartTime(), getEndTime(), owner));
                 }
-                parent = fHostEntries.get(host);
+                parent = checkNotNull(fHostEntries.get(host));
                 CriticalPathEntry entry = new CriticalPathEntry(NonNullUtils.nullToEmptyString(owner), fTrace, getStartTime(), getEndTime(), owner);
                 parent.addChild(entry);
 
@@ -152,7 +154,7 @@ public class CriticalPathView extends AbstractTimeGraphView {
             public void visit(TmfEdge link, boolean horizontal) {
                 if (horizontal) {
                     Object parent = fGraph.getParentOf(link.getVertexFrom());
-                    CriticalPathEntry entry = fRootList.get(parent);
+                    CriticalPathEntry entry = checkNotNull(fRootList.get(parent));
                     TimeEvent ev = new TimeEvent(entry, link.getVertexFrom().getTs(), link.getDuration(),
                             getMatchingState(link.getType()).ordinal());
                     entry.addEvent(ev);

diff --git a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/ArrayDefinition2Test.java b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/ArrayDefinition2Test.java
index a1ae1217f6b2d86ff7d1c54026a3f53522e05f20..6f71cb2c8c6aa428db8f7617b7a516fefc6d465d 100644 (file)
--- a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/ArrayDefinition2Test.java
+++ b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/ArrayDefinition2Test.java
@@ -125,7 +125,6 @@ public class ArrayDefinition2Test {
         CompoundDeclaration declaration = (CompoundDeclaration) charArrayFixture.getDeclaration();
         String fieldName = "";
 
-        @SuppressWarnings("null")
         ArrayDefinition result = new ArrayDefinition(declaration, this.trace, fieldName, Arrays.asList(new Definition[0]));
         assertNotNull(result);
     }
@@ -141,7 +140,6 @@ public class ArrayDefinition2Test {
         IDefinitionScope definitionScope = getDefinitionScope();
 
         String fieldName = "";
-        @SuppressWarnings("null")
         ArrayDefinition result = new ArrayDefinition(declaration, definitionScope, fieldName, Arrays.asList(new Definition[0]));
         assertNotNull(result);
     }

diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java
index f032be987341b53569093b4cc4355b42091f704c..706f44ae87ad9c13a605f767c228b377b9edc64a 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java
@@ -210,8 +210,12 @@ public class VirtualMachineStateProvider extends AbstractTmfStateProvider {
              * prev_state, string next_comm, int32 next_tid, int32 next_prio
              */
             {
-                int prevTid = ((Long) content.getField(fLayouts.get(event.getTrace()).fieldPrevTid()).getValue()).intValue();
-                int nextTid = ((Long) content.getField(fLayouts.get(event.getTrace()).fieldNextTid()).getValue()).intValue();
+                final IKernelAnalysisEventLayout eventLayout = fLayouts.get(event.getTrace());
+                if (eventLayout == null) {
+                    return;
+                }
+                int prevTid = ((Long) content.getField(eventLayout.fieldPrevTid()).getValue()).intValue();
+                int nextTid = ((Long) content.getField(eventLayout.fieldNextTid()).getValue()).intValue();
 
                 if (host.isGuest()) {
                     /* Get the event's CPU */

diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.ui/src/org/eclipse/tracecompass/internal/tmf/pcap/ui/stream/StreamListView.java b/pcap/org.eclipse.tracecompass.tmf.pcap.ui/src/org/eclipse/tracecompass/internal/tmf/pcap/ui/stream/StreamListView.java
index 54c312b3de9319a560d7555b0593ad3f83596a77..164b3c9ddaf858bc83b284f8a0065e4c3f925277 100644 (file)
--- a/pcap/org.eclipse.tracecompass.tmf.pcap.ui/src/org/eclipse/tracecompass/internal/tmf/pcap/ui/stream/StreamListView.java
+++ b/pcap/org.eclipse.tracecompass.tmf.pcap.ui/src/org/eclipse/tracecompass/internal/tmf/pcap/ui/stream/StreamListView.java
@@ -338,7 +338,10 @@ public class StreamListView extends TmfView {
                     return;
                 }
                 TmfPcapProtocol protocol = (TmfPcapProtocol) e.item.getData(KEY_PROTOCOL);
-                tables.get(protocol).deselectAll();
+                final Table table = tables.get(protocol);
+                if (table != null) {
+                    table.deselectAll();
+                }
                 fCurrentStream = null;
             }
 

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/piecharts/TmfPieChartViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/piecharts/TmfPieChartViewer.java
index 3efb1a58057aca9368a0d14327fa76a36b9b398f..e96b249b15737f7fb24f07a231145c8c26a3dc0d 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/piecharts/TmfPieChartViewer.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/piecharts/TmfPieChartViewer.java
@@ -29,8 +29,8 @@ import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
-import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.eclipse.tracecompass.internal.tmf.ui.viewers.piecharts.model.TmfPieChartStatisticsModel;
+import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 
 /**
  * Creates a viewer containing 2 pie charts, one for showing information about
@@ -282,8 +282,9 @@ public class TmfPieChartViewer extends Composite {
                 continue;
             }
             for (Entry<String, Long> event : traceEventCount.entrySet()) {
-                if (totalEventCountForChart.containsKey(event.getKey())) {
-                    totalEventCountForChart.put(event.getKey(), totalEventCountForChart.get(event.getKey()) + event.getValue());
+                final Long value = totalEventCountForChart.get(event.getKey());
+                if (value != null) {
+                    totalEventCountForChart.put(event.getKey(), value + event.getValue());
                 } else {
                     totalEventCountForChart.put(event.getKey(), event.getValue());
                 }

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/core/GraphNode.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/core/GraphNode.java
index 1a77048dbe8261e5aa3943e01fcf431ad1df7b5c..57ff155cd40d68503fd9dfbbc16107ce08f7e018 100755 (executable)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/core/GraphNode.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/core/GraphNode.java
@@ -673,8 +673,8 @@ public abstract class GraphNode {
 
     private void sortNodes(Map<String, List<GraphNode>> nodesToSort, Map.Entry<String, Boolean> sortMapEntry, boolean forward) {
         String nodeType = sortMapEntry.getKey();
-        GraphNode[] temp = nodesToSort.get(nodeType).toArray(new GraphNode[nodesToSort.get(nodeType).size()]);
-        GraphNode node = fNodes.get(nodeType).get(0);
+        GraphNode[] temp = checkNotNull(nodesToSort.get(nodeType)).stream().toArray(GraphNode[]::new);
+        GraphNode node = checkNotNull(fNodes.get(nodeType)).get(0);
         if (forward) {
             Arrays.sort(temp, node.getComparator());
             fNodes.put(nodeType, Arrays.asList(temp));