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 2008/11/30 21:23:53 UTC
svn commit: r721888 - in /wicket/sandbox/knopp/experimental/wicket/src:
main/java/org/apache/_wicket/ main/java/org/apache/_wicket/request/
main/java/org/apache/_wicket/request/encoder/
main/java/org/apache/_wicket/request/encoder/info/ main/java/org/a...
Author: knopp
Date: Sun Nov 30 12:23:53 2008
New Revision: 721888
URL: http://svn.apache.org/viewvc?rev=721888&view=rev
Log:
removed page version and pagemap
will this fly?
Modified:
wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/IPage.java
wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/AbstractBookmarkableEncoder.java
wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/AbstractEncoder.java
wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/EncoderContext.java
wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/info/PageInfo.java
wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/PageClassRequestHandler.java
wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/BookmarkablePageRequestHandler.java
wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/ListenerInterfaceRequestHandler.java
wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/RenderPageRequestHandler.java
wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/url-format.txt
wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/MockPage.java
wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/AbstractEncoderTest.java
wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/AbstractResourceReferenceEncoderTest.java
wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/BookmarkableEncoderTest.java
wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/MountedEncoderTest.java
wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/PageInstanceEncoderTest.java
wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/TestEncoderContext.java
wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/info/PageComponentInfoTest.java
Modified: wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/IPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/IPage.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/IPage.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/IPage.java Sun Nov 30 12:23:53 2008
@@ -26,23 +26,11 @@
public interface IPage extends IComponent
{
/**
- * @return A stable identifier for this page map entry
+ * @return A unique identifier for this page map entry
*/
public int getPageId();
/**
- * @return The current version number of this page. If the page has been changed once, the
- * return value will be 1. If the page has not yet been revised, the version returned
- * will be 0, indicating that the page is still in its original state.
- */
- public int getPageVersionNumber();
-
- /**
- * @return String The PageMap name
- */
- public String getPageMapName();
-
- /**
* Renders the page
*/
public void renderPage();
Modified: wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/AbstractBookmarkableEncoder.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/AbstractBookmarkableEncoder.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/AbstractBookmarkableEncoder.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/AbstractBookmarkableEncoder.java Sun Nov 30 12:23:53 2008
@@ -45,10 +45,10 @@
{
}
- private RequestHandler processBookmarkable(String pageMapName,
- Class<? extends IPage> pageClass, PageParameters pageParameters)
+ private RequestHandler processBookmarkable(Class<? extends IPage> pageClass,
+ PageParameters pageParameters)
{
- IPage page = newPageInstance(pageMapName, pageClass, pageParameters);
+ IPage page = newPageInstance(pageClass, pageParameters);
return new RenderPageRequestHandler(page);
}
@@ -163,8 +163,7 @@
{
// if there are is no page instance information (only page map name - optionally)
// then this is a simple bookmarkable URL
- String pageMap = info != null ? info.getPageInfo().getPageMapName() : null;
- return processBookmarkable(pageMap, pageClass, pageParameters);
+ return processBookmarkable(pageClass, pageParameters);
}
else if (info.getPageInfo().getPageId() != null && info.getComponentInfo() == null)
{
@@ -201,7 +200,7 @@
// simple bookmarkable URL with no page instance information
BookmarkablePageRequestHandler handler = (BookmarkablePageRequestHandler)requestHandler;
- PageInfo info = new PageInfo(null, null, handler.getPageMapName());
+ PageInfo info = new PageInfo();
UrlInfo urlInfo = new UrlInfo(new PageComponentInfo(info, null),
handler.getPageClass(), handler.getPageParameters());
Modified: wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/AbstractEncoder.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/AbstractEncoder.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/AbstractEncoder.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/AbstractEncoder.java Sun Nov 30 12:23:53 2008
@@ -188,8 +188,7 @@
{
throw new IllegalArgumentException("Argument 'info' may not be null.");
}
- IPage page = getContext().getPageInstance(info.getPageMapName(), info.getPageId(),
- info.getVersionNumber());
+ IPage page = getContext().getPageInstance(info.getPageId());
if (page == null && throwExpiredExceptionIfNotFound)
{
@@ -351,10 +350,9 @@
* @param pageParameters
* @return new page instance
*/
- protected IPage newPageInstance(String pageMapName, Class<? extends IPage> pageClass,
- PageParameters pageParameters)
+ protected IPage newPageInstance(Class<? extends IPage> pageClass, PageParameters pageParameters)
{
- return getContext().newPageInstance(pageMapName, pageClass, pageParameters);
+ return getContext().newPageInstance(pageClass, pageParameters);
}
/**
@@ -406,16 +404,14 @@
{
throw new IllegalArgumentException("Argument 'pageParameters' may not be null.");
}
- IPage page = getContext().getPageInstance(pageInfo.getPageMapName(), pageInfo.getPageId(),
- pageInfo.getVersionNumber());
+ IPage page = getContext().getPageInstance(pageInfo.getPageId());
if (page != null && page.getClass().equals(pageClass) == false)
{
page = null;
}
if (page == null)
{
- page = getContext().newPageInstance(pageInfo.getPageMapName(), pageClass,
- pageParameters);
+ page = getContext().newPageInstance(pageClass, pageParameters);
// this is required for stateless listeners
if (prepareForRenderNewPage && page instanceof Page)
Modified: wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/EncoderContext.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/EncoderContext.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/EncoderContext.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/EncoderContext.java Sun Nov 30 12:23:53 2008
@@ -31,12 +31,10 @@
/**
* Returns existing page instance if the page exists.
*
- * @param pageMapName
* @param pageId
- * @param versionNumber
* @return page instance or <code>null</code> if the page does not exist.
*/
- public IPage getPageInstance(String pageMapName, int pageId, int versionNumber);
+ public IPage getPageInstance(int pageId);
/**
* Creates new page instance of page with given class. The page should be marked as
@@ -48,8 +46,7 @@
* @param pageParameters
* @return new page instance
*/
- public IPage newPageInstance(String pageMapName, Class<? extends IPage> pageClass,
- PageParameters pageParameters);
+ public IPage newPageInstance(Class<? extends IPage> pageClass, PageParameters pageParameters);
/**
* @return the namespace for Wicket URLs.
Modified: wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/info/PageInfo.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/info/PageInfo.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/info/PageInfo.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/encoder/info/PageInfo.java Sun Nov 30 12:23:53 2008
@@ -17,19 +17,12 @@
package org.apache._wicket.request.encoder.info;
import org.apache._wicket.IPage;
-import org.apache.wicket.Application;
-import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
/**
* Possible string representation of PageInfo:
* <ul>
* <li>pageId
- * <li>pageId.version
- * <li>pageMap (only if pageMap contains a letter)
- * <li>.pageMap (for pageMap without any letter (just digits))
- * <li>pageMap.pageId.version
- * <li>pageMap.pageId (only if pageMap contains a letter)
* </ul>
*
* @author Matej Knopp
@@ -37,32 +30,28 @@
public class PageInfo
{
private final Integer pageId;
- private final Integer versionNumber;
- private final String pageMapName;
/**
* Construct.
*
* @param pageId
- * @param versionNumber
- * @param pageMapName
*/
- public PageInfo(Integer pageId, Integer versionNumber, String pageMapName)
+ public PageInfo(Integer pageId)
{
- if ((pageId == null && versionNumber != null) ||
- (versionNumber == null && pageId != null))
- {
- throw new IllegalArgumentException(
- "Either both pageId and versionNumber must be null or none of them.");
- }
this.pageId = pageId;
- this.versionNumber = versionNumber;
- this.pageMapName = pageMapName;
}
/**
* Construct.
+ */
+ public PageInfo()
+ {
+ this((Integer)null);
+ }
+ /**
+ * Construct.
+ *
* @param page
*/
public PageInfo(IPage page)
@@ -72,10 +61,8 @@
throw new IllegalArgumentException("Argument 'page' may not be null.");
}
this.pageId = page.getPageId();
- this.versionNumber = page.getPageVersionNumber();
- this.pageMapName = page.getPageMapName();
}
-
+
/**
* @return page id
*/
@@ -85,27 +72,6 @@
}
/**
- * @return page version number
- */
- public Integer getVersionNumber()
- {
- return versionNumber;
- }
-
- /**
- * @return pagemap name
- */
- public String getPageMapName()
- {
- return pageMapName;
- }
-
- private static char getPageInfoSeparator()
- {
- return '.';
- }
-
- /**
* <ul>
* <li>pageId
* <li>pageId.version
@@ -118,169 +84,37 @@
@Override
public String toString()
{
- String pageMapName = this.pageMapName;
-
- // we don't need to encode the pageMapName when the pageId is unique
- // per session
- if (pageMapName != null && pageId != null && Application.exists() &&
- Application.get().getSessionSettings().isPageIdUniquePerSession())
- {
- pageMapName = null;
- }
-
- AppendingStringBuffer buffer = new AppendingStringBuffer(5);
-
- final boolean pmEmpty = Strings.isEmpty(pageMapName);
- final boolean pmContainsLetter = !pmEmpty && !isNumber(pageMapName);
-
- if (pageId != null && pmEmpty && versionNumber.intValue() == 0)
+ if (getPageId() == null)
{
- // pageId
- buffer.append(pageId);
+ return "";
}
- else if (pageId != null && pmEmpty && versionNumber.intValue() != 0)
+ else
{
- // pageId.version
- buffer.append(pageId);
- buffer.append(getPageInfoSeparator());
- buffer.append(versionNumber);
+ return getPageId().toString();
}
- else if (pageId == null && pmContainsLetter)
- {
- // pageMap (must start with letter)
- buffer.append(pageMapName);
- }
- else if (pageId == null && !pmEmpty && !pmContainsLetter)
- {
- // .pageMap
- buffer.append(getPageInfoSeparator());
- buffer.append(pageMapName);
- }
- else if (pmContainsLetter && pageId != null && versionNumber.intValue() == 0)
- {
- // pageMap.pageId (pageMap must start with a letter)
- buffer.append(pageMapName);
- buffer.append(getPageInfoSeparator());
- buffer.append(pageId);
- }
- else if (!pmEmpty && pageId != null)
- {
- // pageMap.pageId.pageVersion
- buffer.append(pageMapName);
- buffer.append(getPageInfoSeparator());
- buffer.append(pageId);
- buffer.append(getPageInfoSeparator());
- buffer.append(versionNumber);
- }
-
- return buffer.toString();
}
- /**
- * Method that rigidly checks if the string consists of digits only.
- *
- * @param string
- * @return whether the string consists of digits only
- */
- private static boolean isNumber(String string)
- {
- if (string == null || string.length() == 0)
- {
- return false;
- }
- for (int i = 0; i < string.length(); ++i)
- {
- if (Character.isDigit(string.charAt(i)) == false)
- {
- return false;
- }
- }
- return true;
- }
/**
- * <ul>
- * <li>pageId
- * <li>pageId.version
- * <li>pageMap (only in if pagemap starts with a letter)
- * <li>.pageMap
- * <li>pageMap.pageId (only in if pageMap name starts with a letter)
- * <li>pageMap.pageId.version
- * </ul>
- *
* @param src
- * @return page insfo instance or <code>null</code> if the string couldn't have been parsed
+ * @return page insfo instance or <code>null</code> if the string couldn't have been parsed
*/
public static PageInfo parse(String src)
{
- if (src == null || src.length() == 0)
+ if (Strings.isEmpty(src))
{
- return null;
+ return new PageInfo();
}
-
- String segments[] = Strings.split(src, getPageInfoSeparator());
-
- if (segments.length > 3)
+ else
{
- return null;
- }
-
- // go trhough the segments to determine if they don't contains invalid characters
- for (int i = 0; i < segments.length; ++i)
- {
- for (int j = 0; j < segments[i].length(); ++j)
+ try
{
- char c = segments[i].charAt(j);
- if (!Character.isLetterOrDigit(c) && c != '-' && c != '_')
- {
- return null;
- }
+ return new PageInfo(Integer.valueOf(src));
}
- }
-
- if (segments.length == 1 && isNumber(segments[0]))
- {
- // pageId
- return new PageInfo(Integer.valueOf(segments[0]), new Integer(0), null);
- }
- else if (segments.length == 2 && isNumber(segments[0]) && isNumber(segments[1]))
- {
- // pageId:pageVersion
- return new PageInfo(Integer.valueOf(segments[0]), Integer.valueOf(segments[1]), null);
- }
- else if (segments.length == 1 && !isNumber(segments[0]))
- {
- // pageMap (starts with letter)
- return new PageInfo(null, null, segments[0]);
- }
- else if (segments.length == 2 && segments[0].length() == 0)
- {
- // .pageMap
- return new PageInfo(null, null, segments[1]);
- }
- else if (segments.length == 2 && !isNumber(segments[0]) && isNumber(segments[1]))
- {
- // pageMap.pageId (pageMap starts with letter)
- return new PageInfo(Integer.valueOf(segments[1]), new Integer(0), segments[0]);
- }
- else if (segments.length == 3)
- {
- if (segments[2].length() == 0 && isNumber(segments[1]))
+ catch (NumberFormatException e)
{
- // we don't encode it like this, but we still should be able
- // to parse it
- // pageMapName.pageId.
- return new PageInfo(Integer.valueOf(segments[1]), new Integer(0), segments[0]);
- }
- else if (isNumber(segments[1]) && isNumber(segments[2]))
- {
- // pageMapName.pageId.pageVersion
- return new PageInfo(Integer.valueOf(segments[1]), Integer.valueOf(segments[2]),
- segments[0]);
+ return null;
}
}
-
- return null;
}
-
};
Modified: wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/PageClassRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/PageClassRequestHandler.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/PageClassRequestHandler.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/PageClassRequestHandler.java Sun Nov 30 12:23:53 2008
@@ -35,13 +35,6 @@
public Class<? extends IPage> getPageClass();
/**
- * Returns the pagemap name
- *
- * @return page map name
- */
- public String getPageMapName();
-
- /**
* @return page parameters
*/
public PageParameters getPageParameters();
Modified: wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java Sun Nov 30 12:23:53 2008
@@ -97,11 +97,6 @@
return page.getClass();
}
- public String getPageMapName()
- {
- return page.getPageMapName();
- }
-
public PageParameters getPageParameters()
{
return page.getPageParameters();
Modified: wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/BookmarkablePageRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/BookmarkablePageRequestHandler.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/BookmarkablePageRequestHandler.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/BookmarkablePageRequestHandler.java Sun Nov 30 12:23:53 2008
@@ -55,11 +55,6 @@
return pageClass;
}
- public String getPageMapName()
- {
- return pageMapName;
- }
-
public PageParameters getPageParameters()
{
return pageParameters;
Modified: wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/ListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/ListenerInterfaceRequestHandler.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/ListenerInterfaceRequestHandler.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/ListenerInterfaceRequestHandler.java Sun Nov 30 12:23:53 2008
@@ -97,11 +97,6 @@
return page.getClass();
}
- public String getPageMapName()
- {
- return page.getPageMapName();
- }
-
public PageParameters getPageParameters()
{
return page.getPageParameters();
Modified: wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/RenderPageRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/RenderPageRequestHandler.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/RenderPageRequestHandler.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/handler/impl/RenderPageRequestHandler.java Sun Nov 30 12:23:53 2008
@@ -279,11 +279,6 @@
return page.getClass();
}
- public String getPageMapName()
- {
- return page.getPageMapName();
- }
-
public PageParameters getPageParameters()
{
return page.getPageParameters();
Modified: wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/url-format.txt
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/url-format.txt?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/url-format.txt (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/main/java/org/apache/_wicket/request/url-format.txt Sun Nov 30 12:23:53 2008
@@ -11,14 +11,9 @@
Page Instance - Render (RenderPageRequestHandler)
/wicket/page?2
-/wicket/page?2.4
-/wicket/page?abc.2.4
Page Instance - Listener (ListenerInterfaceRequestHandler)
/wicket/page?2-click-foo-bar-baz
-/wicket/page?2.4-click-foo-bar-baz
-/wicket/page?pageMap.2.4-click-foo-bar-baz
-/wicket/page?2.4-click.1-foo-bar-baz (1 is behavior index)
BOOKMARKABLE - NOT MOUNTED
--------------------------
@@ -30,14 +25,10 @@
Page Instance - Render Hybrid (RenderPageRequestHandler for pages that were created using bookmarkable URLs)
/wicket/bookmarkable/org.apache.wicket.MyPage?2
-/wicket/bookmarkable/org.apache.wicket.MyPage?2.4
-/wicket/bookmarkable/org.apache.wicket.MyPage?pageMap.2.4
Page Instance - Bookmarkable Listener (BookmarkableListenerInterfaceRequestHandler)
/wicket/bookmarkable/org.apache.wicket.MyPage?2-click-foo-bar-baz
-/wicket/bookmarkable/org.apache.wicket.MyPage?2.4-click-foo-bar-baz
-/wicket/bookmarkable/org.apache.wicket.MyPage?pageMap.2.4-click-foo-bar-baz
-/wicket/bookmarkable/org.apache.wicket.MyPage?2.4-click.1-foo-bar-baz (1 is behavior index)
+/wicket/bookmarkable/org.apache.wicket.MyPage?2-click.1-foo-bar-baz (1 is behavior index)
(these will redirect to hybrid if page is not stateless)
BOOKMARKABLE - MOUNTED
@@ -50,14 +41,10 @@
Page Instance - Render Hybrid (RenderPageRequestHandler for mounted pages)
/mount/point?2
-/mount/point?2.4
-/mount/point?pageMap.2.4
Page Instance - Bookmarkable Listener (BookmarkableListenerInterfaceRequestHandler for mounted pages)
/mount/point?2-click-foo-bar-baz
-/mount/point?2.4-click-foo-bar-baz
-/mount/point?pageMap.2.4-click-foo-bar-baz
-/mount/point?2.4-click.1-foo-bar-baz (1 is behavior index)
+/mount/point?2-click.1-foo-bar-baz (1 is behavior index)
(these will redirect to hybrid if page is not stateless)
mount path can also contain parameter placeholders
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/MockPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/MockPage.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/MockPage.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/MockPage.java Sun Nov 30 12:23:53 2008
@@ -45,11 +45,9 @@
* @param pageVersion
* @param pageMapName
*/
- public MockPage(int pageId, int pageVersion, String pageMapName)
+ public MockPage(int pageId)
{
setPageId(pageId);
- setPageVersionNumber(pageVersion);
- setPageMapName(pageMapName);
}
/**
@@ -73,51 +71,13 @@
{
return pageId;
}
-
- private String pageMapName;
-
- public String getPageMapName()
- {
- return pageMapName;
- }
-
- /**
- * Sets the pagemap name
- *
- * @param pageMapName
- * @return <code>this</code>
- */
- public MockPage setPageMapName(String pageMapName)
- {
- this.pageMapName = pageMapName;
- return this;
- }
private PageParameters pageParameters = new PageParameters();
public PageParameters getPageParameters()
{
return pageParameters;
- }
-
- private int pageVersionNumber;
-
- public int getPageVersionNumber()
- {
- return pageVersionNumber;
- }
-
- /**
- * Sets the page version number
- *
- * @param pageVersionNumber
- * @return <code>this</code>
- */
- public MockPage setPageVersionNumber(int pageVersionNumber)
- {
- this.pageVersionNumber = pageVersionNumber;
- return this;
- }
+ }
private boolean bookmarkable;
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/AbstractEncoderTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/AbstractEncoderTest.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/AbstractEncoderTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/AbstractEncoderTest.java Sun Nov 30 12:23:53 2008
@@ -16,6 +16,8 @@
*/
package org.apache._wicket.request.encoder;
+import junit.framework.TestCase;
+
import org.apache._wicket.IPage;
import org.apache._wicket.request.RequestParameters;
import org.apache._wicket.request.Url;
@@ -24,8 +26,6 @@
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.markup.html.link.ILinkListener;
-import junit.framework.TestCase;
-
/**
* @author Matej Knopp
*/
@@ -66,11 +66,9 @@
};
}
- protected void checkPage(IPage page, int id, int version, String pageMapName)
+ protected void checkPage(IPage page, int id)
{
assertEquals(id, page.getPageId());
- assertEquals(version, page.getPageVersionNumber());
- assertEquals(pageMapName, page.getPageMapName());
}
}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/AbstractResourceReferenceEncoderTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/AbstractResourceReferenceEncoderTest.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/AbstractResourceReferenceEncoderTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/AbstractResourceReferenceEncoderTest.java Sun Nov 30 12:23:53 2008
@@ -24,7 +24,7 @@
/**
* @author Matej Knopp
*/
-public class AbstractResourceReferenceEncoderTest extends AbstractEncoderTest
+public abstract class AbstractResourceReferenceEncoderTest extends AbstractEncoderTest
{
/**
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/BookmarkableEncoderTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/BookmarkableEncoderTest.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/BookmarkableEncoderTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/BookmarkableEncoderTest.java Sun Nov 30 12:23:53 2008
@@ -99,7 +99,7 @@
assertTrue(handler instanceof RenderPageRequestHandler);
IPage page = ((RenderPageRequestHandler)handler).getPage();
- checkPage(page, 15, 0, null);
+ checkPage(page, 15);
}
/**
@@ -107,12 +107,12 @@
*/
public void testDecode4()
{
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?abc.15.5&a=b&b=c");
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c");
RequestHandler handler = encoder.decode(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
IPage page = ((RenderPageRequestHandler)handler).getPage();
- checkPage(page, 15, 5, "abc");
+ checkPage(page, 15);
PageParameters p = page.getPageParameters();
assertEquals(2, p.getIndexedParamsCount());
@@ -137,7 +137,7 @@
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
IPage page = h.getPage();
- checkPage(page, 15, 0, null);
+ checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPath());
@@ -150,14 +150,14 @@
public void testDecode6()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?abc.15.5-ILinkListener-foo-bar&a=b&b=c");
+ "/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
RequestHandler handler = encoder.decode(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
IPage page = h.getPage();
- checkPage(page, 15, 5, "abc");
+ checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPath());
@@ -185,7 +185,7 @@
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
IPage page = h.getPage();
- checkPage(page, 15, 0, null);
+ checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPath());
@@ -234,7 +234,7 @@
parameters);
Url url = encoder.encode(handler);
- assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?abc&a=b&b=c",
+ assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?a=b&b=c",
url.toString());
}
@@ -243,7 +243,7 @@
*/
public void testEncode4()
{
- MockPage page = new MockPage(15, 5, "abc");
+ MockPage page = new MockPage(15);
page.getPageParameters().setIndexedParameter(0, "i1");
page.getPageParameters().setIndexedParameter(1, "i2");
page.getPageParameters().setNamedParameter("a", "b");
@@ -253,7 +253,7 @@
RequestHandler handler = new RenderPageRequestHandler(page);
Url url = encoder.encode(handler);
- assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?abc.15.5&a=b&b=c",
+ assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c",
url.toString());
}
@@ -262,7 +262,7 @@
*/
public void testEncode5()
{
- MockPage page = new MockPage(15, 5, "abc");
+ MockPage page = new MockPage(15);
page.getPageParameters().setIndexedParameter(0, "i1");
page.getPageParameters().setIndexedParameter(1, "i2");
page.getPageParameters().setNamedParameter("a", "b");
@@ -284,7 +284,7 @@
*/
public void testEncode6()
{
- MockPage page = new MockPage(15, 5, "abc");
+ MockPage page = new MockPage(15);
page.getPageParameters().setIndexedParameter(0, "i1");
page.getPageParameters().setIndexedParameter(1, "i2");
page.getPageParameters().setNamedParameter("a", "b");
@@ -302,7 +302,7 @@
Url url = encoder.encode(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?abc.15.5-ILinkListener-foo-bar&a=b&b=c", url.toString());
+ "/i1/i2?15-ILinkListener-foo-bar&a=b&b=c", url.toString());
}
/**
@@ -310,7 +310,7 @@
*/
public void testEncode7()
{
- MockPage page = new MockPage(15, 5, "abc");
+ MockPage page = new MockPage(15);
page.getPageParameters().setIndexedParameter(0, "i1");
page.getPageParameters().setIndexedParameter(1, "i2");
page.getPageParameters().setNamedParameter("a", "b");
@@ -328,7 +328,7 @@
Url url = encoder.encode(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?abc.15.5-ILinkListener.4-foo-bar&a=b&b=c", url.toString());
+ "/i1/i2?15-ILinkListener.4-foo-bar&a=b&b=c", url.toString());
}
@@ -337,7 +337,7 @@
*/
public void testEncode8()
{
- MockPage page = new MockPage(15, 5, "abc");
+ MockPage page = new MockPage(15);
page.setBookmarkable(true);
page.setCreatedBookmarkable(true);
page.setPageStateless(true);
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/MountedEncoderTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/MountedEncoderTest.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/MountedEncoderTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/MountedEncoderTest.java Sun Nov 30 12:23:53 2008
@@ -106,7 +106,7 @@
assertTrue(handler instanceof RenderPageRequestHandler);
IPage page = ((RenderPageRequestHandler)handler).getPage();
- checkPage(page, 15, 0, null);
+ checkPage(page, 15);
}
/**
@@ -114,12 +114,12 @@
*/
public void testDecode4()
{
- Url url = Url.parse("some/mount/path/i1/i2?abc.15.5&a=b&b=c");
+ Url url = Url.parse("some/mount/path/i1/i2?15&a=b&b=c");
RequestHandler handler = encoder.decode(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
IPage page = ((RenderPageRequestHandler)handler).getPage();
- checkPage(page, 15, 5, "abc");
+ checkPage(page, 15);
PageParameters p = page.getPageParameters();
assertEquals(2, p.getIndexedParamsCount());
@@ -144,7 +144,7 @@
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
IPage page = h.getPage();
- checkPage(page, 15, 0, null);
+ checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPath());
@@ -156,14 +156,14 @@
*/
public void testDecode6()
{
- Url url = Url.parse("some/mount/path/i1/i2?abc.15.5-ILinkListener-foo-bar&a=b&b=c");
+ Url url = Url.parse("some/mount/path/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
RequestHandler handler = encoder.decode(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
IPage page = h.getPage();
- checkPage(page, 15, 5, "abc");
+ checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPath());
@@ -191,7 +191,7 @@
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
IPage page = h.getPage();
- checkPage(page, 15, 0, null);
+ checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPath());
@@ -262,7 +262,7 @@
parameters);
Url url = encoder.encode(handler);
- assertEquals("some/mount/path/i1/i2?abc&a=b&b=c", url.toString());
+ assertEquals("some/mount/path/i1/i2?a=b&b=c", url.toString());
}
/**
@@ -270,7 +270,7 @@
*/
public void testEncode4()
{
- MockPage page = new MockPage(15, 5, "abc");
+ MockPage page = new MockPage(15);
page.getPageParameters().setIndexedParameter(0, "i1");
page.getPageParameters().setIndexedParameter(1, "i2");
page.getPageParameters().setNamedParameter("a", "b");
@@ -280,7 +280,7 @@
RequestHandler handler = new RenderPageRequestHandler(page);
Url url = encoder.encode(handler);
- assertEquals("some/mount/path/i1/i2?abc.15.5&a=b&b=c", url.toString());
+ assertEquals("some/mount/path/i1/i2?15&a=b&b=c", url.toString());
}
/**
@@ -288,7 +288,7 @@
*/
public void testEncode5()
{
- MockPage page = new MockPage(15, 5, "abc");
+ MockPage page = new MockPage(15);
page.getPageParameters().setIndexedParameter(0, "i1");
page.getPageParameters().setIndexedParameter(1, "i2");
page.getPageParameters().setNamedParameter("a", "b");
@@ -303,7 +303,7 @@
// bookmarkable
// URL
- assertEquals("some/mount/path/i1/i2?abc.15.5&a=b&b=c", url.toString());
+ assertEquals("some/mount/path/i1/i2?15&a=b&b=c", url.toString());
}
/**
@@ -311,7 +311,7 @@
*/
public void testEncode6()
{
- MockPage page = new MockPage(15, 5, "abc");
+ MockPage page = new MockPage(15);
page.getPageParameters().setIndexedParameter(0, "i1");
page.getPageParameters().setIndexedParameter(1, "i2");
page.getPageParameters().setNamedParameter("a", "b");
@@ -328,7 +328,7 @@
Url url = encoder.encode(handler);
- assertEquals("some/mount/path/i1/i2?abc.15.5-ILinkListener-foo-bar&a=b&b=c", url.toString());
+ assertEquals("some/mount/path/i1/i2?15-ILinkListener-foo-bar&a=b&b=c", url.toString());
}
/**
@@ -336,7 +336,7 @@
*/
public void testEncode7()
{
- MockPage page = new MockPage(15, 5, "abc");
+ MockPage page = new MockPage(15);
page.getPageParameters().setIndexedParameter(0, "i1");
page.getPageParameters().setIndexedParameter(1, "i2");
page.getPageParameters().setNamedParameter("a", "b");
@@ -353,7 +353,7 @@
Url url = encoder.encode(handler);
- assertEquals("some/mount/path/i1/i2?abc.15.5-ILinkListener.4-foo-bar&a=b&b=c",
+ assertEquals("some/mount/path/i1/i2?15-ILinkListener.4-foo-bar&a=b&b=c",
url.toString());
}
@@ -363,7 +363,7 @@
*/
public void testEncode8()
{
- MockPage page = new MockPage(15, 5, "abc");
+ MockPage page = new MockPage(15);
page.setBookmarkable(true);
page.setCreatedBookmarkable(true);
page.setPageStateless(true);
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/PageInstanceEncoderTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/PageInstanceEncoderTest.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/PageInstanceEncoderTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/PageInstanceEncoderTest.java Sun Nov 30 12:23:53 2008
@@ -59,7 +59,7 @@
assertTrue(handler instanceof RenderPageRequestHandler);
RenderPageRequestHandler h = (RenderPageRequestHandler) handler;
- checkPage(h.getPage(), 4, 0, null);
+ checkPage(h.getPage(), 4);
}
/**
@@ -67,13 +67,13 @@
*/
public void testDecode2()
{
- Url url = Url.parse("wicket/page?4.5");
+ Url url = Url.parse("wicket/page/ingore/me?4&a=3&b=3");
RequestHandler handler = encoder.decode(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RenderPageRequestHandler h = (RenderPageRequestHandler) handler;
- checkPage(h.getPage(), 4, 5, null);
+ checkPage(h.getPage(), 4);
}
/**
@@ -81,27 +81,13 @@
*/
public void testDecode3()
{
- Url url = Url.parse("wicket/page/ingore/me?abc.4.5&a=3&b=3");
-
- RequestHandler handler = encoder.decode(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
-
- RenderPageRequestHandler h = (RenderPageRequestHandler) handler;
- checkPage(h.getPage(), 4, 5, "abc");
- }
-
- /**
- *
- */
- public void testDecode4()
- {
- Url url = Url.parse("wicket/page?abc.4.5-ILinkListener-a-b-c");
+ Url url = Url.parse("wicket/page?4-ILinkListener-a-b-c");
RequestHandler handler = encoder.decode(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler) handler;
- checkPage(h.getPage(), 4, 5, "abc");
+ checkPage(h.getPage(), 4);
assertEquals(h.getComponent().getPath(), "a:b:c");
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertNull(h.getBehaviorIndex());
@@ -110,9 +96,9 @@
/**
*
*/
- public void testDecode5()
+ public void testDecode4()
{
- Url url = Url.parse("wickett/pagee?abc.4.5-ILinkListener-a:b-c");
+ Url url = Url.parse("wickett/pagee?4-ILinkListener-a:b-c");
RequestHandler handler = encoder.decode(getRequest(url));
assertNull(handler);
@@ -121,7 +107,7 @@
/**
*
*/
- public void testDecode6()
+ public void testDecode5()
{
Url url = Url.parse("wicket/page?abc");
@@ -132,15 +118,15 @@
/**
*
*/
- public void testDecode7()
+ public void testDecode6()
{
- Url url = Url.parse("wicket/page?abc.4.5-ILinkListener.5-a-b-c");
+ Url url = Url.parse("wicket/page?4-ILinkListener.5-a-b-c");
RequestHandler handler = encoder.decode(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler) handler;
- checkPage(h.getPage(), 4, 5, "abc");
+ checkPage(h.getPage(), 4);
assertEquals(h.getComponent().getPath(), "a:b:c");
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals((Object)5, h.getBehaviorIndex());
@@ -151,31 +137,20 @@
*/
public void testEncode1()
{
- MockPage page = new MockPage(15, 4, "pm1");
- RequestHandler handler = new RenderPageRequestHandler(page);
-
- Url url = encoder.encode(handler);
- assertEquals("wicket/page?pm1.15.4", url.toString());
- }
-
- /**
- *
- */
- public void testEncode2()
- {
- MockPage page = new MockPage(15, 0, null);
+ MockPage page = new MockPage(15);
RequestHandler handler = new RenderPageRequestHandler(page);
Url url = encoder.encode(handler);
assertEquals("wicket/page?15", url.toString());
}
+
/**
*
*/
- public void testEncode3()
+ public void testEncode2()
{
- MockPage page = new MockPage(15, 0, null);
+ MockPage page = new MockPage(15);
IComponent c = page.get("a:b:c");
@@ -185,18 +160,4 @@
assertEquals("wicket/page?15-ILinkListener-a-b-c", url.toString());
}
- /**
- *
- */
- public void testEncode4()
- {
- MockPage page = new MockPage(15, 0, null);
-
- IComponent c = page.get("a:b:c");
-
- RequestHandler handler = new ListenerInterfaceRequestHandler(page, c, ILinkListener.INTERFACE, 5);
-
- Url url = encoder.encode(handler);
- assertEquals("wicket/page?15-ILinkListener.5-a-b-c", url.toString());
- }
}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/TestEncoderContext.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/TestEncoderContext.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/TestEncoderContext.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/TestEncoderContext.java Sun Nov 30 12:23:53 2008
@@ -52,7 +52,7 @@
{
return "page";
}
-
+
public String getResourceIdentifier()
{
return "resource";
@@ -62,9 +62,9 @@
{
return registry;
}
-
+
private ResourceReferenceRegistry registry = new ResourceReferenceRegistry();
-
+
private boolean bookmarkable = true;
/**
@@ -89,12 +89,10 @@
this.createdBookmarkable = createdBookmarkable;
}
- public IPage getPageInstance(String pageMapName, int pageId, int versionNumber)
+ public IPage getPageInstance(int pageId)
{
MockPage page = new MockPage();
page.setPageId(pageId);
- page.setPageMapName(pageMapName);
- page.setPageVersionNumber(versionNumber);
page.setBookmarkable(bookmarkable);
page.setCreatedBookmarkable(createdBookmarkable);
return page;
@@ -102,15 +100,13 @@
int idCounter = 0;
- public IPage newPageInstance(String pageMapName, Class<? extends IPage> pageClass,
- PageParameters pageParameters)
- {
+ public IPage newPageInstance(Class<? extends IPage> pageClass, PageParameters pageParameters)
+ {
try
{
MockPage page;
page = (MockPage)pageClass.newInstance();
page.setPageId(++idCounter);
- page.setPageMapName(pageMapName);
page.setBookmarkable(true);
page.setCreatedBookmarkable(true);
page.getPageParameters().assign(pageParameters);
@@ -131,7 +127,7 @@
{
return listenerInterface.getName();
}
-
+
public Class<? extends IPage> getHomePageClass()
{
return MockPage.class;
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/info/PageComponentInfoTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/info/PageComponentInfoTest.java?rev=721888&r1=721887&r2=721888&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/info/PageComponentInfoTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/_wicket/request/encoder/info/PageComponentInfoTest.java Sun Nov 30 12:23:53 2008
@@ -34,26 +34,20 @@
{
}
- private void testPageInfoOnly(PageComponentInfo info, String pageMapName, Integer pageId,
- Integer versionNumber)
+ private void testPageInfoOnly(PageComponentInfo info, Integer pageId)
{
assertNull(info.getComponentInfo());
assertNotNull(info.getPageInfo());
- assertEquals(pageMapName, info.getPageInfo().getPageMapName());
assertEquals(pageId, info.getPageInfo().getPageId());
- assertEquals(versionNumber, info.getPageInfo().getVersionNumber());
}
- private void testPageComponentInfo(PageComponentInfo info, String pageMapName, Integer pageId,
- Integer versionNumber, String listener, String componentPath)
+ private void testPageComponentInfo(PageComponentInfo info, Integer pageId, String listener, String componentPath)
{
assertNotNull(info.getComponentInfo());
assertNotNull(info.getPageInfo());
- assertEquals(pageMapName, info.getPageInfo().getPageMapName());
assertEquals(pageId, info.getPageInfo().getPageId());
- assertEquals(versionNumber, info.getPageInfo().getVersionNumber());
assertEquals(listener, info.getComponentInfo().getListenerInterface());
assertEquals(componentPath, info.getComponentInfo().getComponentPath());
@@ -66,7 +60,7 @@
{
String s = "2-click-foo-bar-baz";
PageComponentInfo info = PageComponentInfo.parse(s);
- testPageComponentInfo(info, null, 2, 0, "click", "foo:bar:baz");
+ testPageComponentInfo(info, 2, "click", "foo:bar:baz");
assertEquals(s, info.toString());
}
@@ -75,97 +69,9 @@
*/
public void test2()
{
- String s = "2.4-click-foo-bar-baz";
+ String s = "2";
PageComponentInfo info = PageComponentInfo.parse(s);
- testPageComponentInfo(info, null, 2, 4, "click", "foo:bar:baz");
- assertEquals(s, info.toString());
- }
-
- /**
- *
- */
- public void test3()
- {
- String s = "pagemap.2.4-click-foo-bar-baz";
- PageComponentInfo info = PageComponentInfo.parse(s);
- testPageComponentInfo(info, "pagemap", 2, 4, "click", "foo:bar:baz");
- assertEquals(s, info.toString());
- }
-
- /**
- *
- */
- public void test4()
- {
- String s = "pagemap-click-foo-bar-baz";
- PageComponentInfo info = PageComponentInfo.parse(s);
- testPageComponentInfo(info, "pagemap", null, null, "click", "foo:bar:baz");
- assertEquals(s, info.toString());
- }
-
- /**
- *
- */
- public void test5()
- {
- String s = "123pagemap-click-foo-bar-baz";
- PageComponentInfo info = PageComponentInfo.parse(s);
- testPageComponentInfo(info, "123pagemap", null, null, "click", "foo:bar:baz");
- assertEquals(s, info.toString());
- }
-
- /**
- *
- */
- public void test6()
- {
- String s = "123pagemap-click-foo-bar-baz";
- PageComponentInfo info = PageComponentInfo.parse(s);
- testPageComponentInfo(info, "123pagemap", null, null, "click", "foo:bar:baz");
- assertEquals(s, info.toString());
- }
-
- /**
- *
- */
- public void test7()
- {
- String s = "123pagemap.2-click-foo-bar-baz";
- PageComponentInfo info = PageComponentInfo.parse(s);
- testPageComponentInfo(info, "123pagemap", 2, 0, "click", "foo:bar:baz");
- assertEquals(s, info.toString());
- }
-
- /**
- *
- */
- public void test8()
- {
- String s = ".123-click-foo-bar-baz";
- PageComponentInfo info = PageComponentInfo.parse(s);
- testPageComponentInfo(info, "123", null, null, "click", "foo:bar:baz");
- assertEquals(s, info.toString());
- }
-
- /**
- *
- */
- public void test9()
- {
- String s = "123.2.0-click-foo-bar-baz";
- PageComponentInfo info = PageComponentInfo.parse(s);
- testPageComponentInfo(info, "123", 2, 0, "click", "foo:bar:baz");
- assertEquals(s, info.toString());
- }
-
- /**
- *
- */
- public void test10()
- {
- String s = "abc.2";
- PageComponentInfo info = PageComponentInfo.parse(s);
- testPageInfoOnly(info, "abc", 2, 0);
+ testPageInfoOnly(info, 2);
assertEquals(s, info.toString());
}
}