WICKET-3335 Fix TODOs
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ffd7e274 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ffd7e274 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ffd7e274 Branch: refs/heads/master Commit: ffd7e27401d851337e1c08324c94a6f9611ded59 Parents: 5013763 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Feb 14 15:09:59 2014 +0200 Committer: Igor Vaynberg <[email protected]> Committed: Thu Feb 20 23:37:15 2014 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/MarkupContainer.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ffd7e274/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java index 4344cbf..e50418f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -941,8 +941,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp cursor = cursor.getParent(); } - // TODO WICKET-3335: queueRegion is always non-null if page is non-null - if (queueRegion != null && page != null) + if (page != null) { if (!queueRegion.dequeuing) { @@ -2046,8 +2045,10 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp if (page != null) { - // TODO WICKET-3335: should we check if (!region.dequeueing) ? - region.dequeue(); + if (!region.dequeuing) + { + region.dequeue(); + } } return this; @@ -2065,13 +2066,13 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp { if (!(this instanceof IQueueRegion)) { - // TODO queueing mesage - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException( + "Only implementations of IQueueRegion can use component queueing"); } if (dequeuing) { - throw new IllegalStateException(); + throw new IllegalStateException("This container is already dequeing: " + this); } dequeuing = true;
