Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeneviève Bastien2018-05-07 16:19:59 -0400
committerMatthew Khouzam2018-05-09 14:39:57 -0400
commitbeeba8ff4004f7bd61f123fff5cb91f4e0034dd5 (patch)
tree053d973fc6aececf2d4395f1793d2f27c681adaf
parente23c8beb0f1e0700ef1f69330e6081c9954caa46 (diff)
downloadorg.eclipse.tracecompass.incubator-beeba8ff4004f7bd61f123fff5cb91f4e0034dd5.tar.gz
org.eclipse.tracecompass.incubator-beeba8ff4004f7bd61f123fff5cb91f4e0034dd5.tar.xz
org.eclipse.tracecompass.incubator-beeba8ff4004f7bd61f123fff5cb91f4e0034dd5.zip
Fix incubator with latest master
Change-Id: Ie316e2a5faac616ba76669996625ad2793b6af1d Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net> Reviewed-on: https://git.eclipse.org/r/122280 Tested-by: CI Bot Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com> Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
-rw-r--r--tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/context/ContextDataProvider.java4
-rw-r--r--tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/objectlife/ObjectLifeDataProvider.java6
2 files changed, 3 insertions, 7 deletions
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/context/ContextDataProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/context/ContextDataProvider.java
index 5e8e4e3a..a628bde5 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/context/ContextDataProvider.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/context/ContextDataProvider.java
@@ -37,8 +37,6 @@ import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedE
import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
-import com.google.common.collect.BiMap;
-
/**
* Context analysis datasource. Provides the locations of contexts.
*
@@ -138,7 +136,7 @@ public class ContextDataProvider extends AbstractTimeGraphDataProvider<@NonNull
Collection<Long> times = getTimes(filter, ss.getStartTime(), ss.getCurrentEndTime());
Set<Integer> quarks = new HashSet<>();
- BiMap<@NonNull Long, @NonNull Integer> selectedEntries = getSelectedEntries(filter);
+ Map<@NonNull Long, @NonNull Integer> selectedEntries = getSelectedEntries(filter);
for (Integer quark : selectedEntries.values()) {
quarks.addAll(ss.getSubAttributes(quark, true));
}
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/objectlife/ObjectLifeDataProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/objectlife/ObjectLifeDataProvider.java
index 752fcfa8..5574de1a 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/objectlife/ObjectLifeDataProvider.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.traceevent.core/src/org/eclipse/tracecompass/incubator/internal/traceevent/core/analysis/objectlife/ObjectLifeDataProvider.java
@@ -15,7 +15,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.annotation.NonNull;
@@ -37,7 +36,6 @@ import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedE
import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
-import com.google.common.collect.BiMap;
import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.TreeMultimap;
@@ -74,8 +72,8 @@ public class ObjectLifeDataProvider extends AbstractTimeGraphDataProvider<@NonNu
@Override
public @NonNull TmfModelResponse<@NonNull Map<@NonNull String, @NonNull String>> fetchTooltip(@NonNull SelectionTimeQueryFilter filter, @Nullable IProgressMonitor monitor) {
ITmfStateSystem ss = getAnalysisModule().getStateSystem();
- BiMap<@NonNull Long, @NonNull Integer> entries = getSelectedEntries(filter);
- Set<@NonNull Integer> quarks = entries.values();
+ Map<@NonNull Long, @NonNull Integer> entries = getSelectedEntries(filter);
+ Collection<@NonNull Integer> quarks = entries.values();
long start = filter.getStart();
if (ss == null || quarks.size() != 1 || !getAnalysisModule().isQueryable(start)) {
/*

Back to the top