Author: ivaynberg
Date: Sun Oct 25 03:20:40 2009
New Revision: 829484
URL: http://svn.apache.org/viewvc?rev=829484&view=rev
Log:
WICKET-NG: slowly phasing out the use of pagemaps in order to remove the
concept completely
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/URIRequestTargetUrlCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Sun Oct
25 03:20:40 2009
@@ -3022,7 +3022,7 @@
public final <C extends Page> CharSequence urlFor(final Class<C>
pageClass,
final PageParameters parameters)
{
- return getRequestCycle().urlFor(getPage().getPageMap(),
pageClass, parameters);
+ return getRequestCycle().urlFor(pageClass, parameters);
}
/**
@@ -3042,32 +3042,6 @@
}
/**
- * Returns a bookmarkable URL that references a given page class using
a given set of page
- * parameters. Since the URL which is returned contains all information
necessary to instantiate
- * and render the page, it can be stored in a user's browser as a
stable bookmark.
- *
- * @param <C>
- *
- *
- * @see RequestCycle#urlFor(IPageMap, Class, PageParameters)
- *
- * @param pageMap
- * Page map to use
- * @param pageClass
- * Class of page
- * @param parameters
- * Parameters to page
- *
- *
- * @return Bookmarkable URL to page
- */
- public final <C extends Page> CharSequence urlFor(final IPageMap
pageMap,
- final Class<C> pageClass, final PageParameters parameters)
- {
- return getRequestCycle().urlFor(pageMap, pageClass, parameters);
- }
-
- /**
* Returns a URL that references the given request target.
*
* @see RequestCycle#urlFor(IRequestTarget)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestCycle.java Sun
Oct 25 03:20:40 2009
@@ -685,7 +685,7 @@
}
else if (target instanceof IBookmarkablePageRequestTarget)
{
- return
((IBookmarkablePageRequestTarget)target).getPageMapName();
+ return PageMap.DEFAULT_NAME;
}
else
{
@@ -708,22 +708,6 @@
}
/**
- * Sets the page class with optionally the page parameters as the
render target of this request.
- *
- * @param <C>
- *
- * @param pageClass
- * The page class to render as a response
- * @param pageParameters
- * The page parameters that gets appended to the
bookmarkable url,
- */
- public final <C extends Page> void setResponsePage(final Class<C>
pageClass,
- final PageParameters pageParameters)
- {
- setResponsePage(pageClass, pageParameters, getCurrentPageMap());
- }
-
- /**
* Sets the page class with optionally the page parameters and page map
name as the render
* target of this request.
*
@@ -737,10 +721,9 @@
* The pagemap in which the response page should be created
*/
public final <C extends Page> void setResponsePage(final Class<C>
pageClass,
- final PageParameters pageParameters, final String pageMapName)
+ final PageParameters pageParameters)
{
- IRequestTarget target = new
BookmarkablePageRequestTarget(pageMapName, pageClass,
- pageParameters);
+ IRequestTarget target = new
BookmarkablePageRequestTarget(pageClass, pageParameters);
setRequestTarget(target);
}
@@ -801,25 +784,6 @@
}
/**
- * Returns a bookmarkable URL that references a given page class using
a given set of page
- * parameters. Since the URL which is returned contains all information
necessary to instantiate
- * and render the page, it can be stored in a user's browser as a
stable bookmark.
- *
- * @param <C>
- *
- * @param pageClass
- * Class of page
- * @param parameters
- * Parameters to page
- * @return Bookmarkable URL to page
- */
- public final <C extends Page> CharSequence urlFor(final Class<C>
pageClass,
- final PageParameters parameters)
- {
- return urlFor(null, pageClass, parameters);
- }
-
- /**
* Returns a URL that references a given interface on a given behavior
of a component. When the
* URL is requested from the server at a later time, the interface on
the behavior will be
* called. A URL returned by this method will not be stable across
sessions and cannot be
@@ -970,19 +934,16 @@
*
* @param <C>
*
- * @param pageMap
- * Pagemap to use. If null is passed the default page map
will be used
* @param pageClass
* Class of page
* @param parameters
* Parameters to page
* @return Bookmarkable URL to page
*/
- public final <C extends Page> CharSequence urlFor(final IPageMap
pageMap,
- final Class<C> pageClass, final PageParameters parameters)
+ public final <C extends Page> CharSequence urlFor(final Class<C>
pageClass,
+ final PageParameters parameters)
{
- final IRequestTarget target = new
BookmarkablePageRequestTarget(pageMap == null
- ? PageMap.DEFAULT_NAME : pageMap.getName(), pageClass,
parameters);
+ final IRequestTarget target = new
BookmarkablePageRequestTarget(pageClass, parameters);
return encodeUrlFor(target);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
Sun Oct 25 03:20:40 2009
@@ -149,8 +149,7 @@
{
IBookmarkablePageRequestTarget current
= (IBookmarkablePageRequestTarget)target;
BookmarkablePageRequestTarget redirect
= new BookmarkablePageRequestTarget(
-
session.createAutoPageMapName(), current.getPageClass(),
- current.getPageParameters());
+ current.getPageClass(),
current.getPageParameters());
url = cycle.urlFor(redirect);
}
else
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/BookmarkablePageLink.java
Sun Oct 25 03:20:40 2009
@@ -19,12 +19,8 @@
import java.util.Iterator;
import java.util.Map.Entry;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.IPageMap;
import org.apache.wicket.Page;
-import org.apache.wicket.PageMap;
import org.apache.wicket.PageParameters;
-import org.apache.wicket.model.Model;
import org.apache.wicket.util.collections.MiniMap;
import org.apache.wicket.util.lang.Classes;
@@ -43,7 +39,7 @@
private final String pageClassName;
/** Any page map for this link */
- private String pageMapName = null;
+ private final String pageMapName = null;
/** The parameters to pass to the class constructor when instantiated.
*/
protected MiniMap<String, Object> parameters;
@@ -145,21 +141,6 @@
}
/**
- * @return Page map for this link
- */
- public final IPageMap getPageMap()
- {
- if (pageMapName != null)
- {
- return PageMap.forName(pageMapName);
- }
- else
- {
- return getPage().getPageMap();
- }
- }
-
- /**
* Whether this link refers to the given page.
*
* @param page
@@ -192,21 +173,6 @@
}
/**
- * @param pageMap
- * The pagemap for this link's destination
- * @return This
- */
- public final BookmarkablePageLink<T> setPageMap(final IPageMap pageMap)
- {
- if (pageMap != null)
- {
- pageMapName = pageMap.getName();
- add(new AttributeModifier("target", true, new
Model<String>(pageMapName)));
- }
- return this;
- }
-
- /**
* Adds a given page property value to this link.
*
* @param property
@@ -267,13 +233,6 @@
PageParameters parameters = getPageParameters();
- if (getPopupSettings() != null)
- {
- return urlFor(getPopupSettings().getPageMap(this),
getPageClass(), parameters);
- }
- else
- {
- return urlFor(getPageMap(), getPageClass(), parameters);
- }
+ return urlFor(getPageClass(), parameters);
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
Sun Oct 25 03:20:40 2009
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.wicket.IPageMap;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
@@ -198,15 +197,6 @@
}
}
}
-
- if (popupSettings != null)
- {
- IPageMap popupPageMap =
popupSettings.getPageMap(this);
- if (popupPageMap != null &&
popupPageMap.getName() != null)
- {
- tag.put("target",
popupPageMap.getName());
- }
- }
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
Sun Oct 25 03:20:40 2009
@@ -16,9 +16,7 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.wicket.IPageMap;
import org.apache.wicket.Page;
-import org.apache.wicket.PageMap;
import org.apache.wicket.PageParameters;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.Session;
@@ -45,11 +43,6 @@
private final IPageLink pageLink;
/**
- * The pagemap name where the page that will be created by this inline
frame will be created in.
- */
- private final String pageMapName;
-
- /**
* Constructs an inline frame that instantiates the given Page class
when the content of the
* inline frame is requested. The instantiated Page is used to render a
response to the user.
*
@@ -62,9 +55,9 @@
* @param c
* Page class
*/
- public <C extends Page> InlineFrame(final String id, final IPageMap
pageMap, final Class<C> c)
+ public <C extends Page> InlineFrame(final String id, final Class<C> c)
{
- this(id, pageMap, c, null);
+ this(id, c, null);
}
/**
@@ -82,10 +75,10 @@
* @param params
* Page parameters
*/
- public <C extends Page> InlineFrame(final String id, final IPageMap
pageMap, final Class<C> c,
+ public <C extends Page> InlineFrame(final String id, final Class<C> c,
final PageParameters params)
{
- this(id, pageMap, new IPageLink()
+ this(id, new IPageLink()
{
private static final long serialVersionUID = 1L;
@@ -126,7 +119,7 @@
*/
public InlineFrame(final String id, final Page page)
{
- this(id, page.getPageMap(), new IPageLink()
+ this(id, new IPageLink()
{
private static final long serialVersionUID = 1L;
@@ -153,18 +146,13 @@
*
* @param id
* See Component
- * @param pageMap
- * the pagemap where the page of the inline frame must be in
* @param pageLink
* An implementation of IPageLink which will create the page
to be contained in the
* inline frame if and when the content is requested
*/
- public InlineFrame(final String id, final IPageMap pageMap, IPageLink
pageLink)
+ public InlineFrame(final String id, IPageLink pageLink)
{
super(id);
-
- pageMapName = pageMap.getName();
-
this.pageLink = pageLink;
}
@@ -208,10 +196,6 @@
String oldPageMapName = parameters.getPageMapName();
try
{
- if (pageMapName != null)
- {
-
RequestCycle.get().getRequest().getRequestParameters().setPageMapName(pageMapName);
- }
setResponsePage(pageLink.getPage());
}
finally
@@ -220,15 +204,6 @@
}
}
- /**
- * Returns the pageMap.
- *
- * @return pageMap
- */
- public final IPageMap getPageMap()
- {
- return PageMap.forName(pageMapName);
- }
@Override
protected boolean getStatelessHint()
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
Sun Oct 25 03:20:40 2009
@@ -17,7 +17,6 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.Component;
-import org.apache.wicket.IPageMap;
import org.apache.wicket.Page;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.WicketRuntimeException;
@@ -186,14 +185,6 @@
*/
public final void onLinkClicked()
{
- // if there are popupsettings and this link is clicked.
- // set the popup page map in the request parameters, so that
pages that
- // are created in the onClick are made in the wanted pagemap
- if (popupSettings != null)
- {
-
RequestCycle.get().getRequest().getRequestParameters().setPageMapName(
- popupSettings.getPageMap(this).getName());
- }
// Invoke subclass handler
onClick();
}
@@ -426,15 +417,6 @@
{
tag.put("onclick", onClickJavaScript);
}
-
- if (popupSettings != null)
- {
- IPageMap popupPageMap =
popupSettings.getPageMap(this);
- if (popupPageMap != null &&
popupPageMap.getName() != null)
- {
- tag.put("target",
popupPageMap.getName());
- }
- }
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
Sun Oct 25 03:20:40 2009
@@ -16,10 +16,7 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
-import org.apache.wicket.IPageMap;
-import org.apache.wicket.Page;
import org.apache.wicket.PageMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,11 +93,6 @@
private String windowName = null;
/**
- * The pagemap name where the page that will be created by this
popuplink will be created in.
- */
- private String pageMapName;
-
- /**
* Construct. If you are not using these popup settings with an
external link - in which case we
* don't need to know about a page map - you should use one of the
constructors with a
* {...@link PageMap} argument. Typically, you should put any popup in
a separate page map as
@@ -126,21 +118,17 @@
/**
* Construct.
*
- * @param pagemap
- * The pagemap where this popup must be in. Typically, you
should put any popup in a
- * separate page map as Wicket holds references to a limited
number of pages/
- * versions only. If you don't put your popup in a separate
page map, the user might
- * get page expired exceptions when getting back to the main
window again.
+ * @param windowName
*/
- public PopupSettings(IPageMap pagemap)
+ public PopupSettings(String windowName)
{
- this(pagemap, 0);
+ this(windowName, 0);
}
/**
* Construct.
*
- * @param pagemap
+ * @param windowName
* The pagemap where this popup must be in. Typically, you
should put any popup in a
* separate page map as Wicket holds references to a limited
number of pages/
* versions only. If you don't put your popup in a separate
page map, the user might
@@ -148,14 +136,10 @@
* @param displayFlags
* Display flags
*/
- public PopupSettings(IPageMap pagemap, final int displayFlags)
+ public PopupSettings(String windowName, final int displayFlags)
{
this.displayFlags = displayFlags;
- if (pagemap != null)
- {
- pageMapName = pagemap.getName();
- windowName = pageMapName;
- }
+ this.windowName = windowName;
}
/**
@@ -292,13 +276,6 @@
if (popupWindowName != null)
{
windowName = popupWindowName;
- if (pageMapName != null &&
(!pageMapName.equals(popupWindowName)))
- {
- log.warn("the page map and window name should
be the same. The page map was " +
- pageMapName + ", and the requested
window name is " + popupWindowName +
- "; changing the page map to " +
popupWindowName);
- }
- pageMapName = popupWindowName;
}
return this;
}
@@ -312,36 +289,4 @@
{
return (displayFlags & flag) != 0 ? "yes" : "no";
}
-
- /**
- * Gets the pagemap where the popup page must be created in.
- *
- * @param callee
- * Calling component
- * @return The pagemap where the popup page must be created in
- */
- public IPageMap getPageMap(Component callee)
- {
- if (pageMapName != null)
- {
- return PageMap.forName(pageMapName);
- }
- else
- {
- if (callee == null)
- {
- throw new IllegalArgumentException(
- "when the page map is not set, argument
callee may not be null");
- }
- Page page = callee.getPage();
- if (page == null)
- {
- throw new IllegalStateException(callee +
- " is not yet set on a page; if you want
to use this method " +
- "without a page map being set, argument
callee must be not null " +
- "and added to a page");
- }
- return page.getPageMap();
- }
- }
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
Sun Oct 25 03:20:40 2009
@@ -46,7 +46,6 @@
import org.apache.wicket.Application;
import org.apache.wicket.Component;
-import org.apache.wicket.IPageMap;
import org.apache.wicket.IRedirectListener;
import org.apache.wicket.IResourceListener;
import org.apache.wicket.Page;
@@ -1219,12 +1218,11 @@
*/
public void setRequestToComponent(final Component component)
{
- final IPageMap pageMap = component.getPage().getPageMap();
- final String pageMapName = pageMap.isDefault() ? "" :
pageMap.getName();
+
if (component instanceof BookmarkablePageLink)
{
final Class<? extends Page> clazz =
((BookmarkablePageLink<?>)component).getPageClass();
-
parameters.put(WebRequestCodingStrategy.BOOKMARKABLE_PAGE_PARAMETER_NAME,
pageMapName +
+
parameters.put(WebRequestCodingStrategy.BOOKMARKABLE_PAGE_PARAMETER_NAME,
':' + clazz.getName());
}
else
@@ -1259,7 +1257,7 @@
}
// manually create the url using default strategy and
format
-
parameters.put(WebRequestCodingStrategy.INTERFACE_PARAMETER_NAME, pageMapName +
':' +
+
parameters.put(WebRequestCodingStrategy.INTERFACE_PARAMETER_NAME, ':' +
component.getPath() + ':' + (version == 0 ? ""
: "" + version) + ':' +
Classes.simpleName(clazz) + "::");
@@ -1306,7 +1304,7 @@
if (component.isStateless() &&
component.getPage().isBookmarkable())
{
parameters.put(WebRequestCodingStrategy.BOOKMARKABLE_PAGE_PARAMETER_NAME,
- pageMapName + ':' +
component.getPage().getClass().getName());
+ ':' +
component.getPage().getClass().getName());
}
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
Sun Oct 25 03:20:40 2009
@@ -32,7 +32,6 @@
import org.apache.wicket.Application;
import org.apache.wicket.Component;
-import org.apache.wicket.IPageMap;
import org.apache.wicket.IRequestTarget;
import org.apache.wicket.Page;
import org.apache.wicket.PageParameters;
@@ -420,15 +419,7 @@
if (currentTarget instanceof IPageRequestTarget)
{
Page currentPage =
((IPageRequestTarget)currentTarget).getPage();
- final IPageMap pageMap =
currentPage.getPageMap();
- if (pageMap.isDefault())
- {
- pageMapName = "";
- }
- else
- {
- pageMapName = pageMap.getName();
- }
+ pageMapName = "";
}
else
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
Sun Oct 25 03:20:40 2009
@@ -28,7 +28,6 @@
import org.apache.wicket.Application;
import org.apache.wicket.IClusterable;
-import org.apache.wicket.IPageMap;
import org.apache.wicket.IRequestTarget;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.Page;
@@ -351,12 +350,6 @@
Page page = (Page)value;
rd.addEntry("Page removed, id: " + page.getId() + ",
class:" + page.getClass());
}
- else if (value instanceof IPageMap)
- {
- IPageMap map = (IPageMap)value;
- rd.addEntry("PageMap removed, name: " +
- (map.getName() == null ? "DEFAULT" :
map.getName()));
- }
else if (value instanceof WebSession)
{
rd.addEntry("Session removed");
@@ -378,12 +371,6 @@
Page page = (Page)value;
rd.addEntry("Page updated, id: " + page.getId() + ",
class:" + page.getClass());
}
- else if (value instanceof IPageMap)
- {
- IPageMap map = (IPageMap)value;
- rd.addEntry("PageMap updated, name: " +
- (map.getName() == null ? "DEFAULT" :
map.getName()));
- }
else if (value instanceof Session)
{
rd.addEntry("Session updated");
@@ -410,12 +397,6 @@
Page page = (Page)value;
rd.addEntry("Page created, id: " + page.getId() + ",
class:" + page.getClass());
}
- else if (value instanceof IPageMap)
- {
- IPageMap map = (IPageMap)value;
- rd.addEntry("PageMap created, name: " +
- (map.getName() == null ? "DEFAULT" :
map.getName()));
- }
else
{
rd.addEntry("Custom object created: " + value);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
Sun Oct 25 03:20:40 2009
@@ -748,7 +748,7 @@
final Application application = Application.get();
// Find pagemap name
- String pageMapName = requestTarget.getPageMapName();
+ String pageMapName = null;
if (pageMapName == null)
{
IRequestTarget currentTarget =
requestCycle.getRequestTarget();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
Sun Oct 25 03:20:40 2009
@@ -156,7 +156,7 @@
int version = 0;
String componentPath = t.getComponentPath();
String interfaceName = t.getInterfaceName();
- String pageMapName = t.getPageMapName();
+ String pageMapName = null;
// add the wicket:interface param to the params.
//
pagemap:(pageid:componenta:componentb:...):version:interface:behavior:urlDepth
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
Sun Oct 25 03:20:40 2009
@@ -277,8 +277,7 @@
}
else
{
- return new
BookmarkablePageRequestTarget(requestParameters.getPageMapName(),
- pageClass, params);
+ return new
BookmarkablePageRequestTarget(pageClass, params);
}
}
catch (RuntimeException e)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/URIRequestTargetUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/URIRequestTargetUrlCodingStrategy.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/URIRequestTargetUrlCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/basic/URIRequestTargetUrlCodingStrategy.java
Sun Oct 25 03:20:40 2009
@@ -24,7 +24,6 @@
import org.apache.wicket.IRequestTarget;
import org.apache.wicket.PageParameters;
-import org.apache.wicket.protocol.http.request.WebRequestCodingStrategy;
import org.apache.wicket.request.RequestParameters;
import
org.apache.wicket.request.target.coding.AbstractRequestTargetUrlCodingStrategy;
import
org.apache.wicket.request.target.coding.BookmarkablePageRequestTargetUrlCodingStrategy;
@@ -97,16 +96,6 @@
final IBookmarkablePageRequestTarget target =
(IBookmarkablePageRequestTarget)requestTarget;
PageParameters pageParameters = target.getPageParameters();
- String pagemap = target.getPageMapName();
- if (pagemap != null)
- {
- if (pageParameters == null)
- {
- pageParameters = new PageParameters();
- }
- pageParameters.put(WebRequestCodingStrategy.PAGEMAP,
-
WebRequestCodingStrategy.encodePageMapName(pagemap));
- }
appendParameters(url, pageParameters);
return url;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
Sun Oct 25 03:20:40 2009
@@ -116,7 +116,7 @@
// otherwise process as a normal bookmark page request
else
{
- return new
BookmarkablePageRequestTarget(requestParameters.getPageMapName(),
+ return new BookmarkablePageRequestTarget(
(Class<? extends
Page>)bookmarkablePageClassRef.get(), parameters);
}
}
@@ -136,16 +136,7 @@
final IBookmarkablePageRequestTarget target =
(IBookmarkablePageRequestTarget)requestTarget;
PageParameters pageParameters = target.getPageParameters();
- String pagemap = pageMapName != null ? pageMapName :
target.getPageMapName();
- if (pagemap != null)
- {
- if (pageParameters == null)
- {
- pageParameters = new PageParameters();
- }
- pageParameters.put(WebRequestCodingStrategy.PAGEMAP,
-
WebRequestCodingStrategy.encodePageMapName(pagemap));
- }
+
appendParameters(url, pageParameters);
return url;
}
@@ -160,14 +151,7 @@
IBookmarkablePageRequestTarget target =
(IBookmarkablePageRequestTarget)requestTarget;
if (((Class<? extends
Page>)bookmarkablePageClassRef.get()).equals(target.getPageClass()))
{
- if (pageMapName == null)
- {
- return true;
- }
- else
- {
- return
pageMapName.equals(target.getPageMapName());
- }
+ return true;
}
}
return false;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/HybridUrlCodingStrategy.java
Sun Oct 25 03:20:40 2009
@@ -362,14 +362,7 @@
if (requestTarget instanceof BookmarkablePageRequestTarget)
{
BookmarkablePageRequestTarget target =
(BookmarkablePageRequestTarget)requestTarget;
- if (target.getPageMapName() != null)
- {
- return new PageInfo(null, null,
target.getPageMapName());
- }
- else
- {
- return null;
- }
+ return null;
}
else if (requestTarget instanceof
ListenerInterfaceRequestTarget)
{
@@ -871,7 +864,7 @@
final Class<? extends Page> pageClass, final
PageParameters pageParameters,
final int originalUrlTrailingSlashesCount, final
boolean redirect)
{
- super(pageMapName, pageClass, pageParameters);
+ super(pageClass, pageParameters);
this.originalUrlTrailingSlashesCount =
originalUrlTrailingSlashesCount;
this.redirect = redirect;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java
Sun Oct 25 03:20:40 2009
@@ -120,7 +120,7 @@
}
else
{
- return new BookmarkablePageRequestTarget(pageMapName,
bookmarkablePageClass, parameters);
+ return new
BookmarkablePageRequestTarget(bookmarkablePageClass, parameters);
}
}
@@ -140,11 +140,6 @@
url.append("/").append(Classes.simpleName(target.getPageClass()));
PageParameters pageParameters = target.getPageParameters();
- if (target.getPageMapName() != null)
- {
- pageParameters.put(WebRequestCodingStrategy.PAGEMAP,
-
WebRequestCodingStrategy.encodePageMapName(target.getPageMapName()));
- }
appendParameters(url, pageParameters);
return url;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategy.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategy.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/QueryStringUrlCodingStrategy.java
Sun Oct 25 03:20:40 2009
@@ -144,8 +144,8 @@
}
else
{
- return new BookmarkablePageRequestTarget(pageMapName,
- (Class)bookmarkablePageClassRef.get(),
parameters);
+ return new
BookmarkablePageRequestTarget((Class)bookmarkablePageClassRef.get(),
+ parameters);
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java
Sun Oct 25 03:20:40 2009
@@ -55,7 +55,7 @@
Class<? extends Page> pageClass, PageParameters pageParameters,
String componentPath,
String interfaceName, int versionNumber)
{
- super(pageMapName, pageClass, pageParameters);
+ super(pageClass, pageParameters);
this.componentPath = componentPath;
this.interfaceName = interfaceName;
}
@@ -116,7 +116,7 @@
Page page = getPage();
if (page == null)
{
- page = Session.get().getPage(getPageMapName(),
componentPath, -1);
+ page = Session.get().getPage(null, componentPath, -1);
if (page != null && page.getClass() == getPageClass())
{
setPage(page);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkablePageRequestTarget.java
Sun Oct 25 03:20:40 2009
@@ -50,9 +50,6 @@
* */
private final WeakReference<Class<? extends Page>> pageClassRef;
- /** optional page map name. */
- private final String pageMapName;
-
/** optional page parameters. */
private final PageParameters pageParameters;
@@ -66,39 +63,7 @@
*/
public <C extends Page> BookmarkablePageRequestTarget(Class<C>
pageClass)
{
- this(null, pageClass);
- }
-
- /**
- * Construct.
- *
- * @param <C>
- *
- * @param pageClass
- * the class of the page
- * @param pageParameters
- * optional page parameters
- */
- public <C extends Page> BookmarkablePageRequestTarget(Class<C>
pageClass,
- PageParameters pageParameters)
- {
- this(null, pageClass, pageParameters);
- }
-
- /**
- * Construct.
- *
- * @param <C>
- *
- * @param pageMapName
- * optional page map name
- *
- * @param pageClass
- * the class of the page
- */
- public <C extends Page> BookmarkablePageRequestTarget(String
pageMapName, Class<C> pageClass)
- {
- this(pageMapName, pageClass, null);
+ this(pageClass, null);
}
/**
@@ -114,7 +79,7 @@
* @param pageParameters
* optional page parameters
*/
- public <C extends Page> BookmarkablePageRequestTarget(String
pageMapName, Class<C> pageClass,
+ public <C extends Page> BookmarkablePageRequestTarget(Class<C>
pageClass,
PageParameters pageParameters)
{
if (pageClass == null)
@@ -129,7 +94,6 @@
}
pageClassRef = new WeakReference<Class<? extends
Page>>(pageClass);
this.pageParameters = (pageParameters == null) ? new
PageParameters() : pageParameters;
- this.pageMapName = pageMapName;
}
/**
@@ -155,18 +119,7 @@
BookmarkablePageRequestTarget that =
(BookmarkablePageRequestTarget)obj;
if (getPageClass().equals(that.getPageClass()))
{
- boolean mapMatch = false;
-
- if (pageMapName != null)
- {
- mapMatch = (that.pageMapName != null &&
pageMapName.equals(that.pageMapName));
- }
- else
- {
- mapMatch = (that.pageMapName == null);
- }
-
- equal = mapMatch;
+ equal = true;
}
}
return equal;
@@ -194,13 +147,6 @@
return pageClassRef.get();
}
- /**
- * @see
org.apache.wicket.request.target.component.IBookmarkablePageRequestTarget#getPageMapName()
- */
- public final String getPageMapName()
- {
- return pageMapName;
- }
/**
* @see
org.apache.wicket.request.target.component.IBookmarkablePageRequestTarget#getPageParameters()
@@ -218,7 +164,6 @@
{
int result = "BookmarkablePageRequestTarget".hashCode();
result += getPageClass().hashCode();
- result += pageMapName != null ? pageMapName.hashCode() : 0;
return 17 * result;
}
@@ -323,4 +268,5 @@
return page;
}
+
}
\ No newline at end of file
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/component/IBookmarkablePageRequestTarget.java
Sun Oct 25 03:20:40 2009
@@ -43,10 +43,4 @@
*/
PageParameters getPageParameters();
- /**
- * Gets the optional page map name.
- *
- * @return the optional page map name
- */
- String getPageMapName();
}
\ No newline at end of file
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java
Sun Oct 25 03:20:40 2009
@@ -18,7 +18,6 @@
import org.apache.wicket.Application;
import org.apache.wicket.Page;
-import org.apache.wicket.PageMap;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
@@ -39,7 +38,7 @@
add(new BookmarkablePageLink<Void>("defaulthompage", homePage));
add(new BookmarkablePageLink<Void>("defaulthompagewithparams",
homePage,
new PageParameters("param1=1,param2=test")));
- add(new BookmarkablePageLink<Void>("defaulthompagewithpagemap",
homePage).setPageMap(PageMap.forName("testpagemap")));
+ add(new BookmarkablePageLink<Void>("defaulthompagewithpagemap",
homePage));
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
Sun Oct 25 03:20:40 2009
@@ -14,8 +14,8 @@
-->
<html xmlns:wicket>
<body>
- <a href="./" wicket:id="defaulthompage"></a>
- <a href="?param1=1&param2=test" wicket:id="defaulthompagewithparams"></a>
- <a
href="?wicket:bookmarkablePage=testpagemap:org.apache.wicket.util.tester.DummyHomePage"
target="testpagemap" wicket:id="defaulthompagewithpagemap"></a>
+ <a wicket:id="defaulthompage" href="./"></a>
+ <a wicket:id="defaulthompagewithparams" href="?param1=1&param2=test"></a>
+ <a wicket:id="defaulthompagewithpagemap" href="./"></a>
</body>
</html>
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java?rev=829484&r1=829483&r2=829484&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java
Sun Oct 25 03:20:40 2009
@@ -65,10 +65,8 @@
new
BookmarkablePageRequestTarget(BookmarkableHomePageLinksPage.class, parameters))
.toString();
String url2 = cycle.urlFor(
- new BookmarkablePageRequestTarget("mypagemap",
BookmarkableHomePageLinksPage.class,
- parameters)).toString();
- assertEquals("test1/Integer0/Integer1/a:b", url1);
-
assertEquals("test2/Integer0/Integer1/a:b/wicket:pageMapName/mypagemap", url2);
+ new
BookmarkablePageRequestTarget(BookmarkableHomePageLinksPage.class, parameters))
+ .toString();
tester.setupRequestAndResponse();
tester.getServletRequest().setURL(
@@ -79,14 +77,6 @@
RequestParameters requestParameters =
encoder.decode(tester.getWicketRequest());
IRequestTarget target1 = cycle.getProcessor().resolve(cycle,
requestParameters);
- if (target1 instanceof BookmarkablePageRequestTarget)
- {
-
assertNull(((BookmarkablePageRequestTarget)target1).getPageMapName());
- }
- else
- {
- fail("url: " + url1 + " wasn't resolved to a
bookmarkable target: " + target1);
- }
PageParameters params =
((BookmarkablePageRequestTarget)target1).getPageParameters();
assertEquals("Integer0", params.getString("0"));
assertEquals("Integer1", params.getString("1"));
@@ -101,14 +91,5 @@
requestParameters = encoder.decode(tester.getWicketRequest());
IRequestTarget target2 = cycle.getProcessor().resolve(cycle,
requestParameters);
-
- if (target2 instanceof BookmarkablePageRequestTarget)
- {
- assertEquals("mypagemap",
((BookmarkablePageRequestTarget)target2).getPageMapName());
- }
- else
- {
- fail("url: " + url2 + " wasn't resolved to a
bookmarkable target: " + target2);
- }
}
}
