Skip to content

Commit

Permalink
Bug 581856: Remove the deprecated IMetadataStrings
Browse files Browse the repository at this point in the history
Replace it with CoreMetadataStrings use, as prescribed by the
deprecation notice.

Deprecated in commit 2d3d2f0, since v7.1.0.

[Removed] o.e.t.tmf.core.model.timegraph.IMetadataStrings

Change-Id: I6db8a71a890bc92279930a21d41ee3ecb5e193b2
Signed-off-by: Marco Miller <marco.miller@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/201574
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
  • Loading branch information
marco-miller committed Apr 28, 2023
1 parent 9fd3f9b commit 2ddddd1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 42 deletions.

This file was deleted.

Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}
}
Expand Up @@ -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;
Expand Down Expand Up @@ -101,7 +101,7 @@ public NamedTimeEvent(ITimeGraphEntry entry, String label, ITimeGraphState state
}
com.google.common.collect.ImmutableMultimap.Builder<String, Object> builder = ImmutableMultimap.builder();
builder.putAll(super.getMetadata());
builder.put(IMetadataStrings.ENTRY_NAME_KEY, entryName);
builder.put(CoreMetadataStrings.ENTRY_NAME_KEY, entryName);
return builder.build();
}

Expand Down

0 comments on commit 2ddddd1

Please sign in to comment.