summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@itmill.com>2010-03-17 11:02:57 +0000
committerHenri Sara <henri.sara@itmill.com>2010-03-17 11:02:57 +0000
commit58bcba80f3399851fa2f77b876a78e32fccccea5 (patch)
tree2022451de57bc5313a551c78c04cab3f9e51dcef /src
parentb28a74afbd735e073d6d3647de193f92ec1ce201 (diff)
downloadvaadin-framework-58bcba80f3399851fa2f77b876a78e32fccccea5.tar.gz
vaadin-framework-58bcba80f3399851fa2f77b876a78e32fccccea5.zip
#4360 HierarchicalContainer.setParent() left container in inconsistent state
svn changeset:11925/svn branch:6.3
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/data/util/HierarchicalContainer.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/vaadin/data/util/HierarchicalContainer.java b/src/com/vaadin/data/util/HierarchicalContainer.java
index 152d9b4e58..9d9b375fd6 100644
--- a/src/com/vaadin/data/util/HierarchicalContainer.java
+++ b/src/com/vaadin/data/util/HierarchicalContainer.java
@@ -238,7 +238,7 @@ public class HierarchicalContainer extends IndexedContainer implements
// roots)
// Removes from old parents children list
- final LinkedList<Object> l = children.get(itemId);
+ final LinkedList<Object> l = children.get(oldParentId);
if (l != null) {
l.remove(itemId);
if (l.isEmpty()) {
@@ -329,7 +329,8 @@ public class HierarchicalContainer extends IndexedContainer implements
}
/**
- * TODO javadoc
+ * Moves a node in the container immediately after a sibling node. The two
+ * nodes must have the same parent in the container.
*
* @param itemId
* @param siblingId