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/09/29 10:36:37 UTC
[1/2] git commit: The current version of wicket-atmosphere is
0.21.0-SNAPSHOT
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 0adb864ff -> 544e49476
The current version of wicket-atmosphere is 0.21.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a32bdf22
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a32bdf22
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a32bdf22
Branch: refs/heads/wicket-6.x
Commit: a32bdf22b9c3028a6a42c0907635607904ba1d13
Parents: 0adb864
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Sep 29 10:35:53 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Sep 29 10:35:53 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a32bdf22/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3a46f37..ecd80bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,7 +319,7 @@
<dependency>
<groupId>org.apache.wicket.experimental.wicket6</groupId>
<artifactId>wicket-atmosphere</artifactId>
- <version>0.20-SNAPSHOT</version>
+ <version>0.21-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
[2/2] git commit: WICKET-5677 add onReAdd to Component
Posted by mg...@apache.org.
WICKET-5677 add onReAdd to Component
Minor cleanups. No functional changes!
(cherry picked from commit 55c1bc79901e195a20fceadb5469a0c7e2e1a275)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/544e4947
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/544e4947
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/544e4947
Branch: refs/heads/wicket-6.x
Commit: 544e4947636c8a584eda3654f73cccb6cead296b
Parents: a32bdf2
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Sep 29 10:34:07 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Sep 29 10:36:20 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/Component.java | 27 ++++++++------------
.../java/org/apache/wicket/MarkupContainer.java | 4 +--
2 files changed, 12 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/544e4947/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index f368a10..75a45bc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -886,20 +886,17 @@ public abstract class Component
getApplication().getComponentInitializationListeners().onInitialize(this);
}
- else
+ else if (getFlag(FLAG_REMOVED))
{
- if (getFlag(FLAG_REMOVED))
+ setFlag(FLAG_REMOVED, false);
+ setRequestFlag(RFLAG_ON_RE_ADD_SUPER_CALL_VERIFIED, false);
+ onReAdd();
+ if (!getRequestFlag(RFLAG_ON_RE_ADD_SUPER_CALL_VERIFIED))
{
- setFlag(FLAG_REMOVED, false);
- setRequestFlag(RFLAG_ON_RE_ADD_SUPER_CALL_VERIFIED, false);
- onReAdd();
- if (!getRequestFlag(RFLAG_ON_RE_ADD_SUPER_CALL_VERIFIED))
- {
- throw new IllegalStateException(Component.class.getName() +
- " has not been properly added. Something in the hierarchy of " +
- getClass().getName() +
- " has not called super.onReAdd() in the override of onReAdd() method");
- }
+ throw new IllegalStateException(Component.class.getName() +
+ " has not been properly added. Something in the hierarchy of " +
+ getClass().getName() +
+ " has not called super.onReAdd() in the override of onReAdd() method");
}
}
}
@@ -4510,8 +4507,7 @@ public abstract class Component
* (see {@link org.apache.wicket.Component#isInitialized()}).
*
* This is similar to onInitialize, but only comes after the component has been removed and
- * then
- * added again:
+ * then added again:
*
* <ul>
* <li>onInitialize is only called the very first time a component is added</li>
@@ -4520,8 +4516,7 @@ public abstract class Component
* </ul>
*
* You can think of it as the opposite of onRemove. A component that was once removed will
- * not be
- * re-initialized but only re-added.
+ * not be re-initialized but only re-added.
*
* Subclasses that override this must call super.onReAdd().
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/544e4947/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 66ebf17..d15368d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -937,8 +937,8 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
{
child.internalInitialize();
}
-
}
+
// if the PREPARED_FOR_RENDER flag is set, we have already called
// beforeRender on this component's children. So we need to initialize the newly added one
if (isPreparedForRender())
@@ -947,8 +947,6 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
}
}
-
-
/**
* THIS METHOD IS NOT PART OF THE PUBLIC API, DO NOT CALL IT
*