Author: pete
Date: Sat Sep 4 10:03:03 2010
New Revision: 992573
URL: http://svn.apache.org/viewvc?rev=992573&view=rev
Log:
Fixed some unserializable fields for tree
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/BaseTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeStateListener.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=992573&r1=992572&r2=992573&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 10:03:03 2010
@@ -24,7 +24,6 @@ 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;
@@ -58,7 +57,7 @@ import org.apache.wicket.util.visit.IVis
* This class encapsulates the logic for displaying and (partial) updating the
tree. Actual
* presentation is out of scope of this class. User should derive they own
tree (if needed) from
* {...@link BaseTree} (recommended).
- *
+ *
* @author Matej Knopp
*/
public abstract class AbstractTree extends Panel
@@ -70,7 +69,7 @@ public abstract class AbstractTree exten
{
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
@@ -81,7 +80,7 @@ public abstract class AbstractTree exten
{
/**
* Visits the tree item.
- *
+ *
* @param item
* the item to visit
*/
@@ -116,7 +115,7 @@ public abstract class AbstractTree exten
/**
* Construct.
- *
+ *
* @param id
* The component id
* @param node
@@ -177,7 +176,7 @@ public abstract class AbstractTree exten
/**
* Sets the children.
- *
+ *
* @param children
* The children
*/
@@ -188,7 +187,7 @@ public abstract class AbstractTree exten
/**
* Whether to render children.
- *
+ *
* @return whether to render children
*/
protected final boolean isRenderChildren()
@@ -241,7 +240,7 @@ public abstract class AbstractTree exten
}
/**
- *
+ *
* @return model object
*/
public Object getModelObject()
@@ -360,7 +359,7 @@ public abstract class AbstractTree exten
/**
* Construct.
- *
+ *
* @param id
* The component id
*/
@@ -439,12 +438,14 @@ 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 Map<Object, TreeItem> nodeToItemMap = new HashMap<Object,
TreeItem>();
+ private final HashMap<Object, TreeItem> nodeToItemMap = new
HashMap<Object, TreeItem>();
/**
* we need to track previous model. if the model changes, we unregister
the tree from listeners
* of old model and register the tree as listener of new model.
*/
+
+ // TODO this field is not serializable but nested inside an
serializable component
private TreeModel previousModel = null;
/** root item of the tree. */
@@ -458,7 +459,7 @@ public abstract class AbstractTree exten
/**
* Tree constructor
- *
+ *
* @param id
* The component id
*/
@@ -470,7 +471,7 @@ public abstract class AbstractTree exten
/**
* Tree constructor
- *
+ *
* @param id
* The component id
* @param model
@@ -495,7 +496,7 @@ public abstract class AbstractTree exten
}
/**
- *
+ *
* @return model
*/
@SuppressWarnings("unchecked")
@@ -513,7 +514,7 @@ public abstract class AbstractTree exten
}
/**
- *
+ *
* @param model
* @return this
*/
@@ -524,7 +525,7 @@ public abstract class AbstractTree exten
}
/**
- *
+ *
* @param model
* @return this
*/
@@ -536,7 +537,7 @@ public abstract class AbstractTree exten
/**
* Returns the TreeState of this tree.
- *
+ *
* @return Tree state instance
*/
public ITreeState getTreeState()
@@ -695,7 +696,7 @@ public abstract class AbstractTree exten
/**
* Determines whether the TreeNode needs to be rebuilt if it is
selected or deselected
- *
+ *
* @return true if the node should be rebuilt after (de)selection,
false otherwise
*/
protected boolean isForceRebuildOnSelectionChange()
@@ -705,7 +706,7 @@ public abstract class AbstractTree exten
/**
* Sets whether the root of the tree should be visible.
- *
+ *
* @param rootLess
* whether the root should be visible
*/
@@ -763,10 +764,10 @@ public abstract class AbstractTree exten
/**
* Marks the last but one visible child node of the given item as
dirty, if give child is the
* last item of parent.
- *
+ *
* We need this to refresh the previous visible item in case the
inserted / deleted item was
* last. The reason is that the line shape of previous item changes
from L to |- .
- *
+ *
* @param parent
* @param child
*/
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=992573&r1=992572&r2=992573&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
Sat Sep 4 10:03:03 2010
@@ -193,6 +193,7 @@ public abstract class BaseTree extends A
{
private static final long serialVersionUID = 1L;
+ // TODO this field is not serializable but nested inside an
serializable component
private final Object node;
private final int level;
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=992573&r1=992572&r2=992573&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 10:03:03 2010
@@ -22,7 +22,6 @@ 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;
@@ -47,13 +46,13 @@ public class DefaultTreeState implements
/**
* set of nodes which are collapsed or expanded (depends on
nodesCollapsed variable).
*/
- private final Set<Object> nodes = new HashSet<Object>();
+ private final HashSet<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 Set<Object> selectedNodes = new HashSet<Object>();
+ private final HashSet<Object> selectedNodes = new HashSet<Object>();
/**
* @see
org.apache.wicket.markup.html.tree.ITreeState#addTreeStateListener(org.apache.wicket.markup.html.tree.ITreeStateListener)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java?rev=992573&r1=992572&r2=992573&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java
Sat Sep 4 10:03:03 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.tree;
+import java.io.Serializable;
import java.util.Collection;
/**
@@ -25,7 +26,7 @@ import java.util.Collection;
*
* @author Matej Knopp
*/
-public interface ITreeState
+public interface ITreeState extends Serializable
{
/**
* Adds a tree state listener. On state change events on the listener
are fired.
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeStateListener.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeStateListener.java?rev=992573&r1=992572&r2=992573&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeStateListener.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeStateListener.java
Sat Sep 4 10:03:03 2010
@@ -16,13 +16,14 @@
*/
package org.apache.wicket.markup.html.tree;
+import java.io.Serializable;
/**
* Methods this interface are called when tree state is changing.
*
* @author Matej Knopp
*/
-public interface ITreeStateListener
+public interface ITreeStateListener extends Serializable
{
/**
* Fired when all nodes are collapsed.
