This is an automated email from the git hooks/post-receive script. New commit to branch feature/7591_Correction_migration_entites_d_un_parent_a_un_autre in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 51c5a02e52866e88bb9ae224228af0b779d2bcd5 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Thu Jul 28 15:44:51 2016 +0200 Fix loop and rename cleanAndPopulateMethod to clearAndPopulate refs #7591 --- .../ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java | 2 +- .../src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java index 321f936..8874521 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java @@ -205,7 +205,7 @@ public class MoveActivitySeinesUIAction extends AbstractUIAction { treeHelper.selectNode(newActivitiesNode); // 2. Let's fully reload newActivitiesNode - treeHelper.cleanAndPopulateNode(newActivitiesNode); + treeHelper.clearAndPopulateNode(newActivitiesNode); // 3. We ensure the path until the newActivitiesNode is expanded // so that the user can see the activities he moved diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java index cbb5c1d..a0feb5f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java @@ -640,10 +640,10 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { node.populateNode(getBridge(), getDataProvider(), true); } - public void cleanAndPopulateNode(ObserveNode node) { + public void clearAndPopulateNode(ObserveNode node) { // 1. We delete all children of the node because populating only *add* child, it never refreshes totally - for (int i=0, l = node.getChildCount(); i < l; i++) { - removeNode(node.getChildAt(i)); + while (node.getChildCount() > 0) { + removeNode(node.getFirstChild()); } // 2. We re-generate node's children -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.