Author: mgrigorov
Date: Sat Jul 24 17:54:15 2010
New Revision: 978917
URL: http://svn.apache.org/viewvc?rev=978917&view=rev
Log:
Update javadocs - there is no more PageMap, nor page version. There is just
pageId.
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java?rev=978917&r1=978916&r2=978917&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
Sat Jul 24 17:54:15 2010
@@ -31,19 +31,14 @@ import org.apache.wicket.util.lang.Check
* <pre>
* Page Class - Render (BookmarkablePageRequestHandler)
* /wicket/bookmarkable/org.apache.wicket.MyPage
- * /wicket/bookmarkable/org.apache.wicket.MyPage?pageMap
- * (these will redirect to hybrid alternative if page is not stateless)
+ * (will redirect to hybrid alternative if page is not stateless)
*
* 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)
* </pre>
*
@@ -108,8 +103,7 @@ public class BookmarkableMapper extends
Class<? extends IRequestablePage> pageClass =
getPageClass(className);
// extract the PageParameters from URL if there are any
- PageParameters pageParameters =
extractPageParameters(request, 3,
- pageParametersEncoder);
+ PageParameters pageParameters =
extractPageParameters(request, 3, pageParametersEncoder);
return new UrlInfo(info, pageClass, pageParameters);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java?rev=978917&r1=978916&r2=978917&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
Sat Jul 24 17:54:15 2010
@@ -71,14 +71,7 @@ public class PageInfo
}
/**
- * <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>
+ * The {...@link #pageId} as string
*/
@Override
public String toString()
@@ -96,7 +89,7 @@ public class PageInfo
/**
* @param src
- * @return page insfo instance or <code>null</code> if the string
couldn't have been parsed
+ * @return page info instance or <code>null</code> if the string
couldn't have been parsed
*/
public static PageInfo parse(String src)
{
