Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Chouinard2012-07-16 17:34:12 -0400
committerFrancois Chouinard2012-07-16 17:36:25 -0400
commit99b0ce8000d1dcb20739a99c7c39a7e579dc0945 (patch)
treeb0390682d4dea1a1032dbd73bb5785d121730aa8
parent7b44d2f3481ef3840a762730e64ff2435fc54ca5 (diff)
downloadorg.eclipse.linuxtools-99b0ce8000d1dcb20739a99c7c39a7e579dc0945.tar.gz
org.eclipse.linuxtools-99b0ce8000d1dcb20739a99c7c39a7e579dc0945.tar.xz
org.eclipse.linuxtools-99b0ce8000d1dcb20739a99c7c39a7e579dc0945.zip
Final fix for Bug384878
Change-Id: I21f95490799461eb8ac161fea48e527dbba27892 Signed-off-by: Francois Chouinard <fchouinard@gmail.com>
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java
index 91c0dd17e5..5c11c66203 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/ImportTraceWizardPage.java
@@ -883,7 +883,7 @@ public class ImportTraceWizardPage extends WizardResourceImportPage {
String prefix = null;
for (int i = 0; i < files.size(); i++) {
File file = fileSystemObjects.get(files.get(i));
- String name = file.getAbsolutePath();
+ String name = file.getAbsolutePath() + File.separatorChar;
if (fTargetFolder != null && (prefix == null || !name.startsWith(prefix))) {
prefix = name; // new prefix
IResource resource = fTargetFolder.findMember(file.getName());
@@ -941,9 +941,9 @@ public class ImportTraceWizardPage extends WizardResourceImportPage {
List<File> subList = new ArrayList<File>();
subList.add(resource);
if (resource.isDirectory()) {
- String prefix = resource.getAbsolutePath();
+ String prefix = resource.getAbsolutePath() + File.separatorChar;
boolean hasSamePrefix = true;
- for (int j = i; j < fileList.size() && hasSamePrefix; j++) {
+ for (int j = i + 1; j < fileList.size() && hasSamePrefix; j++) {
File res = fileList.get(j);
hasSamePrefix = res.getAbsolutePath().startsWith(prefix);
if (hasSamePrefix) {

Back to the top