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 2007/04/29 09:46:56 UTC
svn commit: r533479 - in
/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: ./
ajax/ ajax/form/ behavior/ util/tester/
Author: knopp
Date: Sun Apr 29 00:46:55 2007
New Revision: 533479
URL: http://svn.apache.org/viewvc?view=rev&rev=533479
Log:
WICKET-423 - Page Expired in ajax clock example
Removed IUnversionedBehaviorListener, as it doesn't do anything good since we have version merging
Removed:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/IUnversionedBehaviorListener.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Initializer.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Initializer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Initializer.java?view=diff&rev=533479&r1=533478&r2=533479
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Initializer.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Initializer.java Sun Apr 29 00:46:55 2007
@@ -17,7 +17,6 @@
package org.apache.wicket;
import org.apache.wicket.behavior.IBehaviorListener;
-import org.apache.wicket.behavior.IUnversionedBehaviorListener;
import org.apache.wicket.markup.html.form.IFormSubmitListener;
import org.apache.wicket.markup.html.form.IOnChangeListener;
import org.apache.wicket.markup.html.link.ILinkListener;
@@ -38,7 +37,6 @@
// register when loaded) because deserialization of an object that
// implements an interface does not load the interfaces it implements!
IBehaviorListener.INTERFACE.register();
- IUnversionedBehaviorListener.INTERFACE.register();
IFormSubmitListener.INTERFACE.register();
ILinkListener.INTERFACE.register();
IOnChangeListener.INTERFACE.register();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java?view=diff&rev=533479&r1=533478&r2=533479
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java Sun Apr 29 00:46:55 2007
@@ -74,7 +74,7 @@
protected final String getJsTimeoutCall(final Duration updateInterval)
{
// this might look strange, but it is necessary for IE not to leak :(
- return "setTimeout(\"" + getCallbackScript(false, true) + "\", "
+ return "setTimeout(\"" + getCallbackScript(true) + "\", "
+ updateInterval.getMilliseconds() + ");";
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?view=diff&rev=533479&r1=533478&r2=533479
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java Sun Apr 29 00:46:55 2007
@@ -96,25 +96,21 @@
*/
protected CharSequence getCallbackScript()
{
- return getCallbackScript(true, false);
+ return getCallbackScript(false);
}
/**
* @return javascript that will generate an ajax GET request to this
* behavior *
- * @param recordPageVersion
- * if true the url will be encoded to execute on the current page
- * version, otherwise url will be encoded to execute on the
- * latest page version
* @param onlyTargetActivePage
* if true the callback to this behavior will be ignore if the
* page is not the last one the user accessed
*
*/
- protected CharSequence getCallbackScript(boolean recordPageVersion, boolean onlyTargetActivePage)
+ protected CharSequence getCallbackScript(boolean onlyTargetActivePage)
{
return getCallbackScript("wicketAjaxGet('"
- + getCallbackUrl(recordPageVersion, onlyTargetActivePage) + "'", null, null);
+ + getCallbackUrl(onlyTargetActivePage) + "'", null, null);
}
/**
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java?view=diff&rev=533479&r1=533478&r2=533479
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java Sun Apr 29 00:46:55 2007
@@ -85,7 +85,7 @@
protected final CharSequence getEventHandler()
{
return getCallbackScript(new AppendingStringBuffer("wicketAjaxPost('").append(
- getCallbackUrl(true, false)).append(
+ getCallbackUrl(false)).append(
"', wicketSerialize(document.getElementById('" + getComponent().getMarkupId()
+ "'))"), null, null);
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java?view=diff&rev=533479&r1=533478&r2=533479
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java Sun Apr 29 00:46:55 2007
@@ -83,24 +83,19 @@
*/
public CharSequence getCallbackUrl()
{
- return getCallbackUrl(false, true);
+ return getCallbackUrl(true);
}
/**
* Gets the url that references this handler.
*
- * @param recordPageVersion
- * if true the url will be encoded to execute on the current page
- * version, otherwise url will be encoded to execute on the
- * latest page version
* @param onlyTargetActivePage
* if true the callback to this behavior will be ignore if the
* page is not the last one the user accessed
*
* @return the url that references this handler
*/
- public final CharSequence getCallbackUrl(final boolean recordPageVersion,
- final boolean onlyTargetActivePage)
+ public final CharSequence getCallbackUrl(final boolean onlyTargetActivePage)
{
if (getComponent() == null)
{
@@ -109,14 +104,8 @@
}
final RequestListenerInterface rli;
- if (recordPageVersion)
- {
- rli = IBehaviorListener.INTERFACE;
- }
- else
- {
- rli = IUnversionedBehaviorListener.INTERFACE;
- }
+
+ rli = IBehaviorListener.INTERFACE;
AppendingStringBuffer url = new AppendingStringBuffer(getComponent().urlFor(this, rli));
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?view=diff&rev=533479&r1=533478&r2=533479
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Sun Apr 29 00:46:55 2007
@@ -200,7 +200,7 @@
setupRequestAndResponse();
WebRequestCycle cycle = createRequestCycle();
getServletRequest().setRequestToRedirectString(
- behavior.getCallbackUrl(false, false).toString());
+ behavior.getCallbackUrl(false).toString());
processRequestCycle(cycle);
}