diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core.tests/src/org/eclipse/tracecompass/analysis/graph/core/tests/graph/TmfGraphLegacyWrapperTest.java b/analysis/org.eclipse.tracecompass.analysis.graph.core.tests/src/org/eclipse/tracecompass/analysis/graph/core/tests/graph/TmfGraphLegacyWrapperTest.java index a9fc264be9..4cd50156fb 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core.tests/src/org/eclipse/tracecompass/analysis/graph/core/tests/graph/TmfGraphLegacyWrapperTest.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core.tests/src/org/eclipse/tracecompass/analysis/graph/core/tests/graph/TmfGraphLegacyWrapperTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 École Polytechnique de Montréal + * Copyright (c) 2022, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -13,8 +13,8 @@ import java.io.IOException; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfGraph; import org.eclipse.tracecompass.internal.analysis.graph.core.graph.legacy.TmfGraphLegacyWrapper; /** diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core.tests/src/org/eclipse/tracecompass/analysis/graph/core/tests/graph/TmfGraphTest.java b/analysis/org.eclipse.tracecompass.analysis.graph.core.tests/src/org/eclipse/tracecompass/analysis/graph/core/tests/graph/TmfGraphTest.java index 18852e5f69..578ff85ee8 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core.tests/src/org/eclipse/tracecompass/analysis/graph/core/tests/graph/TmfGraphTest.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core.tests/src/org/eclipse/tracecompass/analysis/graph/core/tests/graph/TmfGraphTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License 2.0 which @@ -27,14 +27,15 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.tracecompass.analysis.graph.core.base.CycleDetectedException; import org.eclipse.tracecompass.analysis.graph.core.base.IGraphWorker; -import org.eclipse.tracecompass.analysis.graph.core.base.ITmfGraphVisitor; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge.EdgeType; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfVertex; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfVertex.EdgeDirection; +import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraphVisitor; import org.eclipse.tracecompass.analysis.graph.core.tests.stubs.TestGraphWorker; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfEdge; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfEdge.EdgeType; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfGraph; import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfGraphStatistics; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfGraphVisitor; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfVertex; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfVertex.EdgeDirection; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; import org.junit.Test; @@ -318,7 +319,7 @@ public void testCheckVertical() { n0.linkVertical(n1); } - private class ScanCountVertex implements ITmfGraphVisitor { + private class ScanCountVertex extends TmfGraphVisitor { public int nbVertex = 0; public int nbVLink = 0; public int nbHLink = 0; @@ -433,7 +434,7 @@ public void testGraphStatistics() { * @author Francis Giraldeau * */ - private class DuplicateDetectorVisitor implements ITmfGraphVisitor { + private class DuplicateDetectorVisitor extends TmfGraphVisitor { private final Set set = new HashSet<>(); @Override public void visitHead(TmfVertex vertex) { diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/META-INF/MANIFEST.MF b/analysis/org.eclipse.tracecompass.analysis.graph.core/META-INF/MANIFEST.MF index 295fbc2f57..bf74aae4c9 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/META-INF/MANIFEST.MF +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 5.0.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tracecompass.analysis.graph.core;singleton:=true Bundle-Activator: org.eclipse.tracecompass.internal.analysis.graph.core.Activator diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/AbstractTmfGraphBuilderModule.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/AbstractTmfGraphBuilderModule.java index ae70d2561b..40f609e3e5 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/AbstractTmfGraphBuilderModule.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/AbstractTmfGraphBuilderModule.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2022 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License 2.0 which @@ -18,13 +18,11 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.graph.core.base.IGraphWorker; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; import org.eclipse.tracecompass.analysis.graph.core.criticalpath.AbstractCriticalPathModule; import org.eclipse.tracecompass.analysis.graph.core.criticalpath.ICriticalPathProvider; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; import org.eclipse.tracecompass.analysis.graph.core.graph.WorkerSerializer; import org.eclipse.tracecompass.internal.analysis.graph.core.Activator; -import org.eclipse.tracecompass.internal.analysis.graph.core.graph.legacy.TmfGraphLegacyWrapper; import org.eclipse.tracecompass.tmf.core.analysis.TmfAbstractAnalysisModule; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.event.TmfEvent; @@ -44,8 +42,7 @@ */ public abstract class AbstractTmfGraphBuilderModule extends TmfAbstractAnalysisModule implements ICriticalPathProvider { - private @Nullable TmfGraph fGraph; - private @Nullable ITmfGraph fNewGraph; + private @Nullable ITmfGraph fGraph; private @Nullable ITmfEventRequest fRequest; private final AbstractCriticalPathModule fCriticalPathModule; @@ -71,17 +68,6 @@ public AbstractTmfGraphBuilderModule() { */ protected abstract @Nullable ITmfGraph createGraphInstance(Path htFile, WorkerSerializer workerSerializer, long startTime, int version); - /** - * Gets the graph generated by the analysis - * - * @return The generated graph - * @deprecated Use the new {@link #getTmfGraph()} instead - */ - @Deprecated - public @Nullable TmfGraph getGraph() { - return fGraph; - } - /** * Gets the graph generated by the analysis * @@ -89,16 +75,7 @@ public AbstractTmfGraphBuilderModule() { * @since 3.2 */ public @Nullable ITmfGraph getTmfGraph() { - ITmfGraph newGraph = fNewGraph; - if (newGraph != null) { - return newGraph; - } - // Try wrapping the legacy graph if available - TmfGraph graph = fGraph; - if (graph != null) { - return new TmfGraphLegacyWrapper(graph); - } - return null; + return fGraph; } // ------------------------------------------------------------------------ @@ -107,18 +84,15 @@ public AbstractTmfGraphBuilderModule() { @Override protected boolean executeAnalysis(final IProgressMonitor monitor) { - if (fGraph == null) { - final ITmfGraphProvider provider = getGraphProvider(); + final ITmfGraphProvider provider = getGraphProvider(); - /* - * TODO: This will eventually support multiple backends so we can - * save the graph on disk, like the state system, but for now, it is - * just in memory - */ - - createGraph(provider); + /* + * TODO: This will eventually support multiple backends so we can + * save the graph on disk, like the state system, but for now, it is + * just in memory + */ - } + createGraph(provider); return !monitor.isCanceled(); } @@ -144,12 +118,11 @@ protected void canceling() { public void dispose() { fCriticalPathModule.dispose(); super.dispose(); - fGraph = null; - ITmfGraph newGraph = fNewGraph; - if (newGraph != null) { - newGraph.dispose(); + ITmfGraph graph = fGraph; + if (graph != null) { + graph.dispose(); } - fNewGraph = null; + fGraph = null; } // ------------------------------------------------------------------------ @@ -166,8 +139,7 @@ private void createGraph(ITmfGraphProvider provider) { Path htFile = Paths.get(fileDirectory + id + ".ht"); //$NON-NLS-1$ ITmfGraph graph = createGraphInstance(htFile, getWorkerSerializer(), provider.getStartTime(), provider.getGraphFileVersion()); - fNewGraph = graph; - fGraph = new TmfGraph(); + fGraph = graph; if (graph != null) { provider.assignGraph(graph); } @@ -230,7 +202,7 @@ private void build(ITmfGraphProvider provider, ITmfGraph graph) { private static class TmfGraphBuildRequest extends TmfEventRequest { private final ITmfGraphProvider fProvider; - private final ITmfGraph fGraph; + private final ITmfGraph fBuilderGraph; private long fLastEnd; /** @@ -248,7 +220,7 @@ public TmfGraphBuildRequest(ITmfGraphProvider provider, ITmfGraph graph) { ITmfEventRequest.ExecutionType.BACKGROUND); fProvider = provider; - fGraph = graph; + fBuilderGraph = graph; } @Override @@ -262,7 +234,7 @@ public void handleData(final ITmfEvent event) { public synchronized void done() { super.done(); fProvider.done(); - fGraph.closeGraph(fLastEnd); + fBuilderGraph.closeGraph(fLastEnd); } @Override @@ -273,17 +245,6 @@ public void handleCancel() { } - /** - * @since 1.1 - * @deprecated Use the new API via the {@link #getCriticalPathGraph()} - * method instead - */ - @Deprecated - @Override - public @Nullable TmfGraph getCriticalPath() { - return fCriticalPathModule.getCriticalPath(); - } - @Override public @Nullable ITmfGraph getCriticalPathGraph() { return fCriticalPathModule.getCriticalPathGraph(); diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/AbstractTmfGraphProvider.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/AbstractTmfGraphProvider.java index 9f4cc69897..6aaf8e713a 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/AbstractTmfGraphProvider.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/AbstractTmfGraphProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2022 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -18,10 +18,10 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; + import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; @@ -53,8 +53,7 @@ public abstract class AbstractTmfGraphProvider implements ITmfGraphProvider { private boolean fGraphAssigned; /** Graph in which to insert the state changes */ - private @Nullable TmfGraph fGraph = null; - private @Nullable ITmfGraph fNewGraph = null; + private @Nullable ITmfGraph fGraph = null; /** * Instantiate a new graph builder plugin. @@ -80,28 +79,15 @@ public long getStartTime() { return fTrace.getStartTime().toNanos(); } - @Deprecated - @Override - public void assignTargetGraph(TmfGraph graph) { - fGraph = graph; - fGraphAssigned = true; - } - - @Deprecated - @Override - public @Nullable TmfGraph getAssignedGraph() { - return fGraph; - } - @Override public void assignGraph(@NonNull ITmfGraph graph) { - fNewGraph = graph; + fGraph = graph; fGraphAssigned = true; } @Override public @Nullable ITmfGraph getGraph() { - return fNewGraph; + return fGraph; } @Override @@ -117,7 +103,6 @@ public void processEvent(ITmfEvent event) { public void dispose() { fGraphAssigned = false; fGraph = null; - fNewGraph = null; } @Override diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/ITmfGraphProvider.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/ITmfGraphProvider.java index 56c4e92087..a3e039e3ef 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/ITmfGraphProvider.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/ITmfGraphProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2022 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -12,7 +12,6 @@ package org.eclipse.tracecompass.analysis.graph.core.building; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; @@ -44,38 +43,6 @@ public interface ITmfGraphProvider { */ long getStartTime(); - /** - * Assign the target graph where this builder will add new nodes and - * vertices - * - * This needs to be called before .run()! - * - * @param graph - * Target graph for the state changes generated by this input - * plugin - * @deprecated Use the new graph API with {@link #assignGraph(ITmfGraph)} - * instead. The legacy and new graphs are incompatible, if a the - * graph is built using the new API, this graph is not required - * to return anything, but if the old API is used, then this - * graph should be available - */ - @Deprecated - void assignTargetGraph(TmfGraph graph); - - /** - * Return the currently assigned target graph. - * - * @return Reference to the currently assigned graph, or {@code null} if no - * graph is assigned yet - * @deprecated Use the new graph API with {@link #getGraph()} instead. The - * legacy and new graphs are incompatible, if a the graph is - * built using the new API, this graph is not required to return - * anything, but if the old API is used, then this graph should - * be available - */ - @Deprecated - @Nullable TmfGraph getAssignedGraph(); - /** * Send an event to this input plugin for processing. The implementation * should check the contents, and call the state-modifying methods of its diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/AbstractCriticalPathModule.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/AbstractCriticalPathModule.java index 8bda0503d6..6ea67b62ad 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/AbstractCriticalPathModule.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/AbstractCriticalPathModule.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 École Polytechnique de Montréal + * Copyright (c) 2022, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -13,20 +13,19 @@ import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Objects; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.osgi.util.NLS; import org.eclipse.tracecompass.analysis.graph.core.base.IGraphWorker; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; import org.eclipse.tracecompass.analysis.graph.core.building.AbstractTmfGraphBuilderModule; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfVertex; import org.eclipse.tracecompass.analysis.graph.core.graph.WorkerSerializer; import org.eclipse.tracecompass.common.core.NonNullUtils; import org.eclipse.tracecompass.internal.analysis.graph.core.Activator; +import org.eclipse.tracecompass.internal.analysis.graph.core.criticalpath.CriticalPathModule; import org.eclipse.tracecompass.internal.analysis.graph.core.criticalpath.Messages; import org.eclipse.tracecompass.internal.analysis.graph.core.criticalpath.OSCriticalPathAlgorithm; import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException; @@ -250,21 +249,6 @@ public boolean canExecute(ITmfTrace trace) { return true; } - /** - * Gets the graph for the critical path - * - * @return The critical path graph - * @deprecated Use the {@link #getCriticalPathGraph()} method instead. - */ - @Deprecated - @Override - public @Nullable TmfGraph getCriticalPath() { - if (fCriticalPath == null) { - return null; - } - return new TmfGraph(Objects.requireNonNull(fCriticalPath)); - } - /** * Gets the graph for the critical path * diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/ICriticalPathAlgorithm.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/ICriticalPathAlgorithm.java index 995e1983df..dbbd18b950 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/ICriticalPathAlgorithm.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/ICriticalPathAlgorithm.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2022 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License 2.0 which @@ -12,8 +12,6 @@ package org.eclipse.tracecompass.analysis.graph.core.criticalpath; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfVertex; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfVertex; @@ -24,21 +22,6 @@ */ public interface ICriticalPathAlgorithm { - /** - * Computes the critical path - * - * @param start - * The starting vertex - * @param end - * The end vertex - * @return The graph of the critical path - * @throws CriticalPathAlgorithmException - * an exception in the calculation occurred - * @deprecated Use the {@link #computeCriticalPath(ITmfGraph, ITmfVertex, ITmfVertex)} instead - */ - @Deprecated - TmfGraph compute(TmfVertex start, @Nullable TmfVertex end) throws CriticalPathAlgorithmException; - /** * Computes the critical path * diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/ICriticalPathProvider.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/ICriticalPathProvider.java index d42ec4c002..811062bcaf 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/ICriticalPathProvider.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/ICriticalPathProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2022 École Polytechnique de Montréal + * Copyright (c) 2017, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License 2.0 which @@ -12,9 +12,7 @@ package org.eclipse.tracecompass.analysis.graph.core.criticalpath; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; -import org.eclipse.tracecompass.internal.analysis.graph.core.graph.legacy.TmfGraphLegacyWrapper; /** * @author Geneviève Bastien @@ -22,15 +20,6 @@ */ public interface ICriticalPathProvider { - /** - * Get the critical path - * - * @return The critical path - * @deprecated Use {@link #getCriticalPathGraph()} instead - */ - @Deprecated - public @Nullable TmfGraph getCriticalPath(); - /** * Get the critical path * @@ -38,8 +27,7 @@ public interface ICriticalPathProvider { * @since 4.0 */ default @Nullable ITmfGraph getCriticalPathGraph() { - TmfGraph criticalPath = getCriticalPath(); - return criticalPath == null ? null : new TmfGraphLegacyWrapper(criticalPath); + return null; } } diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/base/ITmfGraphVisitor.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/ITmfGraphVisitor.java similarity index 86% rename from analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/base/ITmfGraphVisitor.java rename to analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/ITmfGraphVisitor.java index 552ff8a858..bc06f52670 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/base/ITmfGraphVisitor.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/ITmfGraphVisitor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2022 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -13,15 +13,12 @@ * Geneviève Bastien - Initial implementation and API *******************************************************************************/ -package org.eclipse.tracecompass.analysis.graph.core.base; +package org.eclipse.tracecompass.internal.analysis.graph.core.base; /** * Interface for all graph visitors. Using on the graph exploration method, the * visit methods will be called for each vertex and edge visited - * - * @deprecated Use {@link org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraphVisitor} instead */ -@Deprecated public interface ITmfGraphVisitor { /** diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/base/TmfEdge.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfEdge.java similarity index 94% rename from analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/base/TmfEdge.java rename to analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfEdge.java index 03209838f9..214223dc3d 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/base/TmfEdge.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfEdge.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2022 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -13,14 +13,11 @@ * Geneviève Bastien - Initial implementation and API *******************************************************************************/ -package org.eclipse.tracecompass.analysis.graph.core.base; +package org.eclipse.tracecompass.internal.analysis.graph.core.base; import java.util.Map; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfEdge; -import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; -import org.eclipse.tracecompass.internal.analysis.graph.core.base.Messages; import org.eclipse.tracecompass.tmf.core.dataprovider.X11ColorUtils; import org.eclipse.tracecompass.tmf.core.model.StyleProperties; @@ -31,10 +28,7 @@ * * @author Francis Giraldeau * @author Geneviève Bastien - * @deprecated Use the {@link ITmfEdge} instead and the {@link ITmfGraph} - * interface to create edges. */ -@Deprecated public class TmfEdge { /** diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/base/TmfGraph.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfGraph.java similarity index 97% rename from analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/base/TmfGraph.java rename to analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfGraph.java index a9be6884db..72e4165711 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/base/TmfGraph.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfGraph.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2022 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -13,7 +13,7 @@ * Geneviève Bastien - Initial implementation and API *******************************************************************************/ -package org.eclipse.tracecompass.analysis.graph.core.base; +package org.eclipse.tracecompass.internal.analysis.graph.core.base; import java.util.ArrayDeque; import java.util.Deque; @@ -26,14 +26,16 @@ import java.util.concurrent.CountDownLatch; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge.EdgeType; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfVertex.EdgeDirection; +import org.eclipse.tracecompass.analysis.graph.core.base.CycleDetectedException; +import org.eclipse.tracecompass.analysis.graph.core.base.IGraphWorker; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfEdge; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; +import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraphVisitor; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfVertex; import org.eclipse.tracecompass.analysis.graph.core.graph.TmfGraphFactory; import org.eclipse.tracecompass.common.core.NonNullUtils; -import org.eclipse.tracecompass.internal.analysis.graph.core.base.Messages; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfEdge.EdgeType; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfVertex.EdgeDirection; import org.eclipse.tracecompass.internal.analysis.graph.core.graph.legacy.OSEdgeContextState; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; @@ -474,7 +476,7 @@ public String dump() { * @param visitor * The visitor */ - public void scanLineTraverse(final @Nullable TmfVertex start, final ITmfGraphVisitor visitor) { + public void scanLineTraverse(final @Nullable TmfVertex start, final TmfGraphVisitor visitor) { if (start == null) { return; } @@ -523,7 +525,7 @@ public void scanLineTraverse(final @Nullable TmfVertex start, final ITmfGraphVis * @param visitor * The visitor */ - public void scanLineTraverse(@Nullable IGraphWorker start, final ITmfGraphVisitor visitor) { + public void scanLineTraverse(@Nullable IGraphWorker start, final TmfGraphVisitor visitor) { if (start == null) { return; } diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfGraphStatistics.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfGraphStatistics.java index 14ee131543..3b902dc4a7 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfGraphStatistics.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfGraphStatistics.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2022 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License 2.0 which @@ -20,10 +20,6 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.graph.core.base.IGraphWorker; -import org.eclipse.tracecompass.analysis.graph.core.base.ITmfGraphVisitor; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfVertex; /** * Class that computes statistics on time spent in the elements (objects) of a @@ -32,10 +28,8 @@ * @author Francis Giraldeau * @author Geneviève Bastien * @author Matthew Khouzam - * @deprecated Use the one from o.e.t.internal.graph.core.graph */ -@Deprecated -public class TmfGraphStatistics implements ITmfGraphVisitor { +public class TmfGraphStatistics extends TmfGraphVisitor { private final Map fWorkerStats; private Long fTotal; diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfGraphVisitor.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfGraphVisitor.java index 8977251f0f..e07a54704e 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfGraphVisitor.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfGraphVisitor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2022 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -15,17 +15,12 @@ package org.eclipse.tracecompass.internal.analysis.graph.core.base; -import org.eclipse.tracecompass.analysis.graph.core.base.ITmfGraphVisitor; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfVertex; - /** * An empty implementation of the graph visitor * * @author Geneviève Bastien * @author Francis Giraldeau */ -@Deprecated public class TmfGraphVisitor implements ITmfGraphVisitor { @Override diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/base/TmfVertex.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfVertex.java similarity index 92% rename from analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/base/TmfVertex.java rename to analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfVertex.java index 29f458cd87..d2cdc3b5ac 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/base/TmfVertex.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfVertex.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2022 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -13,30 +13,22 @@ * Geneviève Bastien - Initial implementation and API *******************************************************************************/ -package org.eclipse.tracecompass.analysis.graph.core.base; +package org.eclipse.tracecompass.internal.analysis.graph.core.base; import java.util.Comparator; import java.util.Objects; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge.EdgeType; -import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfVertex; -import org.eclipse.tracecompass.internal.analysis.graph.core.base.Messages; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfEdge.EdgeType; /** * Timed vertex for TmfGraph * * @author Francis Giraldeau * @author Geneviève Bastien - * @deprecated Use {@link ITmfVertex} instead and to create new vertices - * {@link ITmfGraph#createVertex(IGraphWorker, long)}. Getting edges - * to/from vertices can be done via the - * {@link ITmfGraph#getEdgeFrom(ITmfVertex, org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph.EdgeDirection)} - * method */ -@Deprecated -public class TmfVertex implements Comparable { +public class TmfVertex implements ITmfVertex { private static final String UNKNOWN_EDGE_DIRECTION_TYPE = "Unknown edge direction type : "; //$NON-NLS-1$ @@ -143,6 +135,11 @@ public long getTs() { return fTimestamp; } + @Override + public long getTimestamp() { + return fTimestamp; + } + /** * Returns the unique ID of this node * @@ -326,11 +323,11 @@ public static TmfVertex getNeighborFromEdge(TmfEdge edge, EdgeDirection dir) { } @Override - public int compareTo(@Nullable TmfVertex other) { + public int compareTo(@Nullable ITmfVertex other) { if (other == null) { return 1; } - return Long.compare(fTimestamp, other.fTimestamp); + return Long.compare(fTimestamp, other.getTimestamp()); } @Override diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/criticalpath/CriticalPathAlgorithmBounded.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/criticalpath/CriticalPathAlgorithmBounded.java index 526b8e4956..5fe3e0e439 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/criticalpath/CriticalPathAlgorithmBounded.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/criticalpath/CriticalPathAlgorithmBounded.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2022 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License 2.0 which @@ -21,14 +21,11 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.graph.core.base.IGraphWorker; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfVertex; import org.eclipse.tracecompass.analysis.graph.core.criticalpath.CriticalPathAlgorithmException; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfEdge; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfVertex; import org.eclipse.tracecompass.analysis.graph.core.graph.TmfEdgeState; -import org.eclipse.tracecompass.internal.analysis.graph.core.graph.legacy.TmfGraphLegacyWrapper; /** * Critical path bounded algorithm: backward resolution of blocking limited to @@ -53,17 +50,6 @@ public CriticalPathAlgorithmBounded(ITmfGraph graph) { super(graph); } - @Deprecated - public CriticalPathAlgorithmBounded(TmfGraph graph) { - super(new TmfGraphLegacyWrapper(graph)); - } - - @Deprecated - @Override - public TmfGraph compute(TmfVertex start, @Nullable TmfVertex end) throws CriticalPathAlgorithmException { - throw new UnsupportedOperationException("Old and new implementations are incompatible"); //$NON-NLS-1$ - } - /** * Add the links to the critical path, with currentVertex to glue to * diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/CriticalPathModule.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/criticalpath/CriticalPathModule.java similarity index 89% rename from analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/CriticalPathModule.java rename to analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/criticalpath/CriticalPathModule.java index 36e6b36ee2..a7f2166be0 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/CriticalPathModule.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/criticalpath/CriticalPathModule.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2022 École Polytechnique de Montréal + * Copyright (c) 2015, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -8,17 +8,20 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tracecompass.analysis.graph.core.criticalpath; +package org.eclipse.tracecompass.internal.analysis.graph.core.criticalpath; import java.util.Objects; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.graph.core.base.IGraphWorker; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; import org.eclipse.tracecompass.analysis.graph.core.building.AbstractTmfGraphBuilderModule; +import org.eclipse.tracecompass.analysis.graph.core.criticalpath.ICriticalPathProvider; +import org.eclipse.tracecompass.analysis.graph.core.criticalpath.OSCriticalPathModule; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfGraph; import org.eclipse.tracecompass.tmf.core.analysis.TmfAbstractAnalysisModule; import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException; + import com.google.common.annotations.VisibleForTesting; /** @@ -78,14 +81,16 @@ private CriticalPathModule getCriticalPathModule() { } return Objects.requireNonNull(fCriticalPathModule); } - @Override + public @Nullable TmfGraph getCriticalPath() { return getCriticalPathModule().getCriticalPath(); } + @Override protected boolean executeAnalysis(IProgressMonitor monitor) throws TmfAnalysisException { return getCriticalPathModule().executeAnalysis(monitor); } + @Override protected void canceling() { getCriticalPathModule().canceling(); diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/OSEdgeContextState.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/OSEdgeContextState.java index 0961fcc2e3..6864cac4e4 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/OSEdgeContextState.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/OSEdgeContextState.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 École Polytechnique de Montréal + * Copyright (c) 2022, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -15,10 +15,10 @@ import java.util.HashMap; import java.util.Map; -import org.eclipse.tracecompass.internal.analysis.graph.core.base.Messages; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfEdgeContextState; import org.eclipse.tracecompass.analysis.graph.core.graph.TmfEdgeState; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.Messages; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfEdge; import org.eclipse.tracecompass.tmf.core.dataprovider.X11ColorUtils; import org.eclipse.tracecompass.tmf.core.model.StyleProperties; @@ -212,7 +212,6 @@ public OSEdgeContextState(int code) { * Legacy constructor to instantiate the new object with the old enum. * @param type old edge type */ - @SuppressWarnings("deprecation") public OSEdgeContextState(TmfEdge.EdgeType type) { switch (type) { case BLOCKED: @@ -259,7 +258,6 @@ public OSEdgeContextState(TmfEdge.EdgeType type) { * Getter that returns the old edge type from the context state enum * @return the old edge type from {@link TmfEdge} */ - @SuppressWarnings({ "deprecation", "javadoc" }) public TmfEdge.EdgeType getOldEdgeType() { switch (fContextState) { case BLOCKED: diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfEdgeLegacyWrapper.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfEdgeLegacyWrapper.java index 295fe5cd54..0f03763e8d 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfEdgeLegacyWrapper.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfEdgeLegacyWrapper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 École Polytechnique de Montréal + * Copyright (c) 2022, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -14,16 +14,15 @@ import java.util.Objects; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfEdge; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfVertex; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfEdge; /** * Wrapper around the legacy {@link TmfEdge} class to make it an ITmfEdge * * @author Geneviève Bastien */ -@SuppressWarnings("deprecation") public class TmfEdgeLegacyWrapper implements ITmfEdge { private TmfEdge fLegacyEdge; diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfGraphLegacyWrapper.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfGraphLegacyWrapper.java index 50dd54ddd2..41a27d182a 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfGraphLegacyWrapper.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfGraphLegacyWrapper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 École Polytechnique de Montréal + * Copyright (c) 2022, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -20,13 +20,13 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.graph.core.base.IGraphWorker; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfEdge; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfVertex; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfEdge; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfEdgeContextState; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfVertex; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfEdge; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfGraph; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfVertex; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; /** diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfVertexLegacyWrapper.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfVertexLegacyWrapper.java index 4a6ddf75e3..9e69426f54 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfVertexLegacyWrapper.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfVertexLegacyWrapper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 École Polytechnique de Montréal + * Copyright (c) 2022, 2024 École Polytechnique de Montréal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 which @@ -15,16 +15,15 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.graph.core.base.IGraphWorker; -import org.eclipse.tracecompass.analysis.graph.core.base.TmfVertex; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph; import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfVertex; +import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfVertex; /** * Wrapper around the legacy {@link TmfVertex} class to make it an ITmfVertex * * @author Geneviève Bastien */ -@SuppressWarnings("deprecation") public class TmfVertexLegacyWrapper implements ITmfVertex { private final IGraphWorker fWorker;