Some cleanups related to investigating redundant null checks

Change-Id: I6c71c90c2d61fe4c4c3d30c8b1fb1cb0c9eac2f2
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/61197
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

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 cfa3eebff81e3b31ab64f02561751b92dc60c0ac..53b132eb1a5710acb82d78dacc6181d564c82cfc 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
@@ -320,7 +320,8 @@ public class StreamListView extends TmfView {
     @Override
     public void createPartControl(@Nullable Composite parent) {
         // Initialize
-        fTableMap = new HashMap<>();
+        final Map<TmfPcapProtocol, Table> tables = new HashMap<>();
+        fTableMap = tables;
         fCurrentTrace = TmfTraceManager.getInstance().getActiveTrace();
         fCurrentStream = null;
 
@@ -330,8 +331,7 @@ public class StreamListView extends TmfView {
 
             @Override
             public void widgetSelected(@Nullable SelectionEvent e) {
-                Map<TmfPcapProtocol, Table> tables = fTableMap;
-                if (tables == null || e == null) {
+                if (e == null) {
                     return;
                 }
                 TmfPcapProtocol protocol = (TmfPcapProtocol) e.item.getData(KEY_PROTOCOL);
@@ -373,11 +373,6 @@ public class StreamListView extends TmfView {
 
                 });
 
-                Map<TmfPcapProtocol, Table> tables = fTableMap;
-                if (tables == null) {
-                    return;
-                }
-
                 tables.put(protocol, table);
 
                 // Add right click menu

diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/module/XmlUtilsTest.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/module/XmlUtilsTest.java
index dea9243c52c1659a99844facb2c56d499eb72c14..f3e8eb080e4c61c540c818c6f25a0bb0e4f6f65c 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/module/XmlUtilsTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/module/XmlUtilsTest.java
@@ -170,17 +170,8 @@ public class XmlUtilsTest {
     @Test
     public void testGetElementInFile() {
         File testXmlFile = TmfXmlTestFiles.VALID_FILE.getFile();
-        if ((testXmlFile == null) || !testXmlFile.exists()) {
-            fail("XML test file does not exist");
-        }
-        /*
-         * This sounds useless, but I get a potential null pointer warning
-         * otherwise
-         */
-        if (testXmlFile == null) {
-            return;
-        }
-
+        assertNotNull("XML test file does not exist", testXmlFile);
+        assertTrue("XML test file does not exist", testXmlFile.exists());
         Element analysis = XmlUtils.getElementInFile(testXmlFile.getAbsolutePath(), TmfXmlStrings.STATE_PROVIDER, ANALYSIS_ID);
         assertNotNull(analysis);
     }

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/parsers/custom/CustomEventAspects.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/parsers/custom/CustomEventAspects.java
index 26a79159ffde66a342f48bec8204f57596b8534c..01fde9da632eff0eadee2890db5c7c0a99e6ee81 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/parsers/custom/CustomEventAspects.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/parsers/custom/CustomEventAspects.java
@@ -18,6 +18,7 @@ import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.common.core.NonNullUtils;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
 import org.eclipse.tracecompass.tmf.core.parsers.custom.CustomEvent;
@@ -74,8 +75,7 @@ public class CustomEventAspects {
         @Override
         public String resolve(ITmfEvent event) {
             if (event instanceof CustomEvent) {
-                String ret = ((CustomEvent) event).getEventString(fIndex);
-                return (ret == null ? EMPTY_STRING : ret);
+                return NonNullUtils.nullToEmptyString(((CustomEvent) event).getEventString(fIndex));
             }
             return EMPTY_STRING;
         }