From ddb25ba7240ef442c0571706f1a4eb6e319cba37 Mon Sep 17 00:00:00 2001 From: Arnaud Fiorini Date: Thu, 4 Apr 2024 14:12:30 -0400 Subject: [PATCH] analysis: remove dependency to deprecated classes Signed-off-by: Arnaud Fiorini --- .../META-INF/MANIFEST.MF | 4 +++- .../weighted/diff/DifferentialPaletteTest.java | 2 +- .../{ => diff}/WeightedTreeUtilsTest.java | 18 +++++++++--------- .../META-INF/MANIFEST.MF | 3 ++- .../core/aspects/AnalysisPidAspect.java | 4 ++-- .../aspects/AnalysisProcessNameAspect.java | 4 ++-- .../core/aspects/AnalysisThreadNameAspect.java | 4 ++-- .../core/aspects/AnalysisTidAspect.java | 4 ++-- .../tree/diff/DifferentialWeightedTree.java | 2 +- .../diff/DifferentialWeightedTreeProvider.java | 8 ++++---- .../tree/diff/DifferentialWeightedTreeSet.java | 4 ++-- .../tree/{ => diff}/WeightedTreeUtils.java | 9 +++++---- .../weighted/tree/DifferentialPalette.java | 2 +- .../callstack/CallStackScriptingModule.java | 2 +- 14 files changed, 37 insertions(+), 33 deletions(-) rename callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/{ => diff}/WeightedTreeUtilsTest.java (97%) rename callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/{ => diff}/WeightedTreeUtils.java (96%) diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF index 5679a1a03..6f4589201 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/META-INF/MANIFEST.MF @@ -20,7 +20,9 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.tracecompass.lttng2.kernel.core.tests, org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf, org.eclipse.tracecompass.analysis.timing.core, - org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional + org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional, + org.eclipse.tracecompass.analysis.profiling.core, + org.eclipse.tracecompass.analysis.profiling.core.tests Export-Package: org.eclipse.tracecompass.incubator.analysis.core.tests, org.eclipse.tracecompass.incubator.analysis.core.tests.aspects, org.eclipse.tracecompass.incubator.analysis.core.tests.model, diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java index 2c8adc0c1..cc62cf764 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java @@ -20,7 +20,7 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree; +import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree; import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTree; import org.eclipse.tracecompass.incubator.internal.analysis.core.weighted.tree.DifferentialPalette; import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/WeightedTreeUtilsTest.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/WeightedTreeUtilsTest.java similarity index 97% rename from callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/WeightedTreeUtilsTest.java rename to callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/WeightedTreeUtilsTest.java index 540381d21..a5a7bb10d 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/WeightedTreeUtilsTest.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core.tests/src/org/eclipse/tracecompass/incubator/analysis/core/tests/weighted/diff/WeightedTreeUtilsTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tracecompass.incubator.analysis.core.tests.weighted; +package org.eclipse.tracecompass.incubator.analysis.core.tests.weighted.diff; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,16 +24,16 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.incubator.analysis.core.tests.stubs.weighted.SimpleTree; -import org.eclipse.tracecompass.incubator.analysis.core.tests.stubs.weighted.WeightedTreeProviderStub; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.ITree; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeProvider; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTreeSet; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTreeUtils; +import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs.weighted.SimpleTree; +import org.eclipse.tracecompass.analysis.profiling.core.tests.stubs.weighted.WeightedTreeProviderStub; +import org.eclipse.tracecompass.analysis.profiling.core.tree.ITree; +import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeProvider; +import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet; +import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree; +import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTreeSet; import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTree; import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTreeProvider; +import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.WeightedTreeUtils; import org.junit.Before; import org.junit.Test; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF b/callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF index aa8160260..4f2281a78 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/META-INF/MANIFEST.MF @@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.tracecompass.analysis.timing.core, org.eclipse.tracecompass.segmentstore.core, org.eclipse.tracecompass.datastore.core, - org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional + org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional, + org.eclipse.tracecompass.analysis.profiling.core Export-Package: org.eclipse.tracecompass.incubator.analysis.core.aspects, org.eclipse.tracecompass.incubator.analysis.core.concepts, org.eclipse.tracecompass.incubator.analysis.core.model, diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java index 5ec20fa81..57ea9e9c3 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java @@ -14,8 +14,8 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxPidAspect; -import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel; -import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager; +import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel; +import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCpuAspect; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java index c1ac03f98..7ebad83dc 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java @@ -14,8 +14,8 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxPidAspect; -import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel; -import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager; +import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel; +import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java index 835e72860..8ae63342b 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java @@ -14,8 +14,8 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect; -import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel; -import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager; +import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel; +import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java index b4b45c036..015b97b9f 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java @@ -14,8 +14,8 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.os.linux.core.event.aspect.LinuxTidAspect; -import org.eclipse.tracecompass.incubator.analysis.core.model.IHostModel; -import org.eclipse.tracecompass.incubator.analysis.core.model.ModelManager; +import org.eclipse.tracecompass.analysis.profiling.core.model.IHostModel; +import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCpuAspect; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java index 73088bfb6..b9ed3733e 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java @@ -12,7 +12,7 @@ package org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree; +import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree; /** * A class that represents a differential weighted tree. The weight is the base diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java index 637d976fc..06dd36400 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java @@ -22,10 +22,10 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IDataPalette; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeProvider; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTree; +import org.eclipse.tracecompass.analysis.profiling.core.base.IDataPalette; +import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeProvider; +import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet; +import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree; import org.eclipse.tracecompass.incubator.internal.analysis.core.weighted.tree.DifferentialPalette; /** diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java index 72f6315d6..469f87cb3 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java @@ -17,8 +17,8 @@ import java.util.Set; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.ITree; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IWeightedTreeSet; +import org.eclipse.tracecompass.analysis.profiling.core.tree.ITree; +import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeUtils.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/WeightedTreeUtils.java similarity index 96% rename from callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeUtils.java rename to callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/WeightedTreeUtils.java index a279c77ab..91afdc798 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/WeightedTreeUtils.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/analysis/core/weighted/tree/diff/WeightedTreeUtils.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tracecompass.incubator.analysis.core.weighted.tree; +package org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff; import java.util.ArrayList; import java.util.Collection; @@ -18,9 +18,10 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTree; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTreeProvider; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTreeSet; +import org.eclipse.tracecompass.analysis.profiling.core.tree.ITree; +import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeProvider; +import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet; +import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree; import org.eclipse.tracecompass.tmf.core.util.Pair; import com.google.common.collect.ImmutableList; diff --git a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java index 307c471d5..977991623 100644 --- a/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java +++ b/callstack/org.eclipse.tracecompass.incubator.analysis.core/src/org/eclipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java @@ -16,7 +16,7 @@ import java.util.Map; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.IDataPalette; +import org.eclipse.tracecompass.analysis.profiling.core.base.IDataPalette; import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTree; import org.eclipse.tracecompass.incubator.internal.analysis.core.Activator; import org.eclipse.tracecompass.tmf.core.dataprovider.X11ColorUtils; diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java b/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java index 5fb49c9f2..070493189 100644 --- a/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java +++ b/scripting/org.eclipse.tracecompass.incubator.scripting.core/src/org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java @@ -20,8 +20,8 @@ import org.eclipse.tracecompass.analysis.profiling.core.tree.IWeightedTreeSet; import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTree; import org.eclipse.tracecompass.analysis.profiling.core.tree.WeightedTreeGroupBy; -import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.WeightedTreeUtils; import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.DifferentialWeightedTreeProvider; +import org.eclipse.tracecompass.incubator.analysis.core.weighted.tree.diff.WeightedTreeUtils; import org.eclipse.tracecompass.incubator.internal.scripting.core.data.provider.ScriptingDataProviderManager; import org.eclipse.tracecompass.internal.analysis.profiling.core.flamegraph.FlameGraphDataProvider; import org.eclipse.tracecompass.internal.analysis.profiling.core.tree.AllGroupDescriptor;