tmf: Remove nullcheck before an instanceof

Change-Id: Ia1f5b9d7c77046bb6baa7c8950dbe8acd000ab5e
Signed-off-by: France Lapointe Nguyen <francelap@gmail.com>
Reviewed-on: https://git.eclipse.org/r/47504
Reviewed-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/callstack/FunctionNameMapper.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/callstack/FunctionNameMapper.java
index 01636ccafc34b8b8a9f4698eace4f8822867a16b..d118252c4bf0f31a06465d96dd8ae5024994343c 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/callstack/FunctionNameMapper.java
+++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/callstack/FunctionNameMapper.java
@@ -187,7 +187,7 @@ public final class FunctionNameMapper {
                 IBinaryFile binFile;
                 try {
                     binFile = parser.getBinary(hintBuffer, filePath);
-                    if (binFile != null && binFile instanceof IBinaryParser.IBinaryObject) {
+                    if (binFile instanceof IBinaryParser.IBinaryObject) {
                         return (IBinaryParser.IBinaryObject)binFile;
                     }
                 } catch (IOException e) {

diff --git a/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/TmfPacketStreamBuilder.java b/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/TmfPacketStreamBuilder.java
index 90d91d7f037e675a4d522c91031ca41550be8bc6..07eb86f0ff4235270257c1980841065c2a9d34e9 100644 (file)
--- a/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/TmfPacketStreamBuilder.java
+++ b/org.eclipse.tracecompass.tmf.pcap.core/src/org/eclipse/tracecompass/internal/tmf/pcap/core/event/TmfPacketStreamBuilder.java
@@ -50,7 +50,7 @@ public class TmfPacketStreamBuilder {
      */
     public synchronized void addEventToStream(PcapEvent event) {
         Packet packet = event.getPacket().getPacket(PcapProtocol.PCAP);
-        if (packet == null || !(packet instanceof PcapPacket)) {
+        if (!(packet instanceof PcapPacket)) {
             return;
         }
         PcapPacket pcapPacket = (PcapPacket) packet;

diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/TracePropertyTester.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/TracePropertyTester.java
index ae69529342d60ceab38bc91daf66c4942884a3a3..4da0af5cd18855664169d7a305c213d064b2855a 100644 (file)
--- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/TracePropertyTester.java
+++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/TracePropertyTester.java
@@ -54,7 +54,7 @@ public class TracePropertyTester extends PropertyTester {
 
         // Check if the selected elements are in the trace folder
         if (IS_IN_TRACE_FOLDER.equals(property)) {
-            if (receiver != null && receiver instanceof IStructuredSelection) {
+            if (receiver instanceof IStructuredSelection) {
                 Iterator<?> iter = ((IStructuredSelection) receiver).iterator();
                 while (iter.hasNext()) {
                     Object item = iter.next();
@@ -73,7 +73,7 @@ public class TracePropertyTester extends PropertyTester {
 
         // Check if the parent of a trace element is an experiment
         if (IS_EXPERIMENT_TRACE.equals(property)) {
-            if (receiver != null && receiver instanceof TmfTraceElement) {
+            if (receiver instanceof TmfTraceElement) {
                 TmfTraceElement trace = (TmfTraceElement) receiver;
                 return trace.getParent() instanceof TmfExperimentElement;
             }
@@ -82,10 +82,6 @@ public class TracePropertyTester extends PropertyTester {
 
         // Check if traces has supplementary files
         if (HAS_SUPPLEMENTARY_FILES.equals(property)) {
-            if (receiver == null) {
-                return false;
-            }
-
             if (receiver instanceof TmfTraceElement) {
                 TmfTraceElement trace = (TmfTraceElement) receiver;
                 return trace.hasSupplementaryResources();
@@ -103,7 +99,7 @@ public class TracePropertyTester extends PropertyTester {
 
         // Check if the trace element is of a specific trace type
         if (TRACE_TYPE.equals(property)) {
-            if (receiver != null && receiver instanceof TmfTraceElement) {
+            if (receiver instanceof TmfTraceElement) {
                 TmfTraceElement trace = (TmfTraceElement) receiver;
                 if (expectedValue instanceof String && expectedValue.equals(trace.getTraceType())) {
                     return true;