Author: ivaynberg
Date: Thu Nov 12 04:31:56 2009
New Revision: 835229
URL: http://svn.apache.org/viewvc?rev=835229&view=rev
Log:
WICKET-2574 todos
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=835229&r1=835228&r2=835229&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
Thu Nov 12 04:31:56 2009
@@ -207,10 +207,10 @@
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
- final String saveCall = "{wicketAjaxGet('" +
getCallbackUrl() +
+ final String saveCall = "{wicketAjaxGet('" +
getCallbackUrl(true) +
"&save=true&'+this.name+'='+wicketEncode(this.value)); return true;}";
- final String cancelCall = "{wicketAjaxGet('" +
getCallbackUrl() +
+ final String cancelCall = "{wicketAjaxGet('" +
getCallbackUrl(true) +
"&save=false'); return false;}";
tag.put("onchange", saveCall);
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=835229&r1=835228&r2=835229&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
Thu Nov 12 04:31:56 2009
@@ -96,12 +96,12 @@
{
super.onComponentTag(tag);
final String saveCall = "{" +
- generateCallbackScript("wicketAjaxGet('" +
getCallbackUrl() +
+ generateCallbackScript("wicketAjaxGet('" +
getCallbackUrl(true) +
"&save=true&'+this.name+'='+wicketEncode(this.value)") + "; return false;}";
final String cancelCall = "{" +
- generateCallbackScript("wicketAjaxGet('" +
getCallbackUrl() + "&save=false'") +
+ generateCallbackScript("wicketAjaxGet('" +
getCallbackUrl(true) + "&save=false'") +
"; return false;}";
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=835229&r1=835228&r2=835229&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
Thu Nov 12 04:31:56 2009
@@ -167,10 +167,10 @@
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
- final String saveCall = "{wicketAjaxPost('" +
getCallbackUrl() + "&save=true', " +
- "wicketSerialize(this)); return true;}";
+ final String saveCall = "{wicketAjaxPost('" +
getCallbackUrl(true) +
+ "&save=true', " +
"wicketSerialize(this)); return true;}";
- final String cancelCall = "{wicketAjaxGet('" +
getCallbackUrl() +
+ final String cancelCall = "{wicketAjaxGet('" +
getCallbackUrl(true) +
"&save=false');this.onblur='';return
false;}";
final String keypress = "var
kc=wicketKeyCode(event); if (kc==27) " + cancelCall +
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java?rev=835229&r1=835228&r2=835229&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
Thu Nov 12 04:31:56 2009
@@ -72,7 +72,7 @@
}
String initJS = String.format("new
Wicket.AutoComplete('%s','%s',%s,%s);", id,
- getCallbackUrl(), constructSettingsJS(), indicatorId);
+ getCallbackUrl(true), constructSettingsJS(),
indicatorId);
response.renderOnDomReadyJavascript(initJS);
}
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=835229&r1=835228&r2=835229&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 Thu Nov
12 04:31:56 2009
@@ -2482,16 +2482,17 @@
* <code>this.getParent().replace(replacement)</code>
*
* and provides a better context for errors.
+ * <p>
+ * Usage: <code>component = component.replaceWith(replacement);</code>
+ * </p>
*
* @since 1.2.1
*
* @param replacement
* component to replace this one
- *
- * TODO 1.5 - this method should return
<code>replacement</code> to facilitate easy
- * chaning such as
<code>component=component.replaceWith(newcomponent);</code>
+ * @return the component which replaced this one
*/
- public void replaceWith(Component replacement)
+ public Component replaceWith(Component replacement)
{
if (replacement == null)
{
@@ -2509,6 +2510,7 @@
"This method can only be called on a component
that has already been added to its parent.");
}
parent.replace(replacement);
+ return replacement;
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java?rev=835229&r1=835228&r2=835229&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
Thu Nov 12 04:31:56 2009
@@ -149,7 +149,7 @@
protected final CharSequence getEventHandler()
{
return generateCallbackScript(new
AppendingStringBuffer("wicketAjaxPost('").append(
- getCallbackUrl()).append(
+ getCallbackUrl(true)).append(
"', wicketSerializeForm(document.getElementById('" +
getComponent().getMarkupId() +
"',false))"));
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java?rev=835229&r1=835228&r2=835229&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
Thu Nov 12 04:31:56 2009
@@ -114,7 +114,7 @@
protected CharSequence getEventHandler()
{
final String formId = getForm().getMarkupId();
- final CharSequence url = getCallbackUrl();
+ final CharSequence url = getCallbackUrl(true);
AppendingStringBuffer call = new
AppendingStringBuffer("wicketSubmitFormById('").append(
formId).append("', '").append(url).append("', ");
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java?rev=835229&r1=835228&r2=835229&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
Thu Nov 12 04:31:56 2009
@@ -82,12 +82,9 @@
* Gets the url that references this handler.
*
* @return the url that references this handler
+ * @see #getCallbackUrl(boolean)
*/
- /*
- * TODO 1.4 remove this and only keep the (boolean) variant. its a huge
mess to have both
- * because both need to be overridable and you never know which one an
intermediary subclass
- * overrides to add its behavior, or all subclasses must be made to
override both :|
- */
+ @Deprecated // TODO 1.6 Remove
public CharSequence getCallbackUrl()
{
return getCallbackUrl(true);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java?rev=835229&r1=835228&r2=835229&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseExceptionsTest.java
Thu Nov 12 04:31:56 2009
@@ -81,7 +81,7 @@
tester.getWicketSession().invalidateNow();
// Invoke the call back URL of the ajax event behavior
- String callbackUrl =
((AjaxEventBehavior)link.getBehaviors().get(0)).getCallbackUrl()
+ String callbackUrl =
((AjaxEventBehavior)link.getBehaviors().get(0)).getCallbackUrl(true)
.toString();
tester.getServletRequest().setURL(callbackUrl);
