tmf: Use selected destination trace folder in Batch Import wizard

However if a project is selected in the last wizard page, the
destination is set to that project's "Traces" folder.

Change-Id: If383ed8291c8eb7ba3e88079b1fa0cfd8586ebc4
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/25442
Tested-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/BatchImportTraceWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/BatchImportTraceWizard.java
index 915e5978a30f99be0da7c0c047a485be5dcb5ab6..39d044b8771c9e78bf425be4ea75f3815b5ad43b 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/BatchImportTraceWizard.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/BatchImportTraceWizard.java
@@ -103,7 +103,7 @@ public class BatchImportTraceWizard extends ImportTraceWizard {
 
     private Map<String, Set<String>> fParentFiles = new HashMap<>();
 
-    // Target import directory ('Traces' folder)
+    // Target import directory (trace folder)
     private IFolder fTargetFolder;
 
     /**

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardPageOptions.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardPageOptions.java
index d14812b61f51af32397fbc553dd6d88796a22168..0f36112f291bd7f617362fd6f0a8a6b55ef53685 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardPageOptions.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardPageOptions.java
@@ -19,6 +19,7 @@ import java.util.Map;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.linuxtools.tmf.ui.project.model.TmfTracesFolder;
 import org.eclipse.linuxtools.tmf.ui.project.model.TraceUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -91,18 +92,17 @@ public class ImportTraceWizardPageOptions extends AbstractImportTraceWizardPage
             fProjects.setSelection(fProjects.indexOf(proj.getName()));
         } else if (fProjects.getItemCount() > 0) {
             fProjects.setSelection(0);
+            updateWithSelection();
         }
-        updateWithSelection();
         setMessage(Messages.SharedSelectProject);
         this.setTitle(Messages.ImportTraceWizardPageOptionsTitle);
     }
 
     private void updateWithSelection() {
-        final String TRACE = "Traces"; //$NON-NLS-1$
         String[] selection = fProjects.getSelection();
         if (selection.length > 0) {
             final String listItem = selection[0];
-            IFolder folder = fProjectsMap.get(listItem).getFolder(TRACE);
+            IFolder folder = fProjectsMap.get(listItem).getFolder(TmfTracesFolder.TRACES_FOLDER_NAME);
             getBatchWizard().setTraceFolder(folder);
             ImportTraceWizardPageOptions.this.setErrorMessage(null);
         } else {