Minor improvement in the new Tree component.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/60b3ce8b Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/60b3ce8b Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/60b3ce8b Branch: refs/heads/master Commit: 60b3ce8b48aef461ef77a307b75dcccfb54b410c Parents: 09f0896 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Jun 25 15:09:13 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Jun 25 15:09:55 2012 +0300 ---------------------------------------------------------------------- .../apache/wicket/examples/tree/FooProvider.java | 2 +- .../apache/wicket/examples/tree/TableTreePage.java | 6 +--- .../html/repeater/data/table/AbstractColumn.java | 6 +++- .../html/repeater/tree/table/TreeDataProvider.java | 16 +++++++------- .../markup/html/tree/table/TreeTable.java | 3 +- 5 files changed, 17 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/60b3ce8b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooProvider.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooProvider.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooProvider.java index 4fc13bb..3ff7386 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooProvider.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/FooProvider.java @@ -89,7 +89,7 @@ public class FooProvider implements ITreeProvider<Foo> { private static final long serialVersionUID = 1L; - private String id; + private final String id; public FooModel(Foo foo) { http://git-wip-us.apache.org/repos/asf/wicket/blob/60b3ce8b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java index 486d5aa..bf5356a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java @@ -45,14 +45,12 @@ public class TableTreePage extends TreePage private static final long serialVersionUID = 1L; - private TableTree<Foo, String> tree; - @Override protected AbstractTree<Foo> createTree(FooProvider provider, IModel<Set<Foo>> state) { List<IColumn<Foo, String>> columns = createColumns(); - tree = new TableTree<Foo, String>("tree", columns, provider, Integer.MAX_VALUE, state) + final TableTree<Foo, String> tree = new TableTree<Foo, String>("tree", columns, provider, Integer.MAX_VALUE, state) { private static final long serialVersionUID = 1L; @@ -68,7 +66,7 @@ public class TableTreePage extends TreePage return new OddEvenItem<Foo>(id, index, model); } }; - tree.getTable().addTopToolbar(new HeadersToolbar(tree.getTable(), null)); + tree.getTable().addTopToolbar(new HeadersToolbar<String>(tree.getTable(), null)); tree.getTable().addBottomToolbar(new NoRecordsToolbar(tree.getTable())); return tree; } http://git-wip-us.apache.org/repos/asf/wicket/blob/60b3ce8b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java index 14a3005..7545df8 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java @@ -31,8 +31,10 @@ import org.apache.wicket.model.IModel; public abstract class AbstractColumn<T, S> implements IStyledColumn<T, S> { private static final long serialVersionUID = 1L; - private IModel<String> displayModel; - private S sortProperty; + + private final IModel<String> displayModel; + + private final S sortProperty; /** * @param displayModel http://git-wip-us.apache.org/repos/asf/wicket/blob/60b3ce8b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java index 93579e4..78a101d 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java @@ -35,9 +35,9 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T> private final ITreeProvider<T> provider; - private Branch currentBranch; + private Branch<T> currentBranch; - private Branch previousBranch; + private Branch<T> previousBranch; private int size = -1; @@ -71,7 +71,7 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T> public Iterator<? extends T> iterator(long first, long count) { - currentBranch = new Branch(null, provider.getRoots()); + currentBranch = new Branch<T>(null, provider.getRoots()); Iterator<T> iterator = new Iterator<T>() { @@ -103,7 +103,7 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T> if (iterateChildren(next)) { - currentBranch = new Branch(previousBranch, provider.getChildren(next)); + currentBranch = new Branch<T>(previousBranch, provider.getChildren(next)); } return next; @@ -145,13 +145,13 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T> size = -1; } - private class Branch implements Iterator<T> + private static class Branch<T> implements Iterator<T> { - private Branch parent; + private Branch<T> parent; private Iterator<? extends T> children; - public Branch(Branch parent, Iterator<? extends T> children) + public Branch(Branch<T> parent, Iterator<? extends T> children) { this.parent = parent; this.children = children; @@ -161,7 +161,7 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T> { boolean[] branches = new boolean[getDepth()]; - Branch branch = this; + Branch<T> branch = this; for (int c = branches.length - 1; c >= 0; c--) { branches[c] = branch.hasNext(); http://git-wip-us.apache.org/repos/asf/wicket/blob/60b3ce8b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java index aed371a..c65de6d 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java @@ -42,7 +42,8 @@ import org.apache.wicket.util.io.IClusterable; /** * TreeTable is a component that represents a grid with a tree. It's divided into columns. One of * the columns has to be column derived from {@link PropertyTreeColumn}. - * + * + * @deprecated Use {@link org.apache.wicket.extensions.markup.html.repeater.tree.TableTree} instead * @author Matej Knopp */ @Deprecated
