You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/05/24 09:13:33 UTC
git commit: WICKET-5201 Remove deprecated methods/fields
Updated Branches:
refs/heads/master d6cfdca86 -> 4e6837de5
WICKET-5201 Remove deprecated methods/fields
Remove backward compatibility methods for success/failure handlers, ajax channel and precondition
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4e6837de
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4e6837de
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4e6837de
Branch: refs/heads/master
Commit: 4e6837de52c9199f857a007f0e82ef5a78f231c7
Parents: d6cfdca
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri May 24 10:12:31 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri May 24 10:12:31 2013 +0300
----------------------------------------------------------------------
.../wicket/ajax/AbstractDefaultAjaxBehavior.java | 63 ---------------
.../wicket/ajax/form/AjaxFormSubmitBehavior.java | 10 ---
.../wicket/ajax/markup/html/AjaxFallbackLink.java | 18 ----
.../wicket/ajax/markup/html/form/AjaxButton.java | 18 ----
.../ajax/markup/html/form/AjaxFallbackButton.java | 19 -----
.../data/sort/AjaxFallbackOrderByLink.java | 16 ----
6 files changed, 0 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4e6837de/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
index a6a6edd..18f91ae 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
@@ -22,7 +22,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.attributes.AjaxAttributeName;
-import org.apache.wicket.ajax.attributes.AjaxCallListener;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
import org.apache.wicket.ajax.attributes.CallbackParameter;
@@ -145,7 +144,6 @@ public abstract class AbstractDefaultAjaxBehavior extends AbstractAjaxBehavior
((AjaxRequestTarget.AbstractListener)listener).updateAjaxAttributes(attributes);
}
}
- updateAjaxAttributesBackwardCompatibility(attributes);
updateAjaxAttributes(attributes);
return attributes;
}
@@ -161,26 +159,6 @@ public abstract class AbstractDefaultAjaxBehavior extends AbstractAjaxBehavior
}
/**
- * The code below handles backward compatibility.
- *
- * @param attributes
- */
- private void updateAjaxAttributesBackwardCompatibility(final AjaxRequestAttributes attributes)
- {
- AjaxCallListener backwardCompatibleAjaxCallListener = new AjaxCallListener();
- backwardCompatibleAjaxCallListener.onSuccess(getSuccessScript());
- backwardCompatibleAjaxCallListener.onFailure(getFailureScript());
- backwardCompatibleAjaxCallListener.onPrecondition(getPreconditionScript());
- attributes.getAjaxCallListeners().add(backwardCompatibleAjaxCallListener);
-
- AjaxChannel channel = getChannel();
- if (channel != null)
- {
- attributes.setChannel(channel);
- }
- }
-
- /**
* <pre>
* {
* u: 'editable-label?6-1.IBehaviorListener.0-text1-label', // url
@@ -543,47 +521,6 @@ public abstract class AbstractDefaultAjaxBehavior extends AbstractAjaxBehavior
}
/**
- * @return an optional javascript expression that determines whether the request will actually
- * execute (in form of return XXX;);
- * @deprecated Use {@link org.apache.wicket.ajax.attributes.AjaxRequestAttributes}
- */
- @Deprecated
- protected CharSequence getPreconditionScript()
- {
- return null;
- }
-
- /**
- * @return javascript that will run when the ajax call finishes with an error status
- */
- @Deprecated
- protected CharSequence getFailureScript()
- {
- return null;
- }
-
- /**
- * @return javascript that will run when the ajax call finishes successfully
- */
- @Deprecated
- protected CharSequence getSuccessScript()
- {
- return null;
- }
-
- /**
- * Provides an AjaxChannel for this Behavior.
- *
- * @return an AjaxChannel - Defaults to null.
- * @deprecated Use {@link org.apache.wicket.ajax.attributes.AjaxRequestAttributes}
- */
- @Deprecated
- protected AjaxChannel getChannel()
- {
- return null;
- }
-
- /**
* Finds the markup id of the indicator. The default search order is: component, behavior,
* component's parent hierarchy.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/4e6837de/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
index 8df9885..bebe85d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
@@ -214,16 +214,6 @@ public abstract class AjaxFormSubmitBehavior extends AjaxEventBehavior
}
/**
- * @see org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#getPreconditionScript()
- */
- @Override
- @Deprecated
- protected CharSequence getPreconditionScript()
- {
- return null;
- }
-
- /**
* @see Button#getDefaultFormProcessing()
*
* @return {@code true} for default processing
http://git-wip-us.apache.org/repos/asf/wicket/blob/4e6837de/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
index 638fa76..958bb78 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.ajax.markup.html;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
-import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -107,12 +105,6 @@ public abstract class AjaxFallbackLink<T> extends Link<T> implements IAjaxLink
}
@Override
- protected AjaxChannel getChannel()
- {
- return AjaxFallbackLink.this.getChannel();
- }
-
- @Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
{
super.updateAjaxAttributes(attributes);
@@ -130,16 +122,6 @@ public abstract class AjaxFallbackLink<T> extends Link<T> implements IAjaxLink
}
/**
- * @return the channel that manages how Ajax calls are executed
- * @see AbstractDefaultAjaxBehavior#getChannel()
- */
- @Deprecated
- protected AjaxChannel getChannel()
- {
- return null;
- }
-
- /**
*
* @see org.apache.wicket.markup.html.link.Link#onClick()
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/4e6837de/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
index 204aced..5b0c451 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.ajax.markup.html.form;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
-import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
@@ -121,12 +119,6 @@ public abstract class AjaxButton extends Button
}
@Override
- protected AjaxChannel getChannel()
- {
- return AjaxButton.this.getChannel();
- }
-
- @Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
{
super.updateAjaxAttributes(attributes);
@@ -165,16 +157,6 @@ public abstract class AjaxButton extends Button
}
/**
- * @return the channel that manages how Ajax calls are executed
- * @see AbstractDefaultAjaxBehavior#getChannel()
- */
- @Deprecated
- protected AjaxChannel getChannel()
- {
- return null;
- }
-
- /**
* Listener method invoked on form submit with no errors, before {@link Form#onSubmit()}.
*
* @param target
http://git-wip-us.apache.org/repos/asf/wicket/blob/4e6837de/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
index 63b7e52..1279162 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.ajax.markup.html.form;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
-import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
@@ -89,12 +87,6 @@ public abstract class AjaxFallbackButton extends Button
}
@Override
- protected AjaxChannel getChannel()
- {
- return AjaxFallbackButton.this.getChannel();
- }
-
- @Override
public boolean getDefaultProcessing()
{
return AjaxFallbackButton.this.getDefaultFormProcessing();
@@ -186,17 +178,6 @@ public abstract class AjaxFallbackButton extends Button
}
/**
- * @return the channel that manages how Ajax calls are executed
- * @see AbstractDefaultAjaxBehavior#getChannel()
- * @deprecated Use #updateAjaxAttributes() instead
- */
- @Deprecated
- protected AjaxChannel getChannel()
- {
- return null;
- }
-
- /**
* Helper methods that both checks whether the link is enabled and whether the action ENABLE is
* allowed.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/4e6837de/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
index 77870ba..6d58ceb 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.extensions.ajax.markup.html.repeater.data.sort;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
-import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -143,25 +141,11 @@ public abstract class AjaxFallbackOrderByLink<S> extends OrderByLink<S> implemen
}
}
- @Override
- protected AjaxChannel getChannel()
- {
- return AjaxFallbackOrderByLink.this.getChannel();
- }
};
}
/**
- * @return the channel that manages how Ajax calls are executed
- * @see AbstractDefaultAjaxBehavior#getChannel()
- */
- protected AjaxChannel getChannel()
- {
- return null;
- }
-
- /**
* Callback method when an ajax click occurs. All the behavior of changing the sort, etc is
* already performed before this is called so this method should primarily be used to configure
* the target.