Repository: wicket Updated Branches: refs/heads/master 1d8a9c780 -> 3bb858f96
WICKET-6325 ART is a mandatory parameter now Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3bb858f9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3bb858f9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3bb858f9 Branch: refs/heads/master Commit: 3bb858f96b2754f3386055f6b21e30c56d79b9be Parents: 1d8a9c7 Author: Sven Meier <svenme...@apache.org> Authored: Thu Feb 23 15:35:25 2017 +0100 Committer: Sven Meier <svenme...@apache.org> Committed: Thu Feb 23 15:35:25 2017 +0100 ---------------------------------------------------------------------- .../content/CheckedSelectableFolderContent.java | 2 +- .../tree/content/EditableFolderContent.java | 2 +- .../content/MultiSelectableFolderContent.java | 2 +- .../tree/content/SelectableFolderContent.java | 4 +- .../markup/html/repeater/tree/AbstractTree.java | 21 ++++--- .../markup/html/repeater/tree/NestedTree.java | 65 +++++++++++--------- .../markup/html/repeater/tree/TableTree.java | 38 ++++++------ .../html/repeater/util/TreeModelProvider.java | 5 +- 8 files changed, 72 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3bb858f9/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java index 9ca44d3..6dd1532 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java @@ -63,7 +63,7 @@ public class CheckedSelectableFolderContent extends SelectableFolderContent foo = foo.getParent(); } - tree.updateBranch(foo, Optional.of(target)); + tree.updateBranch(foo, target); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/3bb858f9/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/EditableFolderContent.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/EditableFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/EditableFolderContent.java index 280857b..3792c86 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/EditableFolderContent.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/EditableFolderContent.java @@ -84,7 +84,7 @@ public class EditableFolderContent extends Content /** * update whole node in case we're located inside TableTree */ - tree.updateNode(model.getObject(), Optional.of(target)); + tree.updateNode(model.getObject(), target); } }; } http://git-wip-us.apache.org/repos/asf/wicket/blob/3bb858f9/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MultiSelectableFolderContent.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MultiSelectableFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MultiSelectableFolderContent.java index 2e70744..9106365 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MultiSelectableFolderContent.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/MultiSelectableFolderContent.java @@ -64,7 +64,7 @@ public class MultiSelectableFolderContent extends Content selected.add(foo); } - tree.updateNode(foo, targetOptional); + targetOptional.ifPresent(target -> tree.updateNode(foo, target)); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/3bb858f9/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/SelectableFolderContent.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/SelectableFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/SelectableFolderContent.java index 945a582..dfc2b39 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/SelectableFolderContent.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/SelectableFolderContent.java @@ -70,7 +70,7 @@ public class SelectableFolderContent extends Content { if (selected != null) { - tree.updateNode(selected.getObject(), targetOptional); + targetOptional.ifPresent(target -> tree.updateNode(selected.getObject(), target)); selected.detach(); selected = null; @@ -78,7 +78,7 @@ public class SelectableFolderContent extends Content selected = provider.model(foo); - tree.updateNode(foo, targetOptional); + targetOptional.ifPresent(target -> tree.updateNode(foo, target)); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/3bb858f9/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java index ada9f4b..4900baf 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/AbstractTree.java @@ -16,7 +16,6 @@ */ package org.apache.wicket.extensions.markup.html.repeater.tree; -import java.util.Optional; import java.util.Set; import org.apache.wicket.Component; @@ -156,7 +155,9 @@ public abstract class AbstractTree<T> extends Panel implements IGenericComponent getModelObject().add(t); modelChanged(); - updateBranch(t, getRequestCycle().find(IPartialPageRequestHandler.class)); + getRequestCycle().find(IPartialPageRequestHandler.class).ifPresent( + target -> updateBranch(t, target) + ); } /** @@ -176,7 +177,9 @@ public abstract class AbstractTree<T> extends Panel implements IGenericComponent getModelObject().remove(t); modelChanged(); - updateBranch(t, getRequestCycle().find(IPartialPageRequestHandler.class)); + getRequestCycle().find(IPartialPageRequestHandler.class).ifPresent( + target -> updateBranch(t, target) + ); } /** @@ -248,25 +251,25 @@ public abstract class AbstractTree<T> extends Panel implements IGenericComponent /** * Convenience method to update a single branch on an {@link AjaxRequestTarget}. Does nothing if - * the given node is currently not visible or target is not present. + * the given node is currently not visible. * * @param node * node to update * @param target - * request target + * request target must not be @code null} */ - public abstract void updateBranch(T node, final Optional<? extends IPartialPageRequestHandler> target); + public abstract void updateBranch(T node, IPartialPageRequestHandler target); /** * Convenience method to update a single node on an {@link AjaxRequestTarget}. Does nothing if - * the given node is currently not visible or target is not present. + * the given node is currently not visible. * * @param node * node to update * @param target - * request target or {@code null} + * request target must not be @code null} */ - public abstract void updateNode(T node, final Optional<? extends IPartialPageRequestHandler> target); + public abstract void updateNode(T node, IPartialPageRequestHandler target); /** * The state of a node. http://git-wip-us.apache.org/repos/asf/wicket/blob/3bb858f9/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java index faa15fd..3ab5b8e 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java @@ -16,7 +16,6 @@ */ package org.apache.wicket.extensions.markup.html.repeater.tree; -import java.util.Optional; import java.util.Set; import org.apache.wicket.Component; @@ -102,53 +101,59 @@ public abstract class NestedTree<T> extends AbstractTree<T> /** * Overridden to update the corresponding {@link BranchItem} only. + * + * @param node + * node to update + * @param target + * request target must not be @code null} */ @Override - public void updateBranch(T t, final Optional<? extends IPartialPageRequestHandler> handler) + public void updateBranch(T t, IPartialPageRequestHandler target) { - handler.ifPresent(target -> { - final IModel<T> model = getProvider().model(t); - visitChildren(BranchItem.class, new IVisitor<BranchItem<T>, Void>() + final IModel<T> model = getProvider().model(t); + visitChildren(BranchItem.class, new IVisitor<BranchItem<T>, Void>() + { + @Override + public void component(BranchItem<T> branch, IVisit<Void> visit) { - @Override - public void component(BranchItem<T> branch, IVisit<Void> visit) + if (model.equals(branch.getModel())) { - if (model.equals(branch.getModel())) - { - // BranchItem always outputs its markupId - target.add(branch); - visit.stop(); - } + // BranchItem always outputs its markupId + target.add(branch); + visit.stop(); } - }); - model.detach(); + } }); + model.detach(); } /** * Overridden to update the corresponding {@link Node} only. + * + * @param node + * node to update + * @param target + * request target must not be @code null} */ @Override - public void updateNode(T node, final Optional<? extends IPartialPageRequestHandler> targetOptional) + public void updateNode(T node, IPartialPageRequestHandler target) { - targetOptional.ifPresent(target -> { - final IModel<T> model = getProvider().model(node); - visitChildren(Node.class, new IVisitor<Node<T>, Void>() + final IModel<T> model = getProvider().model(node); + visitChildren(Node.class, new IVisitor<Node<T>, Void>() + { + @Override + public void component(Node<T> node, IVisit<Void> visit) { - @Override - public void component(Node<T> node, IVisit<Void> visit) + if (model.equals(node.getModel())) { - if (model.equals(node.getModel())) - { - // nodes are configured to output their markup id, see #newNodeComponent() - target.add(node); - visit.stop(); - } - visit.dontGoDeeper(); + // nodes are configured to output their markup id, see #newNodeComponent() + target.add(node); + visit.stop(); } - }); - model.detach(); + visit.dontGoDeeper(); + } }); + model.detach(); } private class RootsModel implements IModel<T> http://git-wip-us.apache.org/repos/asf/wicket/blob/3bb858f9/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java index 67144a4..dce03c7 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java @@ -171,39 +171,37 @@ public abstract class TableTree<T, S> extends AbstractTree<T> * For updating of a single branch the whole table is added to the ART. */ @Override - public void updateBranch(T node, Optional<? extends IPartialPageRequestHandler> handler) + public void updateBranch(T node, IPartialPageRequestHandler target) { // TableTree always outputs markupId - handler.ifPresent(target -> target.add(this)); + target.add(this); } /** * For an update of a node the complete row item is added to the ART. */ @Override - public void updateNode(T t, final Optional<? extends IPartialPageRequestHandler> targetOptional) + public void updateNode(T t, IPartialPageRequestHandler target) { - targetOptional.ifPresent(target -> { - final IModel<T> model = getProvider().model(t); - table.getBody().visitChildren(Item.class, new IVisitor<Item<T>, Void>() + final IModel<T> model = getProvider().model(t); + table.getBody().visitChildren(Item.class, new IVisitor<Item<T>, Void>() + { + @Override + public void component(Item<T> item, IVisit<Void> visit) { - @Override - public void component(Item<T> item, IVisit<Void> visit) + NodeModel<T> nodeModel = (NodeModel<T>)item.getModel(); + + if (model.equals(nodeModel.getWrappedModel())) { - NodeModel<T> nodeModel = (NodeModel<T>)item.getModel(); - - if (model.equals(nodeModel.getWrappedModel())) - { - // row items are configured to output their markupId - target.add(item); - visit.stop(); - return; - } - visit.dontGoDeeper(); + // row items are configured to output their markupId + target.add(item); + visit.stop(); + return; } - }); - model.detach(); + visit.dontGoDeeper(); + } }); + model.detach(); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/3bb858f9/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.java index 779e466..5adde06 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/TreeModelProvider.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Optional; import javax.swing.event.TreeModelEvent; import javax.swing.event.TreeModelListener; @@ -190,7 +189,7 @@ public abstract class TreeModelProvider<T> implements ITreeProvider<T> { for (T object : nodeUpdates) { - tree.updateNode(object, Optional.of(target)); + tree.updateNode(object, target); } } @@ -198,7 +197,7 @@ public abstract class TreeModelProvider<T> implements ITreeProvider<T> { for (T object : branchUpdates) { - tree.updateBranch(object, Optional.of(target)); + tree.updateBranch(object, target); } } }
