Author: ehillenius
Date: Tue Jan 9 14:58:00 2007
New Revision: 494639
URL: http://svn.apache.org/viewvc?view=rev&rev=494639
Log:
sorted members and formatted
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java?view=diff&rev=494639&r1=494638&r2=494639
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/request/target/coding/BookmarkablePageRequestTargetUrlCodingStrategy.java
Tue Jan 9 14:58:00 2007
@@ -71,6 +71,63 @@
}
/**
+ * @see
wicket.request.target.coding.IRequestTargetUrlCodingStrategy#decode(wicket.request.RequestParameters)
+ */
+ public IRequestTarget decode(RequestParameters requestParameters)
+ {
+
+ final String parametersFragment =
requestParameters.getPath().substring(
+ getMountPath().length());
+ final PageParameters parameters = new
PageParameters(decodeParameters(parametersFragment,
+ requestParameters.getParameters()));
+ String pageMapName =
(String)parameters.remove(AbstractWebRequestCodingStrategy.PAGEMAP);
+ if (requestParameters.getPageMapName() == null)
+ {
+ requestParameters.setPageMapName(pageMapName);
+ }
+ else
+ {
+ pageMapName = requestParameters.getPageMapName();
+ }
+
+ final BookmarkablePageRequestTarget target;
+
+ final String bookmarkableInterfaceListener = (String)parameters
+
.remove(AbstractWebRequestCodingStrategy.INTERFACE_PARAMETER_NAME);
+
+ // Do the parameters contain component path and listener
interface?
+ if (bookmarkableInterfaceListener != null)
+ {
+ // TODO check if the page already exists and reuse that?
+
+
+ // try to parse component path and listener interface
+ final String[] pathComponents =
Strings.split(bookmarkableInterfaceListener,
+ Component.PATH_SEPARATOR);
+ // There must be at least 4 path components
+ if (pathComponents.length < 4)
+ {
+ throw new WicketRuntimeException("Internal
error parsing "
+ +
AbstractWebRequestCodingStrategy.INTERFACE_PARAMETER_NAME + " = "
+ +
bookmarkableInterfaceListener);
+ }
+ final String interfaceName =
pathComponents[pathComponents.length - 1];
+ final String componentPath =
bookmarkableInterfaceListener.substring(1,
+ bookmarkableInterfaceListener.length()
- interfaceName.length() - 2);
+
+ target = new
BookmarkableListenerInterfaceRequestTarget(pageMapName,
+ bookmarkablePageClass, parameters,
componentPath, interfaceName);
+ }
+ else
+ {
+ target = new BookmarkablePageRequestTarget(pageMapName,
bookmarkablePageClass,
+ parameters);
+ }
+
+ return target;
+ }
+
+ /**
* @see
wicket.request.target.coding.IRequestTargetUrlCodingStrategy#encode(wicket.IRequestTarget)
*/
public final CharSequence encode(final IRequestTarget requestTarget)
@@ -85,11 +142,12 @@
final IBookmarkablePageRequestTarget target =
(IBookmarkablePageRequestTarget)requestTarget;
PageParameters pageParameters = target.getPageParameters();
-
- // If the target contains component path and request target
interface, encode it.
- if (target instanceof
BookmarkableListenerInterfaceRequestTarget)
+
+ // If the target contains component path and request target
interface,
+ // encode it.
+ if (target instanceof
BookmarkableListenerInterfaceRequestTarget)
{
- BookmarkableListenerInterfaceRequestTarget
interfaceRequestTarget = (BookmarkableListenerInterfaceRequestTarget) target;
+ BookmarkableListenerInterfaceRequestTarget
interfaceRequestTarget = (BookmarkableListenerInterfaceRequestTarget)target;
final AppendingStringBuffer value = new
AppendingStringBuffer(32);
value.append(Component.PATH_SEPARATOR);
value.append(interfaceRequestTarget.getComponentPath());
@@ -102,7 +160,7 @@
}
pageParameters.put(AbstractWebRequestCodingStrategy.INTERFACE_PARAMETER_NAME,
value);
}
-
+
String pagemap = pageMapName != null ? pageMapName :
target.getPageMapName();
if (pagemap != null)
{
@@ -114,60 +172,6 @@
}
appendParameters(url, pageParameters);
return url;
- }
-
- /**
- * @see
wicket.request.target.coding.IRequestTargetUrlCodingStrategy#decode(wicket.request.RequestParameters)
- */
- public IRequestTarget decode(RequestParameters requestParameters)
- {
-
- final String parametersFragment =
requestParameters.getPath().substring(
- getMountPath().length());
- final PageParameters parameters = new
PageParameters(decodeParameters(parametersFragment,
- requestParameters.getParameters()));
- String pageMapName =
(String)parameters.remove(AbstractWebRequestCodingStrategy.PAGEMAP);
- if(requestParameters.getPageMapName() == null)
- {
- requestParameters.setPageMapName(pageMapName);
- }
- else
- {
- pageMapName = requestParameters.getPageMapName();
- }
-
- final BookmarkablePageRequestTarget target;
-
- final String bookmarkableInterfaceListener = (String)
parameters.remove(
-
AbstractWebRequestCodingStrategy.INTERFACE_PARAMETER_NAME);
-
- // Do the parameters contain component path and listener
interface?
- if (bookmarkableInterfaceListener != null) {
- // TODO check if the page already exists and reuse that?
-
-
- // try to parse component path and listener interface
- final String[] pathComponents =
Strings.split(bookmarkableInterfaceListener, Component.PATH_SEPARATOR);
- // There must be at least 4 path components
- if (pathComponents.length < 4)
- {
- throw new WicketRuntimeException("Internal
error parsing "
- +
AbstractWebRequestCodingStrategy.INTERFACE_PARAMETER_NAME + " = " +
bookmarkableInterfaceListener);
- }
- final String interfaceName =
pathComponents[pathComponents.length - 1];
- final String componentPath =
bookmarkableInterfaceListener.substring(1,
- bookmarkableInterfaceListener.length()
- interfaceName.length() - 2);
-
- target = new
BookmarkableListenerInterfaceRequestTarget(pageMapName, bookmarkablePageClass,
parameters,
- componentPath, interfaceName);
- }
- else
- {
- target = new BookmarkablePageRequestTarget(pageMapName,
- bookmarkablePageClass, parameters);
- }
-
- return target;
}
/**
