Author: almaw
Date: Tue Jun 12 09:51:26 2007
New Revision: 546568
URL: http://svn.apache.org/viewvc?view=rev&rev=546568
Log:
Back out r544754 for WICKET-605 as it breaks things. See bug for discussion.
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/PageParameters.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/PageParameters.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/PageParameters.java?view=diff&rev=546568&r1=546567&r2=546568
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/PageParameters.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/PageParameters.java
Tue Jun 12 09:51:26 2007
@@ -50,13 +50,6 @@
*/
public PageParameters()
{
- super();
-
- RequestCycle cycle = RequestCycle.get();
- if (cycle != null)
- {
- cycle.setPageParameters(this);
- }
}
/**
@@ -69,12 +62,6 @@
public PageParameters(final Map parameterMap)
{
super(parameterMap);
-
- RequestCycle cycle = RequestCycle.get();
- if (cycle != null)
- {
- cycle.setPageParameters(this);
- }
}
/**
@@ -108,12 +95,6 @@
public PageParameters(final String keyValuePairs, final String
delimiter)
{
super();
-
- RequestCycle cycle = RequestCycle.get();
- if (cycle != null)
- {
- cycle.setPageParameters(this);
- }
// We can not use ValueMaps constructor as it uses
// VariableAssignmentParser which is more suitable for markup
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java?view=diff&rev=546568&r1=546567&r2=546568
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
Tue Jun 12 09:51:26 2007
@@ -243,12 +243,6 @@
/** holds the stack of set [EMAIL PROTECTED] IRequestTarget}, the last
set op top. */
private transient final ArrayListStack requestTargets = new
ArrayListStack(3);
- /**
- * Any page parameters. Only set when the request is resolving and the
- * parameters are passed into a page.
- */
- private PageParameters pageParameters;
-
/** The session object. */
private Session session;
@@ -328,18 +322,6 @@
}
/**
- * Any set page parameters. Typically only available when a request to a
- * bookmarkable page with a [EMAIL PROTECTED]
Page#Page(PageParameters)} constructor
- * was made.
- *
- * @return the page parameters or null
- */
- public final PageParameters getPageParameters()
- {
- return this.pageParameters;
- }
-
- /**
* Gets the processor for delegated request cycle handling.
*
* @return the processor for delegated request cycle handling
@@ -751,9 +733,7 @@
* Returns a URL that references a given interface on a component. When
the
* URL is requested from the server at a later time, the interface will
be
* called. A URL returned by this method will not be stable across
sessions
- * and cannot be bookmarked by a user unless the component resides on a
- * stateless bookmarkable page, in which case the URL *will* be
- * bookmarkable.
+ * and cannot be bookmarked by a user.
*
* @param component
* The component to reference
@@ -770,11 +750,8 @@
if (listener != IRedirectListener.INTERFACE &&
component.isStateless()
&& page.isBookmarkable())
{
- PageParameters parameters = (this.pageParameters !=
null)
- ? this.pageParameters
- : new PageParameters();
- target = new
BookmarkableListenerInterfaceRequestTarget(page.getPageMapName(), page
- .getClass(), parameters, component,
listener);
+ target = new
BookmarkableListenerInterfaceRequestTarget(page.getPageMapName(),
+ page.getClass(), new PageParameters(),
component, listener);
}
else
{
@@ -966,7 +943,7 @@
+ ".", re);
}
}
-
+
if (getResponse() instanceof BufferedWebResponse)
{
try
@@ -987,7 +964,7 @@
{
log.error("Exception occurred during onEndRequest", e);
}
-
+
try
{
getApplication().getSessionStore().onEndRequest(getRequest());
@@ -996,7 +973,7 @@
{
log.error("Exception occurred during onEndRequest of
the SessionStore", e);
}
-
+
// Release thread local resources
try
{
@@ -1227,21 +1204,6 @@
// Clear ThreadLocal reference; makes sense as this object
should not be
// reused
current.set(null);
- }
-
- /**
- * Possibly set the page parameters. Only set when the request is
resolving
- * and the parameters are passed into a page.
- *
- * @param parameters
- * the parameters to set
- */
- final void setPageParameters(PageParameters parameters)
- {
- if (currentStep == RESOLVE_TARGET)
- {
- this.pageParameters = parameters;
- }
}
/**
