Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Montplaisir2012-07-16 15:19:39 -0400
committerGerrit Code Review @ Eclipse.org2012-07-16 15:19:39 -0400
commit7b02a527c78f4839341d4ecb0696c61668f5854d (patch)
tree5bd5285f87817fa07cc8ec924dde933396df0316
parent9dc3ba9272104ef5adce858bc9762678d8acf00f (diff)
parentc44524fdda3b5b7a8b9289dced61cd9c1477314b (diff)
downloadorg.eclipse.linuxtools-7b02a527c78f4839341d4ecb0696c61668f5854d.tar.gz
org.eclipse.linuxtools-7b02a527c78f4839341d4ecb0696c61668f5854d.tar.xz
org.eclipse.linuxtools-7b02a527c78f4839341d4ecb0696c61668f5854d.zip
Merge "Fix for bug 384406: Delete trace propagation not working in Windows."
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteTraceHandler.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteTraceHandler.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteTraceHandler.java
index 656565b088..012e10c7cc 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteTraceHandler.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteTraceHandler.java
@@ -12,7 +12,6 @@
package org.eclipse.linuxtools.internal.tmf.ui.project.handlers;
-import java.io.IOException;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -116,7 +115,7 @@ public class DeleteTraceHandler extends AbstractHandler {
try {
IPath path = resource.getLocation();
if (path != null && (trace.getParent() instanceof TmfTraceFolder)) {
- String location = path.toFile().getCanonicalPath();
+ String location = path.toString();
TmfExperimentFolder experimentFolder = trace.getProject().getExperimentsFolder();
// Propagate the removal to traces
@@ -143,8 +142,6 @@ public class DeleteTraceHandler extends AbstractHandler {
// Refresh the project
trace.getProject().refresh();
- } catch (IOException e) {
- Activator.getDefault().logError("Error deleting trace: " + trace.getName(), e); //$NON-NLS-1$
} catch (CoreException e) {
Activator.getDefault().logError("Error deleting trace: " + trace.getName(), e); //$NON-NLS-1$
}

Back to the top