Skip to content

Commit 6dc4ea7

Browse files
committed
analysis.graph: Cleanup non-API deprecation issues in dependency graph
Fixes issue #87 [Removed] CriticalPathModule [Removed] CriticalPathPalette Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
1 parent f5c4c28 commit 6dc4ea7

6 files changed

Lines changed: 10 additions & 139 deletions

File tree

analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/criticalpath/AbstractCriticalPathModule.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import org.eclipse.tracecompass.analysis.graph.core.graph.WorkerSerializer;
2626
import org.eclipse.tracecompass.common.core.NonNullUtils;
2727
import org.eclipse.tracecompass.internal.analysis.graph.core.Activator;
28-
import org.eclipse.tracecompass.internal.analysis.graph.core.criticalpath.CriticalPathModule;
2928
import org.eclipse.tracecompass.internal.analysis.graph.core.criticalpath.Messages;
3029
import org.eclipse.tracecompass.internal.analysis.graph.core.criticalpath.OSCriticalPathAlgorithm;
30+
import org.eclipse.tracecompass.tmf.core.analysis.TmfAbstractAnalysisModule;
3131
import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException;
3232
import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
3333
import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager;
@@ -41,7 +41,13 @@
4141
* @author Geneviève Bastien
4242
* @since 4.0
4343
*/
44-
public abstract class AbstractCriticalPathModule extends CriticalPathModule {
44+
public abstract class AbstractCriticalPathModule extends TmfAbstractAnalysisModule implements ICriticalPathProvider {
45+
46+
/**
47+
* Analysis ID for this module
48+
* @since 5.0
49+
*/
50+
public static final String ANALYSIS_ID = "org.eclipse.tracecompass.analysis.graph.core.criticalpath"; //$NON-NLS-1$
4551

4652
/** Worker_id parameter name */
4753
public static final String PARAM_WORKER = "workerid"; //$NON-NLS-1$
@@ -62,7 +68,6 @@ public abstract class AbstractCriticalPathModule extends CriticalPathModule {
6268
* @since 1.1
6369
*/
6470
public AbstractCriticalPathModule(AbstractTmfGraphBuilderModule graph) {
65-
super(graph);
6671
addParameter(PARAM_WORKER);
6772
setId(ANALYSIS_ID);
6873
fGraphModule = graph;

analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/CriticalPathPalette.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/base/TmfGraph.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraph;
3333
import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfGraphVisitor;
3434
import org.eclipse.tracecompass.analysis.graph.core.graph.ITmfVertex;
35-
import org.eclipse.tracecompass.analysis.graph.core.graph.TmfGraphFactory;
3635
import org.eclipse.tracecompass.common.core.NonNullUtils;
3736
import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfEdge.EdgeType;
3837
import org.eclipse.tracecompass.internal.analysis.graph.core.base.TmfVertex.EdgeDirection;
@@ -55,10 +54,7 @@
5554
*
5655
* @author Francis Giraldeau
5756
* @author Geneviève Bastien
58-
* @deprecated Use the {@link ITmfGraph} API instead, and the
59-
* {@link TmfGraphFactory} to create new graphs.
6057
*/
61-
@Deprecated
6258
public class TmfGraph {
6359

6460
private final ListMultimap<IGraphWorker, TmfVertex> fNodeMap;

analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/criticalpath/CriticalPathModule.java

Lines changed: 0 additions & 98 deletions
This file was deleted.

analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/dataprovider/CriticalPathDataProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**********************************************************************
2-
* Copyright (c) 2018, 2022 Ericsson
2+
* Copyright (c) 2018, 2024 Ericsson
33
*
44
* All rights reserved. This program and the accompanying materials are
55
* made available under the terms of the Eclipse Public License 2.0 which
@@ -151,7 +151,7 @@ public CriticalPathDataProvider(@NonNull ITmfTrace trace, @NonNull AbstractCriti
151151
}
152152

153153
/**
154-
* Get the current {@link IGraphWorker} from the {@link CriticalPathModule}
154+
* Get the current {@link IGraphWorker} from the critical path module
155155
*
156156
* @return the current graph worker if it is set, else null.
157157
*/

analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/internal/analysis/graph/core/graph/legacy/TmfGraphLegacyWrapper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
*
3636
* @author Geneviève Bastien
3737
*/
38-
@SuppressWarnings("deprecation")
3938
public class TmfGraphLegacyWrapper implements ITmfGraph {
4039

4140
/* Latch tracking if the graph is done building or not */

0 commit comments

Comments
 (0)