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 <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/24884
Tested-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

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 3586d3920c26a67f62352e6b4e8b6a9a6d010714..e16725790c5e334e88e2030ff1099aac37ac7e00 100644 (file)
--- 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)) {