From 866b99766ff4dfb7f8d45f76e6e5244dfbf86a9d Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Fri, 22 Jan 2016 19:25:02 -0500 Subject: [PATCH] Replace references to TreeSet with NavigableSet in InMemoryBackend Change-Id: I74f6fc7d6292406a552abd6ba20d5538fabbf8a4 Signed-off-by: Matthew Khouzam Reviewed-on: https://git.eclipse.org/r/65034 Reviewed-by: Hudson CI Reviewed-by: Marc-Andre Laperle Tested-by: Marc-Andre Laperle --- .../statesystem/core/backend/InMemoryBackend.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/internal/statesystem/core/backend/InMemoryBackend.java b/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/internal/statesystem/core/backend/InMemoryBackend.java index 5ec490c657..08d87eca44 100644 --- a/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/internal/statesystem/core/backend/InMemoryBackend.java +++ b/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/internal/statesystem/core/backend/InMemoryBackend.java @@ -20,6 +20,7 @@ import java.io.PrintWriter; import java.util.Comparator; import java.util.Iterator; import java.util.List; +import java.util.NavigableSet; import java.util.SortedSet; import java.util.TreeSet; @@ -75,7 +76,7 @@ public class InMemoryBackend implements IStateHistoryBackend { }; private final @NonNull String ssid; - private final TreeSet intervals; + private final NavigableSet intervals; private final long startTime; private volatile long latestTime; @@ -143,7 +144,7 @@ public class InMemoryBackend implements IStateHistoryBackend { * the first possible interval, then only compare their start times. */ synchronized (intervals) { - Iterator iter = serachforEndTime(intervals, t); + Iterator iter = searchforEndTime(intervals, t); for (int modCount = 0; iter.hasNext() && modCount < currentStateInfo.size();) { ITmfStateInterval entry = iter.next(); final long entryStartTime = entry.getStartTime(); @@ -168,7 +169,7 @@ public class InMemoryBackend implements IStateHistoryBackend { * the first possible interval, then only compare their start times. */ synchronized (intervals) { - Iterator iter = serachforEndTime(intervals, t); + Iterator iter = searchforEndTime(intervals, t); while (iter.hasNext()) { ITmfStateInterval entry = iter.next(); final boolean attributeMatches = (entry.getAttribute() == attributeQuark); @@ -231,7 +232,7 @@ public class InMemoryBackend implements IStateHistoryBackend { } } - private static Iterator serachforEndTime(TreeSet tree, long time) { + private static Iterator searchforEndTime(NavigableSet tree, long time) { ITmfStateInterval dummyInterval = new TmfStateInterval(-1, time, -1, TmfStateValue.nullValue()); ITmfStateInterval myInterval = tree.lower(dummyInterval); if (myInterval == null) { -- 2.34.1