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/21 14:24:32 UTC
git commit: WICKET-5513 Remove IRedirectListener and rework
RedirectPage to create bookmarkable urls
Repository: wicket
Updated Branches:
refs/heads/master 914b18d0f -> f0f8a0a44
WICKET-5513 Remove IRedirectListener and rework RedirectPage to create bookmarkable urls
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f0f8a0a4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f0f8a0a4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f0f8a0a4
Branch: refs/heads/master
Commit: f0f8a0a44f44a1e2d3ae5b83af8649979057170a
Parents: 914b18d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Feb 21 15:23:51 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Feb 21 15:23:51 2014 +0200
----------------------------------------------------------------------
.../org/apache/wicket/IRedirectListener.java | 34 --------------------
.../java/org/apache/wicket/Initializer.java | 1 -
.../src/main/java/org/apache/wicket/Page.java | 12 -------
.../wicket/markup/html/pages/RedirectPage.java | 9 +++---
4 files changed, 5 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f0f8a0a4/wicket-core/src/main/java/org/apache/wicket/IRedirectListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/IRedirectListener.java b/wicket-core/src/main/java/org/apache/wicket/IRedirectListener.java
deleted file mode 100644
index 03b7d9b..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/IRedirectListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket;
-
-/**
- * Request listener called on page redirects.
- *
- * @author Jonathan Locke
- */
-public interface IRedirectListener extends IRequestListener
-{
- /** Redirect listener interface */
- public static final RequestListenerInterface INTERFACE = new RequestListenerInterface(
- IRedirectListener.class);
-
- /**
- * Called when a page redirect happens.
- */
- void onRedirect();
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f0f8a0a4/wicket-core/src/main/java/org/apache/wicket/Initializer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Initializer.java b/wicket-core/src/main/java/org/apache/wicket/Initializer.java
index af58780..19fa544 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Initializer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Initializer.java
@@ -41,7 +41,6 @@ public class Initializer implements IInitializer
IFormSubmitListener.INTERFACE.register();
ILinkListener.INTERFACE.register();
IOnChangeListener.INTERFACE.register();
- IRedirectListener.INTERFACE.register();
IResourceListener.INTERFACE.register();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f0f8a0a4/wicket-core/src/main/java/org/apache/wicket/Page.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java
index 4e37bb2..ea1dad2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Page.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Page.java
@@ -41,7 +41,6 @@ import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.apache.wicket.util.visit.Visits;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,7 +83,6 @@ import org.slf4j.LoggerFactory;
*/
public abstract class Page extends MarkupContainer
implements
- IRedirectListener,
IRequestablePage,
IQueueRegion
{
@@ -502,16 +500,6 @@ public abstract class Page extends MarkupContainer
}
/**
- * Redirect to this page.
- *
- * @see org.apache.wicket.IRedirectListener#onRedirect()
- */
- @Override
- public final void onRedirect()
- {
- }
-
- /**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL.
*
* Set the id for this Page. This method is called by PageMap when a Page is added because the
http://git-wip-us.apache.org/repos/asf/wicket/blob/f0f8a0a4/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java
index 9b60bea..57f6f1f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java
@@ -17,8 +17,9 @@
package org.apache.wicket.markup.html.pages;
import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.IRedirectListener;
import org.apache.wicket.Page;
+import org.apache.wicket.core.request.handler.PageProvider;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
@@ -57,7 +58,7 @@ public class RedirectPage extends WebPage
{
final WebMarkupContainer redirect = new WebMarkupContainer("redirect");
final String content = waitBeforeRedirectInSeconds + ";URL=" + url;
- redirect.add(new AttributeModifier("content", new Model<String>(content)));
+ redirect.add(new AttributeModifier("content", new Model<>(content)));
add(redirect);
}
@@ -69,7 +70,7 @@ public class RedirectPage extends WebPage
*/
public RedirectPage(final Page page)
{
- this(page.urlFor(IRedirectListener.INTERFACE, page.getPageParameters()), 0);
+ this(page, 0);
}
/**
@@ -83,7 +84,7 @@ public class RedirectPage extends WebPage
*/
public RedirectPage(final Page page, final int waitBeforeRedirectInSeconds)
{
- this(page.urlFor(IRedirectListener.INTERFACE, page.getPageParameters()),
+ this(page.urlFor(new RenderPageRequestHandler(new PageProvider(page))),
waitBeforeRedirectInSeconds);
}