You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/08/01 09:02:24 UTC
[3/6] git commit: Java 7 diamonds
Java 7 diamonds
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ec7b4544
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ec7b4544
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ec7b4544
Branch: refs/heads/master
Commit: ec7b454475658364ca9e4d866b18af55fa8c4e55
Parents: 4b08879
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jul 29 12:06:20 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 1 09:02:13 2013 +0200
----------------------------------------------------------------------
.../apache/wicket/util/iterator/AbstractHierarchyIterator.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec7b4544/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java b/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java
index 0af34f0..27580a2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/iterator/AbstractHierarchyIterator.java
@@ -46,7 +46,7 @@ import org.apache.wicket.util.lang.Args;
public abstract class AbstractHierarchyIterator<N, I extends N> implements Iterator<I>, Iterable<I>
{
// An iterator for each level we are down from root
- private ArrayListStack<LevelIterator<N>> stack = new ArrayListStack<LevelIterator<N>>();
+ private ArrayListStack<LevelIterator<N>> stack = new ArrayListStack<>();
// The current level iterator
private LevelIterator<N> data;
@@ -74,7 +74,7 @@ public abstract class AbstractHierarchyIterator<N, I extends N> implements Itera
if (hasChildren(root))
{
- data = new LevelIterator<N>(root, newIterator(root));
+ data = new LevelIterator<>(root, newIterator(root));
}
}
@@ -163,7 +163,7 @@ public abstract class AbstractHierarchyIterator<N, I extends N> implements Itera
stack.push(data);
// Initialize the data for the next level
- data = new LevelIterator<N>(node, newIterator(node));
+ data = new LevelIterator<>(node, newIterator(node));
// Get the next node on the current level. If it's a container, than move downwards. If
// there are no more elements, than move up again.