Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Tasse2014-04-17 14:37:45 +0000
committerPatrick Tasse2014-04-22 21:01:38 +0000
commit76b0b680a31de0648ac74b37f5f6c7c7e3a69f46 (patch)
tree8be562de8c217d23c35568f5d0802893e34d97d3
parent1c6b74ae404d237d4652e3f28d04c75de349bc1b (diff)
downloadorg.eclipse.linuxtools-76b0b680a31de0648ac74b37f5f6c7c7e3a69f46.tar.gz
org.eclipse.linuxtools-76b0b680a31de0648ac74b37f5f6c7c7e3a69f46.tar.xz
org.eclipse.linuxtools-76b0b680a31de0648ac74b37f5f6c7c7e3a69f46.zip
tmf: Fix IOException drag and dropping trace on open experiment
The editors must be closed before deleting supplementary files. Change-Id: I538c77dd1da3b2ccfb99986ce225e9b6a2c46f7a Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com> Reviewed-on: https://git.eclipse.org/r/25213 Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizardPage.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java
index e16725790c..6523da976e 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java
@@ -272,8 +272,8 @@ public class DropAdapterAssistant extends CommonDropAdapterAssistant {
if (traceResource != null && traceResource.exists()) {
setTraceType(traceResource);
createLink(targetExperiment.getResource(), traceResource, traceResource.getName());
- targetExperiment.deleteSupplementaryResources();
targetExperiment.closeEditors();
+ targetExperiment.deleteSupplementaryResources();
return traceResource;
}
return null;
@@ -404,8 +404,8 @@ public class DropAdapterAssistant extends CommonDropAdapterAssistant {
}
setTraceType(resource);
createLink(targetExperiment.getResource(), resource, resource.getName());
- targetExperiment.deleteSupplementaryResources();
targetExperiment.closeEditors();
+ targetExperiment.deleteSupplementaryResources();
return true;
}
}
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizardPage.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizardPage.java
index 580a279fc4..6cb7edf2b6 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizardPage.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/SelectTracesWizardPage.java
@@ -161,8 +161,8 @@ public class SelectTracesWizardPage extends WizardPage {
changed = true;
}
if (changed) {
- fExperiment.deleteSupplementaryResources();
fExperiment.closeEditors();
+ fExperiment.deleteSupplementaryResources();
}
return true;

Back to the top