You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2010/01/27 00:49:59 UTC
svn commit: r903499 - in /wicket/trunk:
wicket-examples/src/main/java/org/apache/wicket/examples/frames/
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/
wicket/src/main/java/org/apache/wicket/ wicket/src/main/java/o...
Author: knopp
Date: Tue Jan 26 23:49:55 2010
New Revision: 903499
URL: http://svn.apache.org/viewvc?rev=903499&view=rev
Log:
renames
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageAndComponentProvider.java (with props)
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
- copied, changed from r903497, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/DefaultPageProvider.java
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/DefaultPageProvider.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultExceptionMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/WicketTester.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/HomePageMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/PageInstanceMapper.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java Tue Jan 26 23:49:55 2010
@@ -23,7 +23,7 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
@@ -41,7 +41,7 @@
{
public CharSequence getObject()
{
- IRequestHandler handler = new RenderPageRequestHandler(new DefaultPageProvider(
+ IRequestHandler handler = new RenderPageRequestHandler(new PageProvider(
frameTarget.getFrameClass()));
return RequestCycle.get().renderUrlFor(handler);
}
@@ -71,7 +71,7 @@
// create a new page instance, passing this 'master page' as an argument
LeftFrame leftFrame = new LeftFrame(this);
// get the url to that page
- IRequestHandler handler = new RenderPageRequestHandler(new DefaultPageProvider(leftFrame));
+ IRequestHandler handler = new RenderPageRequestHandler(new PageProvider(leftFrame));
String leftFrameSrc = RequestCycle.get().renderUrlFor(handler).toString();
// and create a simple component that modifies it's src attribute to
// hold the url to that frame
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java Tue Jan 26 23:49:55 2010
@@ -32,7 +32,7 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.ng.resource.CompressedResourceReference;
import org.apache.wicket.ng.resource.JavascriptResourceReference;
@@ -991,7 +991,7 @@
// TODO (NG)
// RequestCycle.get().setUrlForNewWindowEncoding();
- IRequestHandler handler = new RenderPageRequestHandler(new DefaultPageProvider(page));
+ IRequestHandler handler = new RenderPageRequestHandler(new PageProvider(page));
appendAssignment(buffer, "settings.src", RequestCycle.get().renderUrlFor(handler));
}
else
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Tue Jan 26 23:49:55 2010
@@ -50,7 +50,7 @@
import org.apache.wicket.ng.request.component.IRequestableComponent;
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.impl.BookmarkablePageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
@@ -3198,7 +3198,7 @@
public final <C extends Page> CharSequence urlFor(final Class<C> pageClass,
final PageParameters parameters)
{
- IRequestHandler handler = new BookmarkablePageRequestHandler(new DefaultPageProvider(
+ IRequestHandler handler = new BookmarkablePageRequestHandler(new PageProvider(
pageClass, parameters));
return getRequestCycle().renderUrlFor(handler);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java Tue Jan 26 23:49:55 2010
@@ -44,7 +44,7 @@
import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.IPageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.ng.resource.ResourceReference;
@@ -540,7 +540,7 @@
{
// the page itself has been added to the request target, we simply issue a redirect back
// to the page
- IRequestHandler handler = new RenderPageRequestHandler(new DefaultPageProvider(page));
+ IRequestHandler handler = new RenderPageRequestHandler(new PageProvider(page));
final String url = requestCycle.renderUrlFor(handler).toString();
response.sendRedirect(url);
return;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java Tue Jan 26 23:49:55 2010
@@ -25,7 +25,7 @@
import org.apache.wicket.model.Model;
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.impl.BookmarkablePageRequestHandler;
import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.WebSession;
@@ -135,7 +135,7 @@
PageParameters parameters = new PageParameters();
parameters.setNamedParameter("cto", continueTo);
- CharSequence url = urlFor(new BookmarkablePageRequestHandler(new DefaultPageProvider(
+ CharSequence url = urlFor(new BookmarkablePageRequestHandler(new PageProvider(
BrowserInfoPage.class, parameters)));
meta.add(new AttributeModifier("content", true, new Model<String>("0; url=" + url)));
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultExceptionMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultExceptionMapper.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultExceptionMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/DefaultExceptionMapper.java Tue Jan 26 23:49:55 2010
@@ -18,7 +18,7 @@
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.ng.request.cycle.IExceptionMapper;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.ng.request.mapper.StalePageException;
@@ -30,7 +30,7 @@
if (e instanceof StalePageException)
{
// If the page was stale, just rerender it
- return new RenderPageRequestHandler(new DefaultPageProvider(
+ return new RenderPageRequestHandler(new PageProvider(
((StalePageException)e).getPage()));
}
else
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/WicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/WicketTester.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/WicketTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/WicketTester.java Tue Jan 26 23:49:55 2010
@@ -30,7 +30,7 @@
import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.IPageProvider;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
@@ -178,7 +178,7 @@
*/
public void startPage(Page page)
{
- startPage(new DefaultPageProvider(page));
+ startPage(new PageProvider(page));
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java Tue Jan 26 23:49:55 2010
@@ -29,7 +29,7 @@
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.IPageProvider;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.protocol.http.request.WebClientInfo;
@@ -431,7 +431,7 @@
*/
public void setResponsePage(IRequestablePage page)
{
- scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(new DefaultPageProvider(
+ scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(new PageProvider(
page), RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
}
@@ -444,7 +444,7 @@
public void setResponsePage(Class<? extends IRequestablePage> pageClass,
PageParameters parameters)
{
- IPageProvider provider = new DefaultPageProvider(pageClass, parameters);
+ IPageProvider provider = new PageProvider(pageClass, parameters);
scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(provider,
RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
}
Added: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageAndComponentProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageAndComponentProvider.java?rev=903499&view=auto
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageAndComponentProvider.java (added)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageAndComponentProvider.java Tue Jan 26 23:49:55 2010
@@ -0,0 +1,43 @@
+/*
+ * 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.ng.request.handler;
+
+import org.apache.wicket.ng.request.component.IRequestableComponent;
+
+/**
+ * Extension of {@link IPageProvider} that is also capable of providing a Component belonging to the
+ * page.
+ *
+ * @author Matej Knopp
+ */
+public interface IPageAndComponentProvider extends IPageProvider
+{
+ /**
+ * Returns component on specified page with given path.
+ *
+ * @return component
+ */
+ public abstract IRequestableComponent getComponent();
+
+ /**
+ * Returns the component path.
+ *
+ * @return component path
+ */
+ public abstract String getComponentPath();
+
+}
\ No newline at end of file
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageAndComponentProvider.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java Tue Jan 26 23:49:55 2010
@@ -22,21 +22,21 @@
import org.apache.wicket.util.lang.Checks;
/**
- * Extension of {@link DefaultPageProvider} that is also capable of providing a Component belonging
+ * Extension of {@link PageProvider} that is also capable of providing a Component belonging
* to the page.
*
- * @see DefaultPageProvider
+ * @see PageProvider
*
* @author Matej Knopp
*/
-public class PageAndComponentProvider extends DefaultPageProvider
+public class PageAndComponentProvider extends PageProvider implements IPageAndComponentProvider
{
private IRequestableComponent component;
private String componentPath;
/**
- * @see DefaultPageProvider#PageProvider(IRequestablePage)
+ * @see PageProvider#PageProvider(IRequestablePage)
*
* @param page
* @param componentPath
@@ -48,7 +48,7 @@
}
/**
- * @see DefaultPageProvider#PageProvider(IRequestablePage)
+ * @see PageProvider#PageProvider(IRequestablePage)
*
* @param page
* @param component
@@ -63,7 +63,7 @@
}
/**
- * @see DefaultPageProvider#PageProvider(Class, PageParameters)
+ * @see PageProvider#PageProvider(Class, PageParameters)
*
* @param pageClass
* @param pageParameters
@@ -77,7 +77,7 @@
}
/**
- * @see DefaultPageProvider#PageProvider(Class)
+ * @see PageProvider#PageProvider(Class)
*
* @param pageClass
* @param componentPath
@@ -90,7 +90,7 @@
}
/**
- * @see DefaultPageProvider#PageProvider(int, Class, Integer)
+ * @see PageProvider#PageProvider(int, Class, Integer)
*
* @param pageId
* @param pageClass
@@ -105,7 +105,7 @@
}
/**
- * @see DefaultPageProvider#PageProvider(int, Class, PageParameters, Integer)
+ * @see PageProvider#PageProvider(int, Class, PageParameters, Integer)
*
* @param pageId
* @param pageClass
@@ -121,7 +121,7 @@
}
/**
- * @see DefaultPageProvider#PageProvider(int, Integer)
+ * @see PageProvider#PageProvider(int, Integer)
*
* @param pageId
* @param renderCount
@@ -134,7 +134,7 @@
}
/**
- * @see org.apache.wicket.ng.request.handler.DefaultPageProvider#prepareForRenderNewPage()
+ * @see org.apache.wicket.ng.request.handler.PageProvider#prepareForRenderNewPage()
*/
@Override
protected boolean prepareForRenderNewPage()
@@ -143,9 +143,7 @@
}
/**
- * Returns component on specified page with given path.
- *
- * @return component
+ * @see org.apache.wicket.ng.request.handler.IPageAndComponentProvider#getComponent()
*/
public IRequestableComponent getComponent()
{
@@ -163,9 +161,7 @@
}
/**
- * Returns the component path.
- *
- * @return component path
+ * @see org.apache.wicket.ng.request.handler.IPageAndComponentProvider#getComponentPath()
*/
public String getComponentPath()
{
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java (from r903497, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/DefaultPageProvider.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/DefaultPageProvider.java&r1=903497&r2=903499&rev=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/DefaultPageProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java Tue Jan 26 23:49:55 2010
@@ -36,16 +36,16 @@
* Purpose of this class is to reduce complexity of both {@link IRequestMapper}s and
* {@link IRequestHandler}s. {@link IRequestMapper} examines the URL, gathers all relevant
* information about the page in the URL (combination of page id, page class, page parameters and
- * render count), creates {@link DefaultPageProvider} object and creates a {@link IRequestHandler}
- * instance that can use the {@link DefaultPageProvider} to access the page.
+ * render count), creates {@link PageProvider} object and creates a {@link IRequestHandler}
+ * instance that can use the {@link PageProvider} to access the page.
* <p>
* Apart from simplifying {@link IRequestMapper}s and {@link IRequestHandler}s
- * {@link DefaultPageProvider} also helps performance because creating or obtaining page from
+ * {@link PageProvider} also helps performance because creating or obtaining page from
* {@link IPageManager} is delayed until the {@link IRequestHandler} actually requires the page.
*
* @author Matej Knopp
*/
-public class DefaultPageProvider implements IPageProvider
+public class PageProvider implements IPageProvider
{
private Integer renderCount;
@@ -67,7 +67,7 @@
* @param renderCount
* optional argument
*/
- public DefaultPageProvider(final int pageId, final Integer renderCount)
+ public PageProvider(final int pageId, final Integer renderCount)
{
this.pageId = pageId;
this.renderCount = renderCount;
@@ -83,7 +83,7 @@
* @param renderCount
* optional argument
*/
- public DefaultPageProvider(final int pageId, final Class<? extends IRequestablePage> pageClass,
+ public PageProvider(final int pageId, final Class<? extends IRequestablePage> pageClass,
Integer renderCount)
{
this(pageId, pageClass, new PageParameters(), renderCount);
@@ -100,7 +100,7 @@
* @param renderCount
* optional argument
*/
- public DefaultPageProvider(final int pageId, final Class<? extends IRequestablePage> pageClass,
+ public PageProvider(final int pageId, final Class<? extends IRequestablePage> pageClass,
final PageParameters pageParameters, final Integer renderCount)
{
this.pageId = pageId;
@@ -116,7 +116,7 @@
* @param pageClass
* @param pageParameters
*/
- public DefaultPageProvider(final Class<? extends IRequestablePage> pageClass,
+ public PageProvider(final Class<? extends IRequestablePage> pageClass,
final PageParameters pageParameters)
{
setPageClass(pageClass);
@@ -136,7 +136,7 @@
*
* @param pageClass
*/
- public DefaultPageProvider(Class<? extends IRequestablePage> pageClass)
+ public PageProvider(Class<? extends IRequestablePage> pageClass)
{
this(pageClass, new PageParameters());
}
@@ -147,7 +147,7 @@
*
* @param page
*/
- public DefaultPageProvider(IRequestablePage page)
+ public PageProvider(IRequestablePage page)
{
Checks.argumentNotNull(page, "page");
@@ -285,9 +285,9 @@
}
/**
- * If the {@link DefaultPageProvider} is used outside request thread (thread that does not have
+ * If the {@link PageProvider} is used outside request thread (thread that does not have
* application instance assigned) it is necessary to specify a {@link IPageSource} instance so
- * that {@link DefaultPageProvider} knows how to get a page instance.
+ * that {@link PageProvider} knows how to get a page instance.
*
* @param pageSource
*/
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java Tue Jan 26 23:49:55 2010
@@ -22,6 +22,7 @@
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.request.handler.IComponentRequestHandler;
+import org.apache.wicket.ng.request.handler.IPageAndComponentProvider;
import org.apache.wicket.ng.request.handler.IPageRequestHandler;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.util.lang.Checks;
@@ -37,7 +38,7 @@
IPageRequestHandler,
IComponentRequestHandler
{
- private final PageAndComponentProvider pageComponentProvider;
+ private final IPageAndComponentProvider pageComponentProvider;
private final RequestListenerInterface listenerInterface;
@@ -51,8 +52,8 @@
* @param behaviorIndex
*/
public BookmarkableListenerInterfaceRequestHandler(
- PageAndComponentProvider pageComponentProvider, RequestListenerInterface listenerInterface,
- Integer behaviorIndex)
+ IPageAndComponentProvider pageComponentProvider,
+ RequestListenerInterface listenerInterface, Integer behaviorIndex)
{
Checks.argumentNotNull(pageComponentProvider, "pageComponentProvider");
Checks.argumentNotNull(listenerInterface, "listenerInterface");
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java Tue Jan 26 23:49:55 2010
@@ -23,8 +23,9 @@
import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.IComponentRequestHandler;
+import org.apache.wicket.ng.request.handler.IPageAndComponentProvider;
import org.apache.wicket.ng.request.handler.IPageRequestHandler;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
@@ -41,7 +42,7 @@
IPageRequestHandler,
IComponentRequestHandler
{
- private final PageAndComponentProvider pageComponentProvider;
+ private final IPageAndComponentProvider pageComponentProvider;
private final RequestListenerInterface listenerInterface;
@@ -54,7 +55,7 @@
* @param listenerInterface
* @param behaviorIndex
*/
- public ListenerInterfaceRequestHandler(PageAndComponentProvider pageComponentProvider,
+ public ListenerInterfaceRequestHandler(IPageAndComponentProvider pageComponentProvider,
RequestListenerInterface listenerInterface, Integer behaviorIndex)
{
Checks.argumentNotNull(pageComponentProvider, "pageComponentProvider");
@@ -154,7 +155,7 @@
RedirectPolicy policy = getPage().isPageStateless() ? RedirectPolicy.NEVER_REDIRECT
: RedirectPolicy.AUTO_REDIRECT;
requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(
- new DefaultPageProvider(getPage()), policy));
+ new PageProvider(getPage()), policy));
}
if (getBehaviorIndex() == null)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java Tue Jan 26 23:49:55 2010
@@ -23,7 +23,7 @@
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.impl.BookmarkableListenerInterfaceRequestHandler;
import org.apache.wicket.ng.request.handler.impl.BookmarkablePageRequestHandler;
@@ -151,7 +151,7 @@
private IRequestHandler processBookmarkable(Class<? extends IRequestablePage> pageClass,
PageParameters pageParameters)
{
- DefaultPageProvider provider = new DefaultPageProvider(pageClass, pageParameters);
+ PageProvider provider = new PageProvider(pageClass, pageParameters);
provider.setPageSource(getContext());
return new RenderPageRequestHandler(provider);
}
@@ -168,7 +168,7 @@
Class<? extends IRequestablePage> pageClass, PageParameters pageParameters,
Integer renderCount)
{
- DefaultPageProvider provider = new DefaultPageProvider(pageInfo.getPageId(), pageClass,
+ PageProvider provider = new PageProvider(pageInfo.getPageId(), pageClass,
pageParameters, renderCount);
provider.setPageSource(getContext());
return new RenderPageRequestHandler(provider);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/HomePageMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/HomePageMapper.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/HomePageMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/HomePageMapper.java Tue Jan 26 23:49:55 2010
@@ -19,7 +19,7 @@
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
public class HomePageMapper extends AbstractMapper
@@ -44,7 +44,7 @@
if (request.getUrl().getSegments().size() == 0 &&
request.getUrl().getQueryParameters().size() == 0)
{
- return new RenderPageRequestHandler(new DefaultPageProvider(
+ return new RenderPageRequestHandler(new PageProvider(
getContext().getHomePageClass()));
}
else
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/PageInstanceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/PageInstanceMapper.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/PageInstanceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/PageInstanceMapper.java Tue Jan 26 23:49:55 2010
@@ -21,7 +21,7 @@
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.IRequestablePage;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
@@ -69,7 +69,7 @@
if (info.getComponentInfo() == null)
{
- DefaultPageProvider provider = new DefaultPageProvider(info.getPageInfo()
+ PageProvider provider = new PageProvider(info.getPageInfo()
.getPageId(), renderCount);
provider.setPageSource(getContext());
// render page
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableMapperTest.java Tue Jan 26 23:49:55 2010
@@ -23,7 +23,7 @@
import org.apache.wicket.ng.request.component.IRequestableComponent;
import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.IPageProvider;
import org.apache.wicket.ng.request.handler.IPageRequestHandler;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
@@ -245,7 +245,7 @@
*/
public void testEncode1()
{
- DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, new PageParameters());
+ PageProvider provider = new PageProvider(MockPage.class, new PageParameters());
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -262,7 +262,7 @@
parameters.setIndexedParameter(1, "i2");
parameters.setNamedParameter("a", "b");
parameters.setNamedParameter("b", "c");
- DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
+ PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -280,7 +280,7 @@
parameters.setNamedParameter("a", "b");
parameters.setNamedParameter("b", "c");
- DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
+ PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -300,7 +300,7 @@
page.getPageParameters().setNamedParameter("b", "c");
page.setCreatedBookmarkable(true);
- IPageProvider provider = new DefaultPageProvider(page);
+ IPageProvider provider = new PageProvider(page);
IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -320,7 +320,7 @@
page.setCreatedBookmarkable(false);
- IPageProvider provider = new DefaultPageProvider(page);
+ IPageProvider provider = new PageProvider(page);
IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -394,7 +394,7 @@
page.setCreatedBookmarkable(true);
page.setPageStateless(true);
- IPageProvider provider = new DefaultPageProvider(page);
+ IPageProvider provider = new PageProvider(page);
IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java Tue Jan 26 23:49:55 2010
@@ -24,7 +24,7 @@
import org.apache.wicket.ng.request.component.IRequestableComponent;
import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.component.PageParameters;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.IPageProvider;
import org.apache.wicket.ng.request.handler.IPageRequestHandler;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
@@ -269,7 +269,7 @@
*/
public void testEncode1()
{
- DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, new PageParameters());
+ PageProvider provider = new PageProvider(MockPage.class, new PageParameters());
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -286,7 +286,7 @@
parameters.setIndexedParameter(1, "i2");
parameters.setNamedParameter("a", "b");
parameters.setNamedParameter("b", "c");
- DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
+ PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -304,7 +304,7 @@
parameters.setNamedParameter("a", "b");
parameters.setNamedParameter("b", "c");
- DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
+ PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -324,7 +324,7 @@
page.getPageParameters().setNamedParameter("b", "c");
page.setCreatedBookmarkable(true);
- IPageProvider provider = new DefaultPageProvider(page);
+ IPageProvider provider = new PageProvider(page);
IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -344,7 +344,7 @@
page.setCreatedBookmarkable(false);
- IPageProvider provider = new DefaultPageProvider(page);
+ IPageProvider provider = new PageProvider(page);
IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -419,7 +419,7 @@
page.setCreatedBookmarkable(true);
page.setPageStateless(true);
- IPageProvider provider = new DefaultPageProvider(page);
+ IPageProvider provider = new PageProvider(page);
IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -516,7 +516,7 @@
parameters.setNamedParameter("param2", "p2");
- DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
+ PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = placeholderEncoder.mapHandler(handler);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java?rev=903499&r1=903498&r2=903499&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java Tue Jan 26 23:49:55 2010
@@ -21,7 +21,7 @@
import org.apache.wicket.ng.MockPage;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.IRequestableComponent;
-import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.IPageProvider;
import org.apache.wicket.ng.request.handler.IPageRequestHandler;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
@@ -182,7 +182,7 @@
public void testEncode1()
{
MockPage page = new MockPage(15);
- IPageProvider provider = new DefaultPageProvider(page);
+ IPageProvider provider = new PageProvider(page);
IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);