| commit | 9a46ec8b3b350d788036b4f33a1f992bec331f90 | [log] [tgz] |
|---|---|---|
| author | Patrick Tasse <patrick.tasse@gmail.com> | Thu Apr 20 15:08:36 2017 -0400 |
| committer | Patrick Tasse <patrick.tasse@gmail.com> | Fri Apr 21 11:16:17 2017 -0400 |
| tree | 9c3d3bbc39f7799e4de6a03afb759d9ca50755a9 | |
| parent | 7c79652318dfde05c1d5d8bcfc684aa5771a658a [diff] |
Fix @NonNull annotation errors Change-Id: Ide9dffbd1a0a416e832853b6d29737590e5c292c Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com> Reviewed-on: https://git.eclipse.org/r/95415 Reviewed-by: Hudson CI Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
diff --git a/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/internal/segmentstore/core/segmentHistoryTree/HistoryTreeSegmentStore.java b/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/internal/segmentstore/core/segmentHistoryTree/HistoryTreeSegmentStore.java index 65e5916..ead88be 100644 --- a/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/internal/segmentstore/core/segmentHistoryTree/HistoryTreeSegmentStore.java +++ b/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/internal/segmentstore/core/segmentHistoryTree/HistoryTreeSegmentStore.java
@@ -15,6 +15,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Iterator; +import java.util.Objects; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; @@ -252,7 +253,7 @@ while (iterator.hasNext() && unFound > 0) { E seg = iterator.next(); for (Object o : c) { - if (o.equals(seg)) { + if (Objects.equals(o, seg)) { unFound--; } }
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAbstractAnalysisModule.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAbstractAnalysisModule.java index 9f4e00c..b2e854d 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAbstractAnalysisModule.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAbstractAnalysisModule.java
@@ -592,7 +592,7 @@ } @Override - public Iterable<@NonNull TmfAbstractAnalysisRequirement> getAnalysisRequirements() { + public Iterable<TmfAbstractAnalysisRequirement> getAnalysisRequirements() { return Collections.EMPTY_SET; }