svn commit: r992581 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree: AbstractTree.java DefaultTreeState.java

[pe...@apache.org]

Author: pete
Date: Sat Sep  4 11:16:45 2010
New Revision: 992581

URL: http://svn.apache.org/viewvc?rev=992581&view=rev
Log:
more serialization

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.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=992581&r1=992580&r2=992581&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 Sat Sep  4 11:16:45 2010
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.swing.event.TreeModelEvent;
@@ -438,7 +439,8 @@ public abstract class AbstractTree exten
 	 * map that maps TreeNode to TreeItem. TreeItems only exists for TreeNodes, that are visible
 	 * (their parents are not collapsed).
 	 */
-	private final HashMap<Object, TreeItem> nodeToItemMap = new HashMap<Object, TreeItem>();
+	// TODO this field is not serializable but nested inside an serializable component
+	private final Map<Object, TreeItem> nodeToItemMap = new HashMap<Object, TreeItem>();
 
 	/**
 	 * we need to track previous model. if the model changes, we unregister the tree from listeners

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java?rev=992581&r1=992580&r2=992581&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java Sat Sep  4 11:16:45 2010
@@ -22,6 +22,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.wicket.IClusterable;
 import org.apache.wicket.model.IDetachable;
@@ -46,13 +47,13 @@ public class DefaultTreeState implements
 	/**
 	 * set of nodes which are collapsed or expanded (depends on nodesCollapsed variable).
 	 */
-	private final HashSet<Object> nodes = new HashSet<Object>();
+	private final Set<Object> nodes = new HashSet<Object>();
 
 	/** Whether the nodes set should be treated as set of collapsed or expanded nodes. */
 	private boolean nodesCollapsed = false; // by default treat the node set as expanded nodes
 
 	/** Set selected nodes. */
-	private final HashSet<Object> selectedNodes = new HashSet<Object>();
+	private final Set<Object> selectedNodes = new HashSet<Object>();
 
 	/**
 	 * @see org.apache.wicket.markup.html.tree.ITreeState#addTreeStateListener(org.apache.wicket.markup.html.tree.ITreeStateListener)