From 62b33b2ac8d4223abd6dd32753d2346b64c87089 Mon Sep 17 00:00:00 2001 From: Patrick Tasse Date: Fri, 11 Apr 2014 17:14:10 -0400 Subject: [PATCH] tmf: Fix drag and drop to experiment unnecessarily prompts for rename When dropping a trace to an experiment in the same project, name collision occured and the user was prompted for rename. Change-Id: I0db0d81610a7afbb1df762838bf2129db510c962 Signed-off-by: Patrick Tasse Reviewed-on: https://git.eclipse.org/r/24884 Tested-by: Hudson CI Reviewed-by: Matthew Khouzam --- .../internal/tmf/ui/project/handlers/DropAdapterAssistant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java index 3586d3920c..e16725790c 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java @@ -234,7 +234,7 @@ public class DropAdapterAssistant extends CommonDropAdapterAssistant { return null; } } - if (!targetExperiment.getProject().getTracesFolder().equals(sourceResource.getParent())) { + if (!targetExperiment.getProject().getTracesFolder().getResource().equals(sourceResource.getParent())) { String targetName = sourceResource.getName(); for (TmfTraceElement trace : targetExperiment.getProject().getTracesFolder().getTraces()) { if (trace.getName().equals(targetName)) { -- 2.34.1