From 77fdc5df175d2312a6a92a658ce58712d5936278 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Thu, 21 Feb 2013 17:34:02 -0500 Subject: [PATCH] tmf: Remove redundant null checks If a final field is instantiated at declaration, it cannot ever be null, so null checks are redundant in this case. Change-Id: Iae8a3064bd209d931196ff256fde9db879ea20aa Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/10577 Tested-by: Hudson CI Reviewed-by: Patrick Tasse IP-Clean: Patrick Tasse --- .../core/event/types/StructDeclaration.java | 11 +++------ .../ctf/core/trace/CTFTraceReader.java | 10 ++------ .../ctf/core/event/EventDeclaration.java | 2 +- .../control/model/impl/BaseEventInfo.java | 24 +++++++------------ .../core/control/model/impl/ChannelInfo.java | 8 ++----- .../core/control/model/impl/DomainInfo.java | 8 ++----- .../core/control/model/impl/SessionInfo.java | 8 ++----- .../control/model/impl/UstProviderInfo.java | 8 ++----- .../views/controlflow/ControlFlowEntry.java | 2 +- .../project/model/TmfExperimentElement.java | 2 +- .../ui/project/model/TmfExperimentFolder.java | 2 +- .../tmf/ui/project/model/TmfTraceElement.java | 2 +- .../tmf/ui/project/model/TmfTraceFolder.java | 2 +- .../tmf/ui/views/timechart/TimeChartView.java | 11 +-------- 14 files changed, 29 insertions(+), 71 deletions(-) diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDeclaration.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDeclaration.java index d4a01717fb..10469300f7 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDeclaration.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDeclaration.java @@ -18,7 +18,7 @@ import java.util.List; /** * A CTF structure declaration. - * + * * A structure is similar to a C structure, it is a compound data type that * contains other datatypes in fields. they are stored in an hashmap and indexed * by names which are strings. @@ -134,8 +134,7 @@ public class StructDeclaration implements IDeclaration { public int hashCode() { final int prime = 31; int result = 1; - result = (prime * result) - + ((fieldsList == null) ? 0 : fieldsList.hashCode()); + result = (prime * result) + fieldsList.hashCode(); result = (prime * result) + (int) (maxAlign ^ (maxAlign >>> 32)); return result; } @@ -157,11 +156,7 @@ public class StructDeclaration implements IDeclaration { return false; } StructDeclaration other = (StructDeclaration) obj; - if (fieldsList == null) { - if (other.fieldsList != null) { - return false; - } - } else if (!fieldsList.equals(other.fieldsList)) { + if (!fieldsList.equals(other.fieldsList)) { return false; } if (maxAlign != other.maxAlign) { diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTraceReader.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTraceReader.java index c4ced41206..d9b3ec434d 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTraceReader.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTraceReader.java @@ -418,9 +418,7 @@ public class CTFTraceReader { final int prime = 31; int result = 1; result = (prime * result) + (int) (startTime ^ (startTime >>> 32)); - result = (prime * result) - + ((streamInputReaders == null) ? 0 : streamInputReaders - .hashCode()); + result = (prime * result) + streamInputReaders.hashCode(); result = (prime * result) + ((trace == null) ? 0 : trace.hashCode()); return result; } @@ -437,11 +435,7 @@ public class CTFTraceReader { return false; } CTFTraceReader other = (CTFTraceReader) obj; - if (streamInputReaders == null) { - if (other.streamInputReaders != null) { - return false; - } - } else if (!streamInputReaders.equals(other.streamInputReaders)) { + if (!streamInputReaders.equals(other.streamInputReaders)) { return false; } if (trace == null) { diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/EventDeclaration.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/EventDeclaration.java index c4c83bc867..035c99f588 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/EventDeclaration.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/EventDeclaration.java @@ -335,7 +335,7 @@ public class EventDeclaration implements IEventDeclaration { result = (prime * result) + ((id == null) ? 0 : id.hashCode()); result = (prime * result) + ((name == null) ? 0 : name.hashCode()); result = (prime * result) + ((stream == null) ? 0 : stream.hashCode()); - result = (prime * result) + ((customAttributes == null) ? 0 : customAttributes.hashCode()); + result = (prime * result) + customAttributes.hashCode(); return result; } diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java index 9ad619b501..49ffa38fdc 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java @@ -68,14 +68,12 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { public BaseEventInfo(BaseEventInfo other) { super(other); fEventType = other.fEventType; - if(other.fFields != null) { - for (Iterator iterator = other.fFields.iterator(); iterator.hasNext();) { - IFieldInfo field = iterator.next(); - if (field instanceof FieldInfo) { - fFields.add(new FieldInfo((FieldInfo)field)); - } else { - fFields.add(field); - } + for (Iterator iterator = other.fFields.iterator(); iterator.hasNext();) { + IFieldInfo field = iterator.next(); + if (field instanceof FieldInfo) { + fFields.add(new FieldInfo((FieldInfo)field)); + } else { + fFields.add(field); } } fFilterExpression = other.fFilterExpression; @@ -238,7 +236,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { final int prime = 31; int result = super.hashCode(); result = prime * result + ((fEventType == null) ? 0 : fEventType.hashCode()); - result = prime * result + ((fFields == null) ? 0 : fFields.hashCode()); + result = prime * result + fFields.hashCode(); result = prime * result + ((fFilterExpression == null) ? 0 : fFilterExpression.hashCode()); result = prime * result + ((fLogLevel == null) ? 0 : fLogLevel.hashCode()); return result; @@ -263,11 +261,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { if (fEventType != other.fEventType) { return false; } - if (fFields == null) { - if (other.fFields != null) { - return false; - } - } else if (!fFields.equals(other.fFields)) { + if (!fFields.equals(other.fFields)) { return false; } if (fFilterExpression == null) { @@ -297,7 +291,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo { output.append(fEventType); output.append(",level="); output.append(fLogLevel); - if ((fFields != null) && (!fFields.isEmpty())) { + if (!fFields.isEmpty()) { output.append(",Fields="); for (Iterator iterator = fFields.iterator(); iterator.hasNext();) { IFieldInfo field = iterator.next(); diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java index 4a3ae9ca43..5ccaf04b61 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java @@ -282,7 +282,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + ((fEvents == null) ? 0 : fEvents.hashCode()); + result = prime * result + fEvents.hashCode(); result = prime * result + fNumberOfSubBuffers; result = prime * result + ((fOutputType == null) ? 0 : fOutputType.hashCode()); result = prime * result + (fOverwriteMode ? 1231 : 1237); @@ -309,11 +309,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo { return false; } ChannelInfo other = (ChannelInfo) obj; - if (fEvents == null) { - if (other.fEvents != null) { - return false; - } - } else if (!fEvents.equals(other.fEvents)) { + if (!fEvents.equals(other.fEvents)) { return false; } if (fNumberOfSubBuffers != other.fNumberOfSubBuffers) { diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java index 854f7d688f..b4735793f6 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java @@ -123,7 +123,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + ((fChannels == null) ? 0 : fChannels.hashCode()); + result = prime * result + fChannels.hashCode(); result = prime * result + (fIsKernel ? 1231 : 1237); return result; } @@ -144,11 +144,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo { return false; } DomainInfo other = (DomainInfo) obj; - if (fChannels == null) { - if (other.fChannels != null) { - return false; - } - } else if (!fChannels.equals(other.fChannels)) { + if (!fChannels.equals(other.fChannels)) { return false; } if (fIsKernel != other.fIsKernel) { diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java index 164da04829..7a0ff2e357 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java @@ -192,7 +192,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + ((fDomains == null) ? 0 : fDomains.hashCode()); + result = prime * result + fDomains.hashCode(); result = prime * result + (fIsStreamedTrace ? 1231 : 1237); result = prime * result + ((fSessionPath == null) ? 0 : fSessionPath.hashCode()); result = prime * result + ((fState == null) ? 0 : fState.hashCode()); @@ -215,11 +215,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo { return false; } SessionInfo other = (SessionInfo) obj; - if (fDomains == null) { - if (other.fDomains != null) { - return false; - } - } else if (!fDomains.equals(other.fDomains)) { + if (!fDomains.equals(other.fDomains)) { return false; } if (fIsStreamedTrace != other.fIsStreamedTrace) { diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java index 8ac03fbb9d..0169d2d184 100644 --- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java +++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java @@ -132,7 +132,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + ((fEvents == null) ? 0 : fEvents.hashCode()); + result = prime * result + fEvents.hashCode(); result = prime * result + fPid; return result; } @@ -153,11 +153,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo { return false; } UstProviderInfo other = (UstProviderInfo) obj; - if (fEvents == null) { - if (other.fEvents != null) { - return false; - } - } else if (!fEvents.equals(other.fEvents)) { + if (!fEvents.equals(other.fEvents)) { return false; } if (fPid != other.fPid) { diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowEntry.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowEntry.java index 01ac0ab169..22cede4c87 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowEntry.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowEntry.java @@ -72,7 +72,7 @@ public class ControlFlowEntry implements ITimeGraphEntry { @Override public boolean hasChildren() { - return fChildren != null && fChildren.size() > 0; + return fChildren.size() > 0; } @Override diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java index 9d6f1c0ce7..33448a383d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java @@ -171,7 +171,7 @@ public class TmfExperimentElement extends TmfProjectModelElement implements IPro */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { - return (sfDescriptors != null) ? Arrays.copyOf(sfDescriptors, sfDescriptors.length) : null; + return Arrays.copyOf(sfDescriptors, sfDescriptors.length); } /* diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java index d78b2196bc..490d8d1bfc 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java @@ -118,7 +118,7 @@ public class TmfExperimentFolder extends TmfProjectModelElement implements IProp */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { - return (sfDescriptors != null) ? Arrays.copyOf(sfDescriptors, sfDescriptors.length) : null; + return Arrays.copyOf(sfDescriptors, sfDescriptors.length); } /* diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java index f1cee49ca3..2b3ca409d7 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java @@ -527,7 +527,7 @@ public class TmfTraceElement extends TmfProjectModelElement implements IActionFi */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { - return (sfDescriptors != null) ? Arrays.copyOf(sfDescriptors, sfDescriptors.length) : null; + return Arrays.copyOf(sfDescriptors, sfDescriptors.length); } /* diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java index 483d2075bf..6e32652181 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java @@ -141,7 +141,7 @@ public class TmfTraceFolder extends TmfProjectModelElement implements IPropertyS */ @Override public IPropertyDescriptor[] getPropertyDescriptors() { - return (sfDescriptors != null) ? Arrays.copyOf(sfDescriptors, sfDescriptors.length) : null; + return Arrays.copyOf(sfDescriptors, sfDescriptors.length); } /* diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java index 5d681099be..5ca3a0a93b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java @@ -612,9 +612,6 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, I */ @TmfSignalHandler public void traceOpened(TmfTraceOpenedSignal signal) { - if (fTimeAnalysisEntries == null) { - return; - } final ITmfTrace trace = signal.getTrace(); final IFile bookmarksFile = signal.getBookmarksFile(); TimeChartAnalysisEntry timeAnalysisEntry = null; @@ -643,9 +640,6 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, I */ @TmfSignalHandler public void traceClosed(TmfTraceClosedSignal signal) { - if (fTimeAnalysisEntries == null) { - return; - } final ITmfTrace trace = signal.getTrace(); for (int i = 0; i < fTimeAnalysisEntries.size(); i++) { if (fTimeAnalysisEntries.get(i).getTrace().equals(trace)) { @@ -674,7 +668,7 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, I */ @TmfSignalHandler public void traceSelected(TmfTraceSelectedSignal signal) { - if (signal.getSource() != this && fTimeAnalysisEntries != null) { + if (signal.getSource() != this) { ITmfTrace trace = signal.getTrace(); for (int i = 0; i < fTimeAnalysisEntries.size(); i++) { if (fTimeAnalysisEntries.get(i).getTrace().equals(trace)) { @@ -694,9 +688,6 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, I */ @TmfSignalHandler public void traceUpdated(TmfTraceUpdatedSignal signal) { - if (fTimeAnalysisEntries == null) { - return; - } final ITmfTrace trace = signal.getTrace(); for (int i = 0; i < fTimeAnalysisEntries.size(); i++) { TimeChartAnalysisEntry timeAnalysisEntry = fTimeAnalysisEntries.get(i); -- 2.34.1