Author: pete
Date: Sat Sep 4 08:05:11 2010
New Revision: 992558
URL: http://svn.apache.org/viewvc?rev=992558&view=rev
Log:
cleanup on wicket's tree classes
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
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
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java?rev=992558&r1=992557&r2=992558&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
Sat Sep 4 08:05:11 2010
@@ -170,7 +170,7 @@ public class TreeTable extends DefaultAb
* @param columns
* The columns
*/
- public TreeTable(String id, IModel model, IColumn columns[])
+ public TreeTable(String id, IModel<TreeModel> model, IColumn columns[])
{
super(id, model);
init(columns);
@@ -195,11 +195,10 @@ public class TreeTable extends DefaultAb
private boolean hasLeftColumn()
{
- for (int i = 0; i < columns.length; ++i)
- {
- if
(columns[i].getLocation().getAlignment().equals(Alignment.LEFT))
+ for (IColumn column : columns)
+ if
(column.getLocation().getAlignment().equals(Alignment.LEFT))
return true;
- }
+
return false;
}
@@ -239,10 +238,10 @@ public class TreeTable extends DefaultAb
middleColumns.addColumn(column,
component, null);
}
}
- };
+ }
/**
- * @see org.apache.wicket.markup.html.tree.DefaultAbstractTree#getCSS()
+ * @see
org.apache.wicket.extensions.markup.html.tree.DefaultAbstractTree#getCSS()
*/
@Override
protected ResourceReference getCSS()
@@ -282,11 +281,8 @@ public class TreeTable extends DefaultAb
{
// no. initialize columns first
if (columns != null)
- for (int i = 0; i < columns.length; i++)
- {
- IColumn column = columns[i];
+ for (IColumn column : columns)
column.setTreeTable(this);
- }
// add the tree table header
addHeader();
@@ -400,15 +396,16 @@ public class TreeTable extends DefaultAb
{
boolean found = false;
if (columns != null)
- for (int i = 0; i < columns.length; i++)
+ {
+ for (IColumn column : columns)
{
- IColumn column = columns[i];
if (column instanceof AbstractTreeColumn)
{
found = true;
break;
}
}
+ }
if (found == false)
{
throw new IllegalArgumentException(
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=992558&r1=992557&r2=992558&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 08:05:11 2010
@@ -647,11 +647,10 @@ public abstract class AbstractTree exten
public final boolean isRootLess()
{
return rootLess;
- };
+ }
/**
- * @see
org.apache.wicket.markup.html.tree.ITreeStateListener#nodeCollapsed(javax.swing.tree.
- * TreeNode)
+ * @see
org.apache.wicket.markup.html.tree.ITreeStateListener#nodeCollapsed(Object)
*/
public final void nodeCollapsed(Object node)
{
@@ -662,8 +661,7 @@ public abstract class AbstractTree exten
}
/**
- * @see
org.apache.wicket.markup.html.tree.ITreeStateListener#nodeExpanded(javax.swing.tree.TreeNode
- * )
+ * @see
org.apache.wicket.markup.html.tree.ITreeStateListener#nodeExpanded(Object)
*/
public final void nodeExpanded(Object node)
{
@@ -674,8 +672,7 @@ public abstract class AbstractTree exten
}
/**
- * @see
org.apache.wicket.markup.html.tree.ITreeStateListener#nodeSelected(javax.swing.tree.TreeNode
- * )
+ * @see
org.apache.wicket.markup.html.tree.ITreeStateListener#nodeSelected(Object)
*/
public final void nodeSelected(Object node)
{
@@ -686,8 +683,7 @@ public abstract class AbstractTree exten
}
/**
- * @see
org.apache.wicket.markup.html.tree.ITreeStateListener#nodeUnselected(javax.swing.tree.
- * TreeNode)
+ * @see
org.apache.wicket.markup.html.tree.ITreeStateListener#nodeUnselected(Object)
*/
public final void nodeUnselected(Object node)
{
@@ -752,9 +748,8 @@ public abstract class AbstractTree exten
Object[] children = e.getChildren();
if (children != null)
{
- for (int i = 0; i < children.length; i++)
+ for (Object node : children)
{
- Object node = children[i];
if (isNodeVisible(node))
{
// if the nodes is visible
invalidate it
@@ -763,7 +758,7 @@ public abstract class AbstractTree exten
}
}
}
- };
+ }
/**
* Marks the last but one visible child node of the given item as
dirty, if give child is the
@@ -1049,10 +1044,8 @@ public abstract class AbstractTree exten
}
// iterate through dirty items
- for (Iterator<TreeItem> i = dirtyItems.iterator();
i.hasNext();)
+ for (TreeItem item : dirtyItems)
{
- TreeItem item = i.next();
-
// does the item need to rebuild children?
if (item.getChildren() == null)
{
@@ -1066,7 +1059,6 @@ public abstract class AbstractTree exten
// add the component to target
addComponent(target, item);
-
}
// clear dirty flags
@@ -1153,7 +1145,7 @@ public abstract class AbstractTree exten
* @param item
* The parent tree item
*/
- private final void buildItemChildren(TreeItem item)
+ private void buildItemChildren(TreeItem item)
{
List<TreeItem> items;
@@ -1182,7 +1174,7 @@ public abstract class AbstractTree exten
* The current level
* @return List with new tree items
*/
- private final List<TreeItem> buildTreeItems(TreeItem parent,
Iterator<Object> nodes, int level)
+ private List<TreeItem> buildTreeItems(TreeItem parent, Iterator<Object>
nodes, int level)
{
List<TreeItem> result = new ArrayList<TreeItem>();
@@ -1207,7 +1199,7 @@ public abstract class AbstractTree exten
/**
* Checks whether the model has been changed, and if so unregister and
register listeners.
*/
- private final void checkModel()
+ private void checkModel()
{
// find out whether the model object (the TreeModel) has been
changed
TreeModel model = getModelObject();
@@ -1232,7 +1224,7 @@ public abstract class AbstractTree exten
/**
* Removes all TreeItem components.
*/
- private final void clearAllItem()
+ private void clearAllItem()
{
visitItemAndChildren(rootItem, new IItemCallback()
{
@@ -1301,7 +1293,7 @@ public abstract class AbstractTree exten
/**
* Initialize the component.
*/
- private final void init()
+ private void init()
{
setVersioned(false);
@@ -1353,7 +1345,7 @@ public abstract class AbstractTree exten
* The node to invalidate
* @param forceRebuild
*/
- private final void invalidateNode(Object node, boolean forceRebuild)
+ private void invalidateNode(Object node, boolean forceRebuild)
{
if (dirtyAll == false)
{
@@ -1420,7 +1412,7 @@ public abstract class AbstractTree exten
* @param node
* The node to invalidate
*/
- private final void invalidateNodeWithChildren(Object node)
+ private void invalidateNodeWithChildren(Object node)
{
if (dirtyAll == false)
{
@@ -1458,7 +1450,7 @@ public abstract class AbstractTree exten
* The node to inspect
* @return true if the node is visible, false otherwise
*/
- private final boolean isNodeVisible(Object node)
+ private boolean isNodeVisible(Object node)
{
if (node == null)
{
@@ -1506,7 +1498,7 @@ public abstract class AbstractTree exten
* The level *
* @return The new tree item
*/
- private final TreeItem newTreeItem(TreeItem parent, Object node, int
level)
+ private TreeItem newTreeItem(TreeItem parent, Object node, int level)
{
return new TreeItem(parent, "" + idCounter++, node, level);
}
@@ -1523,7 +1515,7 @@ public abstract class AbstractTree exten
* the component id
* @return The new tree item
*/
- private final TreeItem newTreeItem(TreeItem parent, Object node, int
level, String id)
+ private TreeItem newTreeItem(TreeItem parent, Object node, int level,
String id)
{
return new TreeItem(parent, id, node, level);
}
@@ -1585,12 +1577,11 @@ public abstract class AbstractTree exten
* Rebuilds children of every item in dirtyItems that needs it. This
method is called for
* non-partial update.
*/
- private final void rebuildDirty()
+ private void rebuildDirty()
{
// go through dirty items
- for (Iterator<TreeItem> i = dirtyItems.iterator(); i.hasNext();)
+ for (TreeItem item : dirtyItems)
{
- TreeItem item = i.next();
// item children need to be rebuilt
if (item.getChildren() == null)
{
@@ -1637,7 +1628,7 @@ public abstract class AbstractTree exten
/**
* Calls after the tree has been rendered. Clears all dirty flags.
*/
- private final void updated()
+ private void updated()
{
dirtyAll = false;
dirtyItems.clear();
@@ -1653,7 +1644,7 @@ public abstract class AbstractTree exten
* @param callback
* item call back
*/
- private final void visitItemAndChildren(TreeItem item, IItemCallback
callback)
+ private void visitItemAndChildren(TreeItem item, IItemCallback callback)
{
callback.visitItem(item);
visitItemChildren(item, callback);
@@ -1667,13 +1658,12 @@ public abstract class AbstractTree exten
* @param callback
* The callback
*/
- private final void visitItemChildren(TreeItem item, IItemCallback
callback)
+ private void visitItemChildren(TreeItem item, IItemCallback callback)
{
if (item.getChildren() != null)
{
- for (Iterator<TreeItem> i =
item.getChildren().iterator(); i.hasNext();)
+ for (TreeItem child : item.getChildren())
{
- TreeItem child = i.next();
visitItemAndChildren(child, callback);
}
}
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=992558&r1=992557&r2=992558&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 08:05:11 2010
@@ -255,7 +255,7 @@ public abstract class BaseTree extends A
response.write("<td class=\"line\">");
}
}
- };
+ }
/**
* Creates the junction link for given node. Also (optionally) creates
the junction image. If
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=992558&r1=992557&r2=992558&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 08:05:11 2010
@@ -81,12 +81,8 @@ public class DefaultTreeState implements
nodes.clear();
nodesCollapsed = false;
- Object[] listenersCopy = listeners.toArray();
- for (int i = 0; i < listenersCopy.length; i++)
- {
- ITreeStateListener l =
(ITreeStateListener)listenersCopy[i];
- l.allNodesCollapsed();
- }
+ for (ITreeStateListener listener : listeners)
+ listener.allNodesCollapsed();
}
}
@@ -101,12 +97,8 @@ public class DefaultTreeState implements
nodes.remove(node);
}
- Object[] listenersCopy = listeners.toArray();
- for (int i = 0; i < listenersCopy.length; i++)
- {
- ITreeStateListener l =
(ITreeStateListener)listenersCopy[i];
- l.nodeCollapsed(node);
- }
+ for (ITreeStateListener listener : listeners)
+ listener.nodeCollapsed(node);
}
/**
@@ -124,12 +116,8 @@ public class DefaultTreeState implements
nodes.clear();
nodesCollapsed = true;
- Object[] listenersCopy = listeners.toArray();
- for (int i = 0; i < listenersCopy.length; i++)
- {
- ITreeStateListener l =
(ITreeStateListener)listenersCopy[i];
- l.allNodesExpanded();
- }
+ for (ITreeStateListener listener : listeners)
+ listener.allNodesExpanded();
}
}
@@ -144,12 +132,8 @@ public class DefaultTreeState implements
nodes.remove(node);
}
- Object[] listenersCopy = listeners.toArray();
- for (int i = 0; i < listenersCopy.length; i++)
- {
- ITreeStateListener l =
(ITreeStateListener)listenersCopy[i];
- l.nodeExpanded(node);
- }
+ for (ITreeStateListener listener : listeners)
+ listener.nodeExpanded(node);
}
/**
@@ -208,12 +192,8 @@ public class DefaultTreeState implements
if (current.equals(node) == false)
{
i.remove();
- Object[] listenersCopy =
listeners.toArray();
- for (int j = 0; j <
listenersCopy.length; j++)
- {
- ITreeStateListener l =
(ITreeStateListener)listenersCopy[j];
- l.nodeUnselected(current);
- }
+ for (ITreeStateListener listener :
listeners)
+
listener.nodeUnselected(current);
}
}
}
@@ -222,22 +202,15 @@ public class DefaultTreeState implements
{
selectedNodes.add(node);
- Object[] listenersCopy = listeners.toArray();
- for (int i = 0; i < listenersCopy.length; i++)
- {
- ITreeStateListener l =
(ITreeStateListener)listenersCopy[i];
- l.nodeSelected(node);
- }
+ for (ITreeStateListener listener : listeners)
+ listener.nodeSelected(node);
}
else if (selected == false && selectedNodes.contains(node) ==
true)
{
selectedNodes.remove(node);
- Object[] listenersCopy = listeners.toArray();
- for (int i = 0; i < listenersCopy.length; i++)
- {
- ITreeStateListener l =
(ITreeStateListener)listenersCopy[i];
- l.nodeUnselected(node);
- }
+
+ for (ITreeStateListener listener : listeners)
+ listener.nodeUnselected(node);
}
}
