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 2016/11/08 11:57:59 UTC
wicket git commit: WICKET-6271 IRequestableComponent getPage()
javaDoc and Component implementation mismatch
Repository: wicket
Updated Branches:
refs/heads/wicket-7.x 34d8ead09 -> d7364b7db
WICKET-6271 IRequestableComponent getPage() javaDoc and Component implementation mismatch
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d7364b7d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d7364b7d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d7364b7d
Branch: refs/heads/wicket-7.x
Commit: d7364b7dbd9be9573bfff74aeb2231d11c141125
Parents: 34d8ead
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 8 12:57:30 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 8 12:57:30 2016 +0100
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Component.java | 7 ++++---
.../wicket/request/component/IRequestableComponent.java | 7 +++++--
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d7364b7d/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 7fe267e..1bbed76 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -1753,8 +1753,9 @@ public abstract class Component
* Gets the page holding this component.
*
* @return The page holding this component
- * @throws IllegalStateException
+ * @throws WicketRuntimeException
* Thrown if component is not yet attached to a Page.
+ * @see #findPage()
*/
@Override
public final Page getPage()
@@ -3719,9 +3720,9 @@ public abstract class Component
/**
* If this Component is a Page, returns self. Otherwise, searches for the nearest Page parent in
- * the component hierarchy. If no Page parent can be found, null is returned.
+ * the component hierarchy. If no Page parent can be found, {@code null} is returned.
*
- * @return The Page or null if none can be found
+ * @return The Page or {@code null} if none can be found
*/
protected final Page findPage()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/d7364b7d/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java b/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java
index bea84e5..40077c6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java
@@ -17,6 +17,7 @@
package org.apache.wicket.request.component;
import org.apache.wicket.Component;
+import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.behavior.InvalidBehaviorIdException;
import org.apache.wicket.model.IDetachable;
@@ -46,9 +47,11 @@ public interface IRequestableComponent
/**
* Returns page this component belongs to.
*
- * @return page instance or <code>null</code>
+ * @return The page holding this component
+ * @throws WicketRuntimeException
+ * Thrown if component is not yet attached to a Page.
*/
- IRequestablePage getPage();
+ IRequestablePage getPage() throws WicketRuntimeException;
/**
* Gets the component at the given path.