Copied:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/listener/IRequestListener.java
(from r821086,
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/IRequestListener.java)
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/listener/IRequestListener.java?p2=wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/listener/IRequestListener.java&p1=wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/IRequestListener.java&r1=821086&r2=821107&rev=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/IRequestListener.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/listener/IRequestListener.java
Fri Oct 2 17:33:50 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket;
+package org.apache.wicket.request.listener;
import java.io.Serializable;
Propchange:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/listener/IRequestListener.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/listener/RequestListenerInterface.java
(from r821086,
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestListenerInterface.java)
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/listener/RequestListenerInterface.java?p2=wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/listener/RequestListenerInterface.java&p1=wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestListenerInterface.java&r1=821086&r2=821107&rev=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/RequestListenerInterface.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/listener/RequestListenerInterface.java
Fri Oct 2 17:33:50 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket;
+package org.apache.wicket.request.listener;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -22,7 +22,9 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.request.component.IRequestableComponent;
import
org.apache.wicket.request.cycle.RequestHandlerStack.ReplaceHandlerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -128,7 +130,7 @@
* @param component
* The component
*/
- public final void invoke(final IComponent component)
+ public final void invoke(final IRequestableComponent component)
{
if (!component.canCallListenerInterface())
{
@@ -173,7 +175,7 @@
* The component
* @param behavior
*/
- public final void invoke(final IComponent component, final IBehavior
behavior)
+ public final void invoke(final IRequestableComponent component, final
IBehavior behavior)
{
if (!component.canCallListenerInterface())
{
Propchange:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/listener/RequestListenerInterface.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
Fri Oct 2 17:33:50 2009
@@ -16,19 +16,19 @@
*/
package org.apache.wicket.request.mapper;
-import org.apache.wicket.IPage;
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.request.handler.PageAndComponentProvider;
import org.apache.wicket.request.handler.PageProvider;
import
org.apache.wicket.request.handler.impl.BookmarkableListenerInterfaceRequestHandler;
import org.apache.wicket.request.handler.impl.BookmarkablePageRequestHandler;
import org.apache.wicket.request.handler.impl.ListenerInterfaceRequestHandler;
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.request.listener.RequestListenerInterface;
import org.apache.wicket.request.mapper.info.ComponentInfo;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.request.mapper.info.PageInfo;
@@ -59,7 +59,7 @@
{
private final PageComponentInfo pageComponentInfo;
private final PageParameters pageParameters;
- private final Class<? extends IPage> pageClass;
+ private final Class<? extends IRequestablePage> pageClass;
/**
* Construct.
@@ -71,7 +71,7 @@
* @param pageParameters
* optional parameter providing pageParameters
*/
- public UrlInfo(PageComponentInfo pageComponentInfo, Class<?
extends IPage> pageClass,
+ public UrlInfo(PageComponentInfo pageComponentInfo, Class<?
extends IRequestablePage> pageClass,
PageParameters pageParameters)
{
Check.argumentNotNull(pageClass, "pageClass");
@@ -92,7 +92,7 @@
/**
* @return page class
*/
- public Class<? extends IPage> getPageClass()
+ public Class<? extends IRequestablePage> getPageClass()
{
return pageClass;
}
@@ -140,14 +140,14 @@
*/
public abstract int getCompatibilityScore(Request request);
- private IRequestHandler processBookmarkable(Class<? extends IPage>
pageClass, PageParameters pageParameters)
+ private IRequestHandler processBookmarkable(Class<? extends
IRequestablePage> pageClass, PageParameters pageParameters)
{
PageProvider provider = new PageProvider(pageClass,
pageParameters);
provider.setPageSource(getContext());
return new RenderPageRequestHandler(provider);
}
- private IRequestHandler processHybrid(PageInfo pageInfo, Class<?
extends IPage> pageClass,
+ private IRequestHandler processHybrid(PageInfo pageInfo, Class<?
extends IRequestablePage> pageClass,
PageParameters pageParameters, Integer renderCount)
{
PageProvider provider = new PageProvider(pageInfo.getPageId(),
pageClass, pageParameters,
@@ -156,7 +156,7 @@
return new RenderPageRequestHandler(provider);
}
- private IRequestHandler processListener(PageComponentInfo
pageComponentInfo, Class<? extends IPage> pageClass,
+ private IRequestHandler processListener(PageComponentInfo
pageComponentInfo, Class<? extends IRequestablePage> pageClass,
PageParameters pageParameters)
{
PageInfo pageInfo = pageComponentInfo.getPageInfo();
@@ -190,7 +190,7 @@
if (urlInfo != null)
{
PageComponentInfo info = urlInfo.getPageComponentInfo();
- Class<? extends IPage> pageClass =
urlInfo.getPageClass();
+ Class<? extends IRequestablePage> pageClass =
urlInfo.getPageClass();
PageParameters pageParameters =
urlInfo.getPageParameters();
if (info == null || info.getPageInfo().getPageId() ==
null)
@@ -215,7 +215,7 @@
return null;
}
- protected boolean checkPageClass(Class<? extends IPage> pageClass)
+ protected boolean checkPageClass(Class<? extends IRequestablePage>
pageClass)
{
return true;
}
@@ -244,7 +244,7 @@
// but only allowed if the page was created by
bookamarkable URL
RenderPageRequestHandler handler =
(RenderPageRequestHandler) requestHandler;
- IPage page = handler.getPage();
+ IRequestablePage page = handler.getPage();
if (!checkPageClass(page.getClass()))
{
@@ -273,7 +273,7 @@
{
// listener interface URL with page class information
BookmarkableListenerInterfaceRequestHandler handler =
(BookmarkableListenerInterfaceRequestHandler) requestHandler;
- IPage page = handler.getPage();
+ IRequestablePage page = handler.getPage();
if (!checkPageClass(page.getClass()))
{
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
Fri Oct 2 17:33:50 2009
@@ -17,13 +17,13 @@
package org.apache.wicket.request.mapper;
import org.apache.wicket.Application;
-import org.apache.wicket.IPage;
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.Url.QueryParameter;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.listener.RequestListenerInterface;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.request.mapper.parameters.PageParametersEncoder;
import org.apache.wicket.util.lang.Check;
@@ -177,7 +177,7 @@
* @param name
* @return class
*/
- protected Class<? extends IPage> getPageClass(String name)
+ protected Class<? extends IRequestablePage> getPageClass(String name)
{
Check.argumentNotEmpty(name, "name");
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
Fri Oct 2 17:33:50 2009
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.request.mapper;
-import org.apache.wicket.IPage;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.request.mapper.parameters.PageParametersEncoder;
import org.apache.wicket.request.mapper.parameters.SimplePageParametersEncoder;
@@ -99,7 +99,7 @@
// load the page class
String className = url.getSegments().get(2);
- Class<? extends IPage> pageClass =
getPageClass(className);
+ Class<? extends IRequestablePage> pageClass =
getPageClass(className);
// extract the PageParameters from URL if there are any
PageParameters pageParameters =
extractPageParameters(request, 3, pageParametersEncoder);
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/IPageSource.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/IPageSource.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/IPageSource.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/IPageSource.java
Fri Oct 2 17:33:50 2009
@@ -1,7 +1,7 @@
package org.apache.wicket.request.mapper;
-import org.apache.wicket.IPage;
-import org.apache.wicket.PageParameters;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
public interface IPageSource
{
@@ -11,11 +11,11 @@
* @param pageId
* @return page instance or <code>null</code> if the page does not
exist.
*/
- public IPage getPageInstance(int pageId);
+ public IRequestablePage getPageInstance(int pageId);
/**
* Creates new page instance of page with given class. The page should
be marked as create
- * bookmarkable, so subsequent calls to {...@link
IPage#wasCreatedBookmarkable()} must return
+ * bookmarkable, so subsequent calls to {...@link
IRequestablePage#wasCreatedBookmarkable()} must return
* <code>true</code>
*
* @param pageMapName
@@ -23,6 +23,6 @@
* @param pageParameters
* @return new page instance
*/
- public IPage newPageInstance(Class<? extends IPage> pageClass,
PageParameters pageParameters);
+ public IRequestablePage newPageInstance(Class<? extends
IRequestablePage> pageClass, PageParameters pageParameters);
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/MapperContext.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/MapperContext.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/MapperContext.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/MapperContext.java
Fri Oct 2 17:33:50 2009
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.request.mapper;
-import org.apache.wicket.IPage;
-import org.apache.wicket.RequestListenerInterface;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.listener.RequestListenerInterface;
import org.apache.wicket.resource.ResourceReferenceRegistry;
/**
@@ -73,5 +73,5 @@
*
* @return home page class
*/
- public Class<? extends IPage> getHomePageClass();
+ public Class<? extends IRequestablePage> getHomePageClass();
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
Fri Oct 2 17:33:50 2009
@@ -18,10 +18,10 @@
import java.lang.ref.WeakReference;
-import org.apache.wicket.IPage;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.request.mapper.parameters.PageParametersEncoder;
import org.apache.wicket.request.mapper.parameters.SimplePageParametersEncoder;
@@ -57,7 +57,7 @@
private final String[] mountSegments;
/** bookmarkable page class. */
- protected final WeakReference<Class<? extends IPage>> pageClass;
+ protected final WeakReference<Class<? extends IRequestablePage>>
pageClass;
/**
* Construct.
@@ -66,7 +66,7 @@
* @param pageClass
* @param pageParametersEncoder
*/
- public MountedMapper(String mountPath, Class<? extends IPage> pageClass,
+ public MountedMapper(String mountPath, Class<? extends
IRequestablePage> pageClass,
PageParametersEncoder pageParametersEncoder)
{
Check.argumentNotEmpty(mountPath, "mountPath");
@@ -74,7 +74,7 @@
Check.argumentNotNull(pageParametersEncoder,
"pageParametersEncoder");
this.pageParametersEncoder = pageParametersEncoder;
- this.pageClass = new WeakReference<Class<? extends
IPage>>(pageClass);
+ this.pageClass = new WeakReference<Class<? extends
IRequestablePage>>(pageClass);
this.mountSegments = getMountSegments(mountPath);
}
@@ -84,7 +84,7 @@
* @param mountPath
* @param pageClass
*/
- public MountedMapper(String mountPath, Class<? extends IPage> pageClass)
+ public MountedMapper(String mountPath, Class<? extends
IRequestablePage> pageClass)
{
this(mountPath, pageClass, new SimplePageParametersEncoder());
}
@@ -108,7 +108,7 @@
// try to extract page and component information from
URL
PageComponentInfo info = getPageComponentInfo(url);
- Class<? extends IPage> pageClass = this.pageClass.get();
+ Class<? extends IRequestablePage> pageClass =
this.pageClass.get();
// extract the PageParameters from URL if there are any
PageParameters pageParameters =
extractPageParameters(request, mountSegments.length, pageParametersEncoder);
@@ -214,7 +214,7 @@
}
@Override
- protected boolean checkPageClass(Class<? extends IPage> pageClass)
+ protected boolean checkPageClass(Class<? extends IRequestablePage>
pageClass)
{
return pageClass.equals(this.pageClass.get());
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
Fri Oct 2 17:33:50 2009
@@ -16,15 +16,15 @@
*/
package org.apache.wicket.request.mapper;
-import org.apache.wicket.IPage;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.handler.PageAndComponentProvider;
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.impl.ListenerInterfaceRequestHandler;
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.request.listener.RequestListenerInterface;
import org.apache.wicket.request.mapper.info.ComponentInfo;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.request.mapper.info.PageInfo;
@@ -98,7 +98,7 @@
if (requestHandler instanceof RenderPageRequestHandler)
{
- IPage page = ((RenderPageRequestHandler)
requestHandler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)
requestHandler).getPage();
PageInfo i = new PageInfo(page);
info = new PageComponentInfo(i, null);
@@ -106,7 +106,7 @@
else if (requestHandler instanceof
ListenerInterfaceRequestHandler)
{
ListenerInterfaceRequestHandler handler =
(ListenerInterfaceRequestHandler) requestHandler;
- IPage page = handler.getPage();
+ IRequestablePage page = handler.getPage();
String componentPath = handler.getComponent().getPath();
RequestListenerInterface listenerInterface =
handler.getListenerInterface();
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java
Fri Oct 2 17:33:50 2009
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.request.mapper;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.PageParameters;
import
org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.handler.resource.ResourceRequestHandler;
import org.apache.wicket.request.mapper.parameters.PageParametersEncoder;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/StalePageException.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/StalePageException.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/StalePageException.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/StalePageException.java
Fri Oct 2 17:33:50 2009
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.request.mapper;
-import org.apache.wicket.IPage;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.request.component.IRequestablePage;
/**
* Exception invoked when when stale link has been clicked. The page should
then be rerendered
@@ -29,14 +29,14 @@
{
private static final long serialVersionUID = 1L;
- private final IPage page;
+ private final IRequestablePage page;
/**
*
* Construct.
* @param page
*/
- public StalePageException(IPage page)
+ public StalePageException(IRequestablePage page)
{
this.page = page;
}
@@ -45,7 +45,7 @@
*
* @return page instance
*/
- public IPage getPage()
+ public IRequestablePage getPage()
{
return page;
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
Fri Oct 2 17:33:50 2009
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.request.mapper.info;
-import org.apache.wicket.IPage;
+import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.util.lang.Check;
import org.apache.wicket.util.string.Strings;
@@ -55,7 +55,7 @@
*
* @param page
*/
- public PageInfo(IPage page)
+ public PageInfo(IRequestablePage page)
{
Check.argumentNotNull(page, "page");
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/parameters/PageParametersEncoder.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/parameters/PageParametersEncoder.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/parameters/PageParametersEncoder.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/parameters/PageParametersEncoder.java
Fri Oct 2 17:33:50 2009
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.request.mapper.parameters;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.PageParameters;
/**
* Encoder that can encode and decode {...@link PageParameters} to/from URL.
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/parameters/SimplePageParametersEncoder.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/parameters/SimplePageParametersEncoder.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/parameters/SimplePageParametersEncoder.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/parameters/SimplePageParametersEncoder.java
Fri Oct 2 17:33:50 2009
@@ -18,10 +18,10 @@
import java.util.List;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.Url.QueryParameter;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.util.string.StringValue;
/**
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/Resource.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/Resource.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/Resource.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/Resource.java
Fri Oct 2 17:33:50 2009
@@ -19,8 +19,8 @@
import java.io.Serializable;
import java.util.Locale;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.request.Request;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.request.handler.resource.ResourceRequestHandler;
import org.apache.wicket.request.response.Response;
import org.apache.wicket.util.lang.Check;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/io/SerializableChecker.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/io/SerializableChecker.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/io/SerializableChecker.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/io/SerializableChecker.java
Fri Oct 2 17:33:50 2009
@@ -35,8 +35,8 @@
import java.util.LinkedList;
import java.util.Map;
-import org.apache.wicket.IComponent;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.util.lang.Generics;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -657,9 +657,9 @@
TraceSlot slot = i.next();
result.append("\n").append(spaces).append(slot.fieldDescription);
result.append("
[class=").append(slot.object.getClass().getName());
- if (slot.object instanceof IComponent)
+ if (slot.object instanceof IRequestableComponent)
{
- IComponent component = (IComponent)slot.object;
+ IRequestableComponent component =
(IRequestableComponent)slot.object;
result.append(",
path=").append(component.getPath());
}
result.append("]");
@@ -681,7 +681,7 @@
root = obj;
if (fieldDescription == null)
{
- fieldDescription = (root instanceof IComponent) ?
((IComponent)root).getPath() : "";
+ fieldDescription = (root instanceof
IRequestableComponent) ? ((IRequestableComponent)root).getPath() : "";
}
check(root);
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/MockComponent.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/MockComponent.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/MockComponent.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/MockComponent.java
Fri Oct 2 17:33:50 2009
@@ -19,24 +19,24 @@
import java.util.Collections;
import java.util.List;
-import org.apache.wicket.IComponent;
-import org.apache.wicket.IPage;
import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.request.component.IRequestableComponent;
+import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.util.string.Strings;
/**
- * Simple {...@link IComponent} implementation for testing purposes
+ * Simple {...@link IRequestableComponent} implementation for testing purposes
*
* @author Matej Knopp
*/
-public class MockComponent implements IComponent
+public class MockComponent implements IRequestableComponent
{
private static final long serialVersionUID = 1L;
private String markupId;
private String id;
- private IPage page;
+ private IRequestablePage page;
private String path;
/**
@@ -46,7 +46,7 @@
{
}
- public IComponent get(String path)
+ public IRequestableComponent get(String path)
{
MockComponent c = new MockComponent();
if (Strings.isEmpty(getPath()))
@@ -96,7 +96,7 @@
return markupId;
}
- public IPage getPage()
+ public IRequestablePage getPage()
{
return page;
}
@@ -107,7 +107,7 @@
* @param page
* @return <code>this</code>
*/
- public MockComponent setPage(IPage page)
+ public MockComponent setPage(IRequestablePage page)
{
this.page = page;
return this;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/MockPage.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/MockPage.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/MockPage.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/MockPage.java
Fri Oct 2 17:33:50 2009
@@ -16,15 +16,15 @@
*/
package org.apache.wicket;
-import org.apache.wicket.IPage;
-import org.apache.wicket.PageParameters;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
/**
- * Simple {...@link IPage} implementation for testing purposes
+ * Simple {...@link IRequestablePage} implementation for testing purposes
*
* @author Matej Knopp
*/
-public class MockPage extends MockComponent implements IPage
+public class MockPage extends MockComponent implements IRequestablePage
{
private static final long serialVersionUID = 1L;
@@ -65,7 +65,7 @@
}
@Override
- public IPage getPage()
+ public IRequestablePage getPage()
{
return this;
}
@@ -134,7 +134,7 @@
/**
* Sets the createdBookmarkable flag.
*
- * @see IPage#wasCreatedBookmarkable()
+ * @see IRequestablePage#wasCreatedBookmarkable()
*
* @param createdBookmarkable
* @return <code>this</code>
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/AbstractEncoderTest.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/AbstractEncoderTest.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/AbstractEncoderTest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/AbstractEncoderTest.java
Fri Oct 2 17:33:50 2009
@@ -18,11 +18,11 @@
import junit.framework.TestCase;
-import org.apache.wicket.IPage;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.listener.RequestListenerInterface;
/**
* @author Matej Knopp
@@ -59,7 +59,7 @@
};
}
- protected void checkPage(IPage page, int id)
+ protected void checkPage(IRequestablePage page, int id)
{
assertEquals(id, page.getPageId());
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/BookmarkableEncoderTest.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/BookmarkableEncoderTest.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/BookmarkableEncoderTest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/BookmarkableEncoderTest.java
Fri Oct 2 17:33:50 2009
@@ -16,13 +16,13 @@
*/
package org.apache.wicket.request.mapper;
-import org.apache.wicket.IComponent;
-import org.apache.wicket.IPage;
import org.apache.wicket.MockPage;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestableComponent;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.request.handler.PageAndComponentProvider;
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.PageRequestHandler;
@@ -67,7 +67,7 @@
IRequestHandler handler = encoder.map(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- IPage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
assertEquals(0, page.getPageParameters().getIndexedParamsCount());
assertTrue(page.getPageParameters().getNamedParameterKeys().isEmpty());
@@ -82,7 +82,7 @@
IRequestHandler handler = encoder.map(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- IPage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
PageParameters p = page.getPageParameters();
@@ -103,7 +103,7 @@
IRequestHandler handler = encoder.map(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- IPage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
}
@@ -116,7 +116,7 @@
IRequestHandler handler = encoder.map(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- IPage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
PageParameters p = page.getPageParameters();
@@ -141,7 +141,7 @@
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
- IPage page = h.getPage();
+ IRequestablePage page = h.getPage();
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
@@ -161,7 +161,7 @@
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
- IPage page = h.getPage();
+ IRequestablePage page = h.getPage();
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
@@ -190,7 +190,7 @@
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
- IPage page = h.getPage();
+ IRequestablePage page = h.getPage();
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
@@ -213,7 +213,7 @@
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
- IPage page = h.getPage();
+ IRequestablePage page = h.getPage();
assertEquals(page.getRenderCount(), 5);
}
@@ -347,7 +347,7 @@
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
- IComponent c = page.get("foo:bar");
+ IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page,
c);
IRequestHandler handler = new
BookmarkableListenerInterfaceRequestHandler(provider,
@@ -374,7 +374,7 @@
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
- IComponent c = page.get("foo:bar");
+ IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page,
c);
IRequestHandler handler = new
BookmarkableListenerInterfaceRequestHandler(provider,
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
Fri Oct 2 17:33:50 2009
@@ -16,14 +16,14 @@
*/
package org.apache.wicket.request.mapper;
-import org.apache.wicket.IComponent;
-import org.apache.wicket.IPage;
import org.apache.wicket.MockPage;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestableComponent;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
import org.apache.wicket.request.handler.PageAndComponentProvider;
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.PageRequestHandler;
@@ -76,7 +76,7 @@
IRequestHandler handler = encoder.map(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- IPage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedParamsCount());
assertTrue(page.getPageParameters().getNamedParameterKeys().isEmpty());
@@ -91,7 +91,7 @@
IRequestHandler handler = encoder.map(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- IPage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParameters p = page.getPageParameters();
assertEquals(1, p.getIndexedParamsCount());
@@ -111,7 +111,7 @@
IRequestHandler handler = encoder.map(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- IPage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
}
@@ -124,7 +124,7 @@
IRequestHandler handler = encoder.map(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- IPage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
PageParameters p = page.getPageParameters();
@@ -149,7 +149,7 @@
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
- IPage page = h.getPage();
+ IRequestablePage page = h.getPage();
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
@@ -168,7 +168,7 @@
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
- IPage page = h.getPage();
+ IRequestablePage page = h.getPage();
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
@@ -196,7 +196,7 @@
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
- IPage page = h.getPage();
+ IRequestablePage page = h.getPage();
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
@@ -239,7 +239,7 @@
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
- IPage page = h.getPage();
+ IRequestablePage page = h.getPage();
assertEquals(5, page.getRenderCount());
}
@@ -373,7 +373,7 @@
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
- IComponent c = page.get("foo:bar");
+ IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page,
c);
IRequestHandler handler = new
BookmarkableListenerInterfaceRequestHandler(provider,
@@ -400,7 +400,7 @@
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
- IComponent c = page.get("foo:bar");
+ IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page,
c);
IRequestHandler handler = new
BookmarkableListenerInterfaceRequestHandler(provider,
@@ -476,7 +476,7 @@
IRequestHandler handler = placeholderEncoder.map(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- IPage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedParamsCount());
assertTrue(page.getPageParameters().getNamedParameterKeys().size() ==
2);
@@ -493,7 +493,7 @@
IRequestHandler handler = placeholderEncoder.map(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- IPage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParameters p = page.getPageParameters();
assertEquals(1, p.getIndexedParamsCount());
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java
Fri Oct 2 17:33:50 2009
@@ -17,10 +17,10 @@
package org.apache.wicket.request.mapper;
import org.apache.wicket.MockPage;
-import org.apache.wicket.IComponent;
import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.handler.PageAndComponentProvider;
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.PageRequestHandler;
@@ -200,7 +200,7 @@
MockPage page = new MockPage(15);
page.setRenderCount(5);
- IComponent c = page.get("a:b:c");
+ IRequestableComponent c = page.get("a:b:c");
PageAndComponentProvider provider = new PageAndComponentProvider(page,
c);
IRequestHandler handler = new ListenerInterfaceRequestHandler(provider,
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java
Fri Oct 2 17:33:50 2009
@@ -18,9 +18,9 @@
import java.util.Locale;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.PageParameters;
import
org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.handler.resource.ResourceRequestHandler;
import org.apache.wicket.request.mapper.MapperContext;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java?rev=821107&r1=821106&r2=821107&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/TestMapperContext.java
Fri Oct 2 17:33:50 2009
@@ -16,11 +16,11 @@
*/
package org.apache.wicket.request.mapper;
-import org.apache.wicket.IPage;
import org.apache.wicket.MockPage;
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.listener.RequestListenerInterface;
import org.apache.wicket.request.mapper.MapperContext;
import org.apache.wicket.resource.ResourceReferenceRegistry;
@@ -101,7 +101,7 @@
this.nextPageRenderCount = nextPageRenderCount;
}
- public IPage getPageInstance(int pageId)
+ public IRequestablePage getPageInstance(int pageId)
{
MockPage page = new MockPage();
page.setPageId(pageId);
@@ -113,7 +113,7 @@
int idCounter = 0;
- public IPage newPageInstance(Class< ? extends IPage> pageClass,
PageParameters pageParameters)
+ public IRequestablePage newPageInstance(Class< ? extends IRequestablePage>
pageClass, PageParameters pageParameters)
{
try
{
@@ -141,7 +141,7 @@
return listenerInterface.getName();
}
- public Class< ? extends IPage> getHomePageClass()
+ public Class< ? extends IRequestablePage> getHomePageClass()
{
return MockPage.class;
}
