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 2014/02/14 14:10:30 UTC
[4/4] git commit: WICKET-3335 Fix TODOs
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/d04d5c8e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d04d5c8e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d04d5c8e
Branch: refs/heads/sandbox/component-queueing-2
Commit: d04d5c8ec274019a4358a0ceb600890e08ac1cb5
Parents: fcdc251
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Feb 14 15:09:59 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Feb 14 15:09:59 2014 +0200
----------------------------------------------------------------------
.../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/d04d5c8e/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;