Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-Andre Laperle2014-12-08 03:52:07 +0000
committerMarc-Andre Laperle2014-12-08 23:14:43 +0000
commit75774ca175425101f715d806ef573fb7a2a3a771 (patch)
treebac2f3ca3e9aeb94041104f7f5fe8b81b9c73d28
parent42909904f30693e9e02e14337750877e316907c7 (diff)
downloadorg.eclipse.linuxtools-75774ca175425101f715d806ef573fb7a2a3a771.tar.gz
org.eclipse.linuxtools-75774ca175425101f715d806ef573fb7a2a3a771.tar.xz
org.eclipse.linuxtools-75774ca175425101f715d806ef573fb7a2a3a771.zip
tmf: Fix supplementary files always being imported in trace package
Change-Id: Ia7cb4f8434e1221c9a4c1e49e9ce49895a8ec0e1 Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Reviewed-on: https://git.eclipse.org/r/37716 Tested-by: Hudson CI Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com> Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java
index b2e9587123..723cec2799 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java
@@ -392,8 +392,10 @@ public class TracePackageImportOperation extends AbstractTracePackageOperation i
private IStatus importSupplFiles(TracePackageSupplFilesElement suppFilesElement, TracePackageTraceElement traceElement, IProgressMonitor monitor) {
List<Pair<String, String>> fileNameAndLabelPairs = new ArrayList<>();
for (TracePackageElement child : suppFilesElement.getChildren()) {
- TracePackageSupplFileElement supplFile = (TracePackageSupplFileElement) child;
- fileNameAndLabelPairs.add(new Pair<>(supplFile.getText(), new Path(supplFile.getText()).lastSegment()));
+ if (child.isChecked()) {
+ TracePackageSupplFileElement supplFile = (TracePackageSupplFileElement) child;
+ fileNameAndLabelPairs.add(new Pair<>(supplFile.getText(), new Path(supplFile.getText()).lastSegment()));
+ }
}
if (!fileNameAndLabelPairs.isEmpty()) {

Back to the top