Repository: wicket Updated Branches: refs/heads/wicket-6.x 3a6eb04ca -> 4825c9466
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/4825c946 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4825c946 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4825c946 Branch: refs/heads/wicket-6.x Commit: 4825c94665935f048e8f714d63c5c9e213009a56 Parents: 3a6eb04 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Nov 8 12:57:30 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Nov 8 12:58:40 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/4825c946/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 d1db86e..e156d0a 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -1706,8 +1706,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() @@ -3624,9 +3625,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/4825c946/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 2566dcc..fcf24a7 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. */ - public IRequestablePage getPage(); + IRequestablePage getPage() throws WicketRuntimeException; /** * Gets the component at the given path.
