From 6dae671ed85b843461e045dc362f82ed2d7e51ff Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Thu, 23 May 2013 16:45:18 -0400 Subject: tmf: fix potential bug when selecting trace types in import wizard Change-Id: I963b47cf18caba9d0ae215f74bd8861c2ea29175 Signed-off-by: Matthew Khouzam Reviewed-on: https://git.eclipse.org/r/13347 Tested-by: Hudson CI Reviewed-by: Bernd Hufmann IP-Clean: Bernd Hufmann --- .../project/wizards/importtrace/ImportTraceWizardPageOptions.java | 1 - .../wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java | 6 +++--- .../ui/project/wizards/importtrace/TraceTypeContentProvider.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardPageOptions.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardPageOptions.java index 4ccca8069f..ae8a5bdb05 100644 --- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardPageOptions.java +++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardPageOptions.java @@ -112,5 +112,4 @@ public class ImportTraceWizardPageOptions extends AbstractImportTraceWizardPage } this.setTitle(Messages.ImportTraceWizardPageOptionsTitle); } - } diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java index 754a68025f..23d2f0676e 100644 --- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java +++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java @@ -159,11 +159,11 @@ public class ImportTraceWizardSelectTraceTypePage extends AbstractImportTraceWiz ITreeContentProvider tcp = (ITreeContentProvider) fTreeView.getContentProvider(); String parentElement = (String) tcp.getParent(element); if (parentElement != null) { - String[] siblings = (String[]) tcp.getChildren(parentElement); - final String first = siblings[0]; + TraceTypeHelper[] siblings = (TraceTypeHelper[]) tcp.getChildren(parentElement); + final TraceTypeHelper first = siblings[0]; final boolean isFirstChecked = fTreeView.getChecked(first); boolean allSame = true; - for (String peer : siblings) { + for (TraceTypeHelper peer : siblings) { final boolean peerChecked = fTreeView.getChecked(peer); if (peerChecked != isFirstChecked) { allSame = false; diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/TraceTypeContentProvider.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/TraceTypeContentProvider.java index a6f99c7012..8303d77c35 100644 --- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/TraceTypeContentProvider.java +++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/TraceTypeContentProvider.java @@ -77,7 +77,7 @@ public class TraceTypeContentProvider implements ITreeContentProvider { @Override public Object getParent(Object element) { - if (element instanceof String) { + if (element instanceof TraceTypeHelper) { for (String key : fTraceCategory) { List traceSet = fTraceType.get(key); if (traceSet != null) { -- cgit v1.2.3