This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 83340538486d9a248e410d27c1c844ecce61f3dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 2 15:11:37 2015 +0200 refs #6821 : la selection des campagnes n'est pas à exporter n'est pas corrrecte --- .../genericformat/tree/CruiseSelectTreeNode.java | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java index 61f4a6e..07b3786 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java @@ -81,16 +81,24 @@ public class CruiseSelectTreeNode extends DataSelectTreeNodeSupport<CruiseDataMo @Override public CruiseDataModel getSelectedDataModel() { - Set<OperationDataModel> operations = new LinkedHashSet<>(); + CruiseDataModel result; - for (OperationSelectTreeNode o : this) { - OperationDataModel operation = o.getSelectedDataModel(); - if (operation != null) { - operations.add(operation); + if (isSelected() || isPartialSelected()) { + + Set<OperationDataModel> operations = new LinkedHashSet<>(); + + for (OperationSelectTreeNode o : this) { + OperationDataModel operation = o.getSelectedDataModel(); + if (operation != null) { + operations.add(operation); + } } + result = new CruiseDataModel(getId(), getLabel(), operations); + + } else { + result = null; } - CruiseDataModel result = new CruiseDataModel(getId(), getLabel(), operations); return result; } @@ -110,14 +118,11 @@ public class CruiseSelectTreeNode extends DataSelectTreeNodeSupport<CruiseDataMo nbChildSelected++; } } + if (!selected && nbChildSelected > 0 && nbChildSelected == nbChilds) { selected = true; } - if (selected && nbChildSelected < nbChilds) { - selected = false; - } - } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.