Author: knopp
Date: Fri Jul 11 03:02:12 2008
New Revision: 675898
URL: http://svn.apache.org/viewvc?rev=675898&view=rev
Log:
more fixes
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=675898&r1=675897&r2=675898&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
Fri Jul 11 03:02:12 2008
@@ -810,7 +810,7 @@
if (parentItem != null && isNodeVisible(parent) &&
isNodeExpanded(parent))
{
- boolean nonEmpty = !parentItem.getChildren().isEmpty();
+ boolean nonEmpty = parentItem.getChildren() != null &&
!parentItem.getChildren().isEmpty();
for (int i = 0; i < e.getChildren().length; ++i)
{
Object node = e.getChildren()[i];
@@ -831,12 +831,13 @@
getTreeState().selectNode(item.getDefaultModelObject(), false);
}
});
-
-
getTreeState().selectNode(item.getDefaultModelObject(), false);
-
+
parentItem.getChildren().remove(item);
removeItem(item);
+
+
getTreeState().selectNode(item.getDefaultModelObject(), false);
+
}
}
if (nonEmpty && parentItem.getChildren().isEmpty())
