analysis: remove dependency to deprecated classes

Signed-off-by: Arnaud Fiorini <[email protected]>
eclipse-tracecompass-incubator · Apr 12, 2024 · ddb25ba · ddb25ba
1 parent f9cfd37
commit ddb25ba
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 33 deletions.
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
@@ -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/...pse/tracecompass/incubator/analysis/core/tests/weighted/diff/DifferentialPaletteTest.java b/...pse/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/...tests/weighted/WeightedTreeUtilsTest.java → .../weighted/diff/WeightedTreeUtilsTest.java b/...tests/weighted/WeightedTreeUtilsTest.java → .../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
@@ -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/....core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisPidAspect.java b/....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/...c/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisProcessNameAspect.java b/...c/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/...rc/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisThreadNameAspect.java b/...rc/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/....core/src/org/eclipse/tracecompass/incubator/analysis/core/aspects/AnalysisTidAspect.java b/....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/...pse/tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTree.java b/...pse/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/...ecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeProvider.java b/...ecompass/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/.../tracecompass/incubator/analysis/core/weighted/tree/diff/DifferentialWeightedTreeSet.java b/.../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/...core/weighted/tree/WeightedTreeUtils.java → ...weighted/tree/diff/WeightedTreeUtils.java b/...core/weighted/tree/WeightedTreeUtils.java → ...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/...ipse/tracecompass/incubator/internal/analysis/core/weighted/tree/DifferentialPalette.java b/...ipse/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/...org/eclipse/tracecompass/incubator/scripting/core/callstack/CallStackScriptingModule.java b/...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;