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 2010/09/21 21:20:19 UTC
svn commit: r999553 - in /wicket/trunk:
wicket-request/src/main/java/org/apache/wicket/request/mapper/info/
wicket/src/main/java/org/apache/wicket/request/mapper/
wicket/src/main/java/org/apache/wicket/request/mapper/info/
Author: mgrigorov
Date: Tue Sep 21 19:20:19 2010
New Revision: 999553
URL: http://svn.apache.org/viewvc?rev=999553&view=rev
Log:
WICKET-3067 The new mappers ignore single query parameter with empty value
Move PageComponentInfo, PageInfo and ComponentInfo in wicket-request.
Remove PageInfo(IRequestablePage), the replacement is PageInfo(int pageId).
Added:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/
- copied from r999517, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java?rev=999553&r1=999517&r2=999553&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java Tue Sep 21 19:20:19 2010
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.request.mapper.info;
-import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
/**
@@ -51,18 +49,6 @@ public class PageInfo
}
/**
- * Construct.
- *
- * @param page
- */
- public PageInfo(IRequestablePage page)
- {
- Args.notNull(page, "page");
-
- pageId = page.getPageId();
- }
-
- /**
* @return page id
*/
public Integer getPageId()
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java?rev=999553&r1=999552&r2=999553&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java Tue Sep 21 19:20:19 2010
@@ -281,7 +281,7 @@ public abstract class AbstractBookmarkab
PageInfo info = null;
if (!page.isPageStateless())
{
- info = new PageInfo(page);
+ info = new PageInfo(page.getPageId());
}
PageComponentInfo pageComponentInfo = info != null ? new PageComponentInfo(info,
null) : null;
@@ -313,7 +313,7 @@ public abstract class AbstractBookmarkab
renderCount = page.getRenderCount();
}
- PageInfo pageInfo = new PageInfo(page);
+ PageInfo pageInfo = new PageInfo(page.getPageId());
ComponentInfo componentInfo = new ComponentInfo(renderCount,
requestListenerInterfaceToString(handler.getListenerInterface()),
handler.getComponent().getPageRelativePath(), handler.getBehaviorIndex());
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java?rev=999553&r1=999552&r2=999553&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java Tue Sep 21 19:20:19 2010
@@ -69,8 +69,8 @@ public class PageInstanceMapper extends
if (info.getComponentInfo() == null)
{
- PageProvider provider = new PageProvider(info.getPageInfo()
- .getPageId(), renderCount);
+ PageProvider provider = new PageProvider(info.getPageInfo().getPageId(),
+ renderCount);
provider.setPageSource(getContext());
// render page
return new RenderPageRequestHandler(provider);
@@ -107,7 +107,7 @@ public class PageInstanceMapper extends
{
IRequestablePage page = ((RenderPageRequestHandler)requestHandler).getPage();
- PageInfo i = new PageInfo(page);
+ PageInfo i = new PageInfo(page.getPageId());
info = new PageComponentInfo(i, null);
}
else if (requestHandler instanceof ListenerInterfaceRequestHandler)
@@ -123,7 +123,7 @@ public class PageInstanceMapper extends
renderCount = page.getRenderCount();
}
- PageInfo pageInfo = new PageInfo(page);
+ PageInfo pageInfo = new PageInfo(page.getPageId());
ComponentInfo componentInfo = new ComponentInfo(renderCount,
requestListenerInterfaceToString(listenerInterface), componentPath,
handler.getBehaviorIndex());