From 2ddddd128b4ae2561e0f57e2ab1d164401a176c3 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Thu, 27 Apr 2023 15:34:18 -0400 Subject: [PATCH] Bug 581856: Remove the deprecated IMetadataStrings Replace it with CoreMetadataStrings use, as prescribed by the deprecation notice. Deprecated in commit 2d3d2f02cd, since v7.1.0. [Removed] o.e.t.tmf.core.model.timegraph.IMetadataStrings Change-Id: I6db8a71a890bc92279930a21d41ee3ecb5e193b2 Signed-off-by: Marco Miller Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/201574 Tested-by: Bernd Hufmann Tested-by: Trace Compass Bot Reviewed-by: Bernd Hufmann --- .../model/timegraph/IMetadataStrings.java | 38 ------------------- .../widgets/timegraph/model/ITimeEvent.java | 4 +- .../timegraph/model/NamedTimeEvent.java | 4 +- 3 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/timegraph/IMetadataStrings.java diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/timegraph/IMetadataStrings.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/timegraph/IMetadataStrings.java deleted file mode 100644 index d09342599e..0000000000 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/timegraph/IMetadataStrings.java +++ /dev/null @@ -1,38 +0,0 @@ -/********************************************************************** - * Copyright (c) 2019, 2021 Ericsson - * - * All rights reserved. This program and the accompanying materials are - * made available under the terms of the Eclipse Public License 2.0 which - * accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - **********************************************************************/ - -package org.eclipse.tracecompass.tmf.core.model.timegraph; - -import org.eclipse.tracecompass.tmf.core.model.CoreMetadataStrings; -import org.eclipse.tracecompass.tmf.core.model.ICoreElementResolver; - -/** - * String constants to be used for the metadata of {@link ICoreElementResolver}. - * - * @since 5.2 - * @noimplement This interface is not intended to be implemented by clients. - * - * @deprecated use {@link CoreMetadataStrings} instead - */ -@Deprecated -public interface IMetadataStrings { - - /** - * The key for the label field - */ - static final String LABEL_KEY = CoreMetadataStrings.LABEL_KEY; - - /** - * The key for the entry name field - */ - static final String ENTRY_NAME_KEY = CoreMetadataStrings.ENTRY_NAME_KEY; - -} diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/ITimeEvent.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/ITimeEvent.java index 21d3d5a5dd..4273dca588 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/ITimeEvent.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/ITimeEvent.java @@ -16,9 +16,9 @@ package org.eclipse.tracecompass.tmf.ui.widgets.timegraph.model; import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.tracecompass.tmf.core.model.CoreMetadataStrings; import org.eclipse.tracecompass.tmf.core.model.ICoreElementResolver; import org.eclipse.tracecompass.tmf.core.model.ICorePropertyCollection; -import org.eclipse.tracecompass.tmf.core.model.timegraph.IMetadataStrings; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; @@ -95,6 +95,6 @@ default String getLabel() { @Override default @NonNull Multimap<@NonNull String, @NonNull Object> getMetadata() { String entryName = getEntry().getName(); - return (entryName != null) ? ImmutableMultimap.of(IMetadataStrings.ENTRY_NAME_KEY, entryName) : ImmutableMultimap.of(); + return (entryName != null) ? ImmutableMultimap.of(CoreMetadataStrings.ENTRY_NAME_KEY, entryName) : ImmutableMultimap.of(); } } \ No newline at end of file diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/NamedTimeEvent.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/NamedTimeEvent.java index 16e3fb300d..8ac8e13c3f 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/NamedTimeEvent.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/NamedTimeEvent.java @@ -14,7 +14,7 @@ import java.util.Objects; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.tracecompass.tmf.core.model.timegraph.IMetadataStrings; +import org.eclipse.tracecompass.tmf.core.model.CoreMetadataStrings; import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphState; import com.google.common.collect.ImmutableMultimap; @@ -101,7 +101,7 @@ public NamedTimeEvent(ITimeGraphEntry entry, String label, ITimeGraphState state } com.google.common.collect.ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); builder.putAll(super.getMetadata()); - builder.put(IMetadataStrings.ENTRY_NAME_KEY, entryName); + builder.put(CoreMetadataStrings.ENTRY_NAME_KEY, entryName); return builder.build(); }