From 38d284ebcd566536cb3ffda11f4af5b280a0b49e Mon Sep 17 00:00:00 2001 From: Patrick Tasse Date: Wed, 17 Dec 2014 18:09:22 -0500 Subject: tmf: Rename getCanonicalName() to getTraceTypeId() in TraceTypeHelper The trace type id is not always a canonical name, it is any string defined by the developer in the plugin.xml tracetype extension point. Change-Id: I3618398b74e460368219cff397d02ef81349485c Signed-off-by: Patrick Tasse Reviewed-on: https://git.eclipse.org/r/38513 Reviewed-by: Hudson CI Reviewed-by: Bernd Hufmann Tested-by: Bernd Hufmann --- .../wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java | 4 ++-- .../tracecompass/tmf/ui/project/model/TmfTraceTypeUIUtils.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'org.eclipse.tracecompass.tmf.ui/src/org/eclipse') diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java index 8cf8415883..0a134d9171 100644 --- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java +++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013, 2014 Ericsson + * Copyright (c) 2013, 2015 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -133,7 +133,7 @@ public class ImportTraceWizardSelectTraceTypePage extends AbstractImportTraceWiz if (children != null) { for (TraceTypeHelper traceType : children) { if (fTreeView.getChecked(traceType)) { - tracesToScan.add(traceType.getCanonicalName()); + tracesToScan.add(traceType.getTraceTypeId()); } } } diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfTraceTypeUIUtils.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfTraceTypeUIUtils.java index 5859ba3b2b..3a4271d18b 100644 --- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfTraceTypeUIUtils.java +++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfTraceTypeUIUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014 Ericsson + * Copyright (c) 2014, 2015 Ericsson * * All rights reserved. This program and the accompanying materials are * made available under the terms of the Eclipse Public License v1.0 which @@ -137,7 +137,7 @@ public final class TmfTraceTypeUIUtils { Button b = new Button(shellToShow, SWT.RADIO); final String displayName = candidate.getCategoryName() + ':' + candidate.getName(); b.setText(displayName); - names.put(displayName, candidate.getCanonicalName()); + names.put(displayName, candidate.getTraceTypeId()); b.addSelectionListener(new SelectionListener() { @@ -219,7 +219,7 @@ public final class TmfTraceTypeUIUtils { List> reducedCandidates = reduce(candidates); for (Pair candidatePair : reducedCandidates) { TraceTypeHelper candidate = candidatePair.getSecond(); - if (candidate.getCanonicalName().equals(traceTypeHint)) { + if (candidate.getTraceTypeId().equals(traceTypeHint)) { traceTypeToSet = candidate; break; } @@ -276,7 +276,7 @@ public final class TmfTraceTypeUIUtils { * @since 3.1 */ public static IStatus setTraceType(IResource resource, TraceTypeHelper traceType, boolean refresh) throws CoreException { - String traceTypeId = traceType.getCanonicalName(); + String traceTypeId = traceType.getTraceTypeId(); resource.setPersistentProperty(TmfCommonConstants.TRACETYPE, traceTypeId); -- cgit v1.2.3