diff options
author | France Lapointe Nguyen | 2015-05-07 22:25:18 +0000 |
---|---|---|
committer | Matthew Khouzam | 2015-05-11 22:01:43 +0000 |
commit | bba6b570b8bec949ba57bb1fd7c6e578719038f8 (patch) | |
tree | a079484511e54a8838db809edb9c35f83a99bcdd /org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui | |
parent | 843f1eb24baef3d75c42e9cb331ae365c452e5ea (diff) | |
download | org.eclipse.tracecompass-bba6b570b8bec949ba57bb1fd7c6e578719038f8.tar.gz org.eclipse.tracecompass-bba6b570b8bec949ba57bb1fd7c6e578719038f8.tar.xz org.eclipse.tracecompass-bba6b570b8bec949ba57bb1fd7c6e578719038f8.zip |
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>
Diffstat (limited to 'org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui')
-rw-r--r-- | org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/TracePropertyTester.java | 10 |
1 files changed, 3 insertions, 7 deletions
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 ae69529342..4da0af5cd1 100644 --- 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; |