Author: ehillenius
Date: Mon Nov 12 15:32:22 2007
New Revision: 594346
URL: http://svn.apache.org/viewvc?rev=594346&view=rev
Log:
WICKET-1148
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=594346&r1=594345&r2=594346&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
Mon Nov 12 15:32:22 2007
@@ -18,7 +18,6 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
@@ -191,7 +190,7 @@
// yes, write empty div with id
// this is necessary for createElement js to
work correctly
getResponse().write(
- "<div style=\"display:none\"
id=\"" + getMarkupId() + "\"></div>");
+ "<div style=\"display:none\" id=\"" +
getMarkupId() + "\"></div>");
markupStream.skipComponent();
}
else
@@ -927,7 +926,7 @@
while (previous.getChildren()
!= null && previous.getChildren().size() > 0)
{
previous =
(TreeItem)previous.getChildren().get(
-
previous.getChildren().size() - 1);
+
previous.getChildren().size() - 1);
}
}
// check if the previous item isn't
waiting to be inserted
@@ -936,7 +935,7 @@
// it's already in dom, so we
can use it as point of
// insertion
target.prependJavascript("Wicket.Tree.createElement(\"" +
-
item.getMarkupId() + "\"," + "\"" + previous.getMarkupId() + "\")");
+ item.getMarkupId() +
"\"," + "\"" + previous.getMarkupId() + "\")");
// remove the item so we don't
process it again
i.remove();
@@ -1041,12 +1040,12 @@
{
// build the items for children of the items' treenode.
items =
buildTreeItems(nodeChildren((TreeNode)item.getModelObject()),
- item.getLevel() + 1);
+ item.getLevel() + 1);
}
else
{
// it's not expanded, just set children to an empty list
- items = Collections.EMPTY_LIST;
+ items = new ArrayList(0);
}
item.setChildren(items);
@@ -1175,7 +1174,7 @@
}
private final static ResourceReference JAVASCRIPT = new
JavascriptResourceReference(
- AbstractTree.class, "res/tree.js");
+ AbstractTree.class, "res/tree.js");
/**
* Initialize the component.
