From e45ed4d53f164b1e13974678b61cb017acfe2817 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Mon, 24 Oct 2016 13:04:42 +0200 Subject: [PATCH] ref #6159: minor --- .../wizard/AvailableDistributionPage.java | 65 +++++++++++++------ 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java index 10ac9e270..71f2ccd29 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java @@ -110,7 +110,7 @@ public class AvailableDistributionPage extends WizardPage implements ICdmEntityS try { TreePath path = ((ITreeSelection) viewer.getSelection()).getPaths()[0]; - checkChildren(path, event.getChecked()); + checkChildren(event.getElement(), event.getChecked()); checkParents(path.getParentPath()); } finally { @@ -230,28 +230,51 @@ public class AvailableDistributionPage extends WizardPage implements ICdmEntityS checkParents(path.getParentPath()); } +// /** +// * +// * @param path +// * @param checked +// */ +// private void checkChildren(final TreePath path, final boolean checked) { +// TermContentProvider tcp = new TermContentProvider(); +// +// if (path == null) { +// return; +// } +// final Object element = path.getLastSegment(); +// if (element != null) { +// this.viewer.setChecked(element, checked); +// this.viewer.setGrayed(element, false); +// int length = tcp.getChildren(element).length; +// if(length>1){ +// this.viewer.expandToLevel(element, CheckboxTreeViewer.ALL_LEVELS); +// this.viewer.setSubtreeChecked(element, checked); +// } +// } +// } + /** - * - * @param path - * @param checked - */ - private void checkChildren(final TreePath path, final boolean checked) { - TermContentProvider tcp = new TermContentProvider(); + * + * @param path + * @param checked + */ + private void checkChildren(final Object element, final boolean checked) { + TermContentProvider tcp = new TermContentProvider(); - if (path == null) { - return; - } - final Object element = path.getLastSegment(); - if (element != null) { - this.viewer.setChecked(element, checked); - this.viewer.setGrayed(element, false); - int length = tcp.getChildren(element).length; - if(length>1){ - this.viewer.expandToLevel(element, CheckboxTreeViewer.ALL_LEVELS); - this.viewer.setSubtreeChecked(element, checked); - } - } - } + if (element == null) { + return; + } + // final Object element = path.getLastSegment(); + if (element != null) { + this.viewer.setChecked(element, checked); + this.viewer.setGrayed(element, false); + int length = tcp.getChildren(element).length; + if(length>1){ + this.viewer.expandToLevel(element, CheckboxTreeViewer.ALL_LEVELS); + this.viewer.setSubtreeChecked(element, checked); + } + } + } @Override public void dispose() { -- 2.34.1