You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/11/30 01:55:11 UTC
svn commit: r1040370 [1/2] - in /wicket/trunk:
wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/
wicket-extensions/src/main/java/org/apache/wicket/ext...
Author: ivaynberg
Date: Tue Nov 30 00:55:09 2010
New Revision: 1040370
URL: http://svn.apache.org/viewvc?rev=1040370&view=rev
Log:
behavior refactor
Issue: WICKET-3206
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/Behavior.java (contents, props changed)
- copied, changed from r1040357, wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTester.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/AttributeModifier.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ClientSideImageMap.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInvocationNotAllowedException.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/MockComponent.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/VersioningTestPage.java
Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java Tue Nov 30 00:55:09 2010
@@ -34,7 +34,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.datetime.markup.html.form.DateTextField;
import org.apache.wicket.extensions.yui.YuiLib;
import org.apache.wicket.markup.html.IHeaderResponse;
@@ -71,7 +71,7 @@ import org.joda.time.DateTime;
*
* @author eelcohillenius
*/
-public class DatePicker extends AbstractBehavior
+public class DatePicker extends Behavior
{
private static Method GETINSTANCEMETHOD = null;
@@ -154,12 +154,12 @@ public class DatePicker extends Abstract
}
/**
- * @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
+ * @see org.apache.wicket.behavior.AbstractBehavior#afterRender(org.apache.wicket.Component)
*/
@Override
- public void onRendered(Component component)
+ public void afterRender(Component component)
{
- super.onRendered(component);
+ super.afterRender(component);
// Append the span and img icon right after the rendering of the
// component. Not as pretty as working with a panel etc, but works
// for behaviors and is more efficient
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java Tue Nov 30 00:55:09 2010
@@ -20,7 +20,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxIndicatorAware;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Response;
@@ -41,7 +41,7 @@ import org.apache.wicket.request.handler
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class AjaxIndicatorAppender extends AbstractBehavior
+public class AjaxIndicatorAppender extends Behavior
{
/**
* Component instance this behavior is bound to
@@ -72,12 +72,11 @@ public class AjaxIndicatorAppender exten
}
}
- /**
- * @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
- */
+
@Override
- public void onRendered(Component component)
+ public void afterRender(Component component)
{
+ super.afterRender(component);
final Response r = component.getResponse();
r.write("<span style=\"display:none;\" class=\"");
@@ -89,6 +88,7 @@ public class AjaxIndicatorAppender exten
r.write("<img src=\"");
r.write(getIndicatorUrl());
r.write("\" alt=\"\"/></span>");
+
}
/**
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTester.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTester.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanelTester.java Tue Nov 30 00:55:09 2010
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxSelfUpdatingTimerBehavior;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.util.tester.WicketTester;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
@@ -62,7 +62,7 @@ public class AjaxLazyLoadPanelTester
{
logger.warn("AjaxLazyLoadPanel child found, but no attached AbstractAjaxBehaviors found. A curious situation...");
}
- for (IBehavior b : behaviors)
+ for (Behavior b : behaviors)
{
if (!(b instanceof AjaxSelfUpdatingTimerBehavior))
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java Tue Nov 30 00:55:09 2010
@@ -17,8 +17,7 @@
package org.apache.wicket.extensions.markup.html.repeater.data.table;
import org.apache.wicket.Component;
-import org.apache.wicket.behavior.AbstractBehavior;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.behavior.SimpleAttributeModifier;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.DataGridView;
import org.apache.wicket.markup.ComponentTag;
@@ -74,17 +73,14 @@ import org.apache.wicket.util.string.Str
*/
public class DataTable<T> extends Panel implements IPageable
{
- static abstract class CssAttributeBehavior extends AbstractBehavior
+ static abstract class CssAttributeBehavior extends Behavior
{
- /**
- *
- */
private static final long serialVersionUID = 1L;
protected abstract String getCssClass();
/**
- * @see IBehavior#onComponentTag(Component, ComponentTag)
+ * @see Behavior#onComponentTag(Component, ComponentTag)
*/
@Override
public void onComponentTag(Component component, ComponentTag tag)
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java Tue Nov 30 00:55:09 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.extensions.markup.html.repeater.data.table.filter;
import org.apache.wicket.Component;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -57,7 +57,7 @@ public class FilterForm<T> extends Form<
// add hidden field used for managing current focus
hidden = new HiddenField<String>("focus-tracker", new Model<String>());
- hidden.add(new AbstractBehavior()
+ hidden.add(new Behavior()
{
private static final long serialVersionUID = 1L;
@@ -111,7 +111,7 @@ public class FilterForm<T> extends Form<
*/
public final void enableFocusTracking(FormComponent<?> fc)
{
- fc.add(new AbstractBehavior()
+ fc.add(new Behavior()
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java Tue Nov 30 00:55:09 2010
@@ -21,7 +21,7 @@ import javax.swing.tree.TreeNode;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -109,7 +109,7 @@ public class Tree extends DefaultAbstrac
// do distinguish between selected and unselected rows we add an
// behavior
// that modifies row css class.
- item.add(new AbstractBehavior()
+ item.add(new Behavior()
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java Tue Nov 30 00:55:09 2010
@@ -22,7 +22,7 @@ import javax.swing.tree.TreeNode;
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.extensions.markup.html.tree.DefaultAbstractTree;
import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Alignment;
import org.apache.wicket.markup.ComponentTag;
@@ -365,7 +365,7 @@ public class TreeTable extends DefaultAb
// do distinguish between selected and unselected rows we add an
// behavior
// that modifies row css class.
- item.add(new AbstractBehavior()
+ item.add(new Behavior()
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/RequestHandlerStack.java Tue Nov 30 00:55:09 2010
@@ -144,34 +144,6 @@ public abstract class RequestHandlerStac
{
return scheduledAfterCurrent;
}
-
- /**
- * Replaces the currently executed {@link IRequestHandler} with new {@link IRequestHandler}. The
- * currently executed {@link IRequestHandler} is terminated and the new {@link IRequestHandler}
- * is executed.
- *
- * @param handler
- */
- // FIXME
- // Is this method really useful for anything? To execute request handler
- // after current
- // #scheduleRequestHandlerAfterCurrent is better alternative because it
- // doesn't terminate
- // current request handler.
- // To restart request processing #replaceAllRequestHandlers is better
- // alternative because it
- // unrolls entire stack and cancels all request handlers in stack
- public void replaceCurrentRequestHandler(IRequestHandler handler)
- {
- if (requestHandlers.isEmpty())
- {
- executeRequestHandler(handler);
- }
- else
- {
- throw new ReplaceHandlerException(handler, false);
- }
- }
/**
* Removes the whole {@link IRequestHandler} stack, terminates currently running
Modified: wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java (original)
+++ wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java Tue Nov 30 00:55:09 2010
@@ -23,7 +23,7 @@ import org.apache.velocity.VelocityConte
import org.apache.velocity.app.Velocity;
import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.model.IDetachable;
import org.apache.wicket.model.IModel;
@@ -35,7 +35,7 @@ import org.apache.wicket.util.string.Str
* velocity.properties. If you do not have a velocity.properties for your app, it will default to a
* directory "templates" in the root of your app.
*/
-public class VelocityContributor extends AbstractBehavior
+public class VelocityContributor extends Behavior
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/AttributeModifier.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/AttributeModifier.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/AttributeModifier.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/AttributeModifier.java Tue Nov 30 00:55:09 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.model.IComponentAssignedModel;
@@ -61,7 +61,7 @@ import org.apache.wicket.util.value.IVal
* @author Martijn Dashorst
* @author Ralf Ebert
*/
-public class AttributeModifier extends AbstractBehavior implements IClusterable
+public class AttributeModifier extends Behavior implements IClusterable
{
/** Marker value to have an attribute without a value added. */
public static final String VALUELESS_ATTRIBUTE_ADD = "VA_ADD";
@@ -219,7 +219,7 @@ public class AttributeModifier extends A
}
/**
- * @see org.apache.wicket.behavior.IBehavior#onComponentTag(org.apache.wicket.Component,
+ * @see org.apache.wicket.behavior.Behavior#onComponentTag(org.apache.wicket.Component,
* org.apache.wicket.markup.ComponentTag)
*/
@Override
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Behaviors.java Tue Nov 30 00:55:09 2010
@@ -21,7 +21,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.behavior.InvalidBehaviorIdException;
import org.apache.wicket.model.IDetachable;
import org.apache.wicket.util.lang.Args;
@@ -40,14 +40,14 @@ final class Behaviors implements IDetach
this.component = component;
}
- public void add(IBehavior... behaviors)
+ public void add(Behavior... behaviors)
{
if (behaviors == null)
{
throw new IllegalArgumentException("Argument may not be null");
}
- for (IBehavior behavior : behaviors)
+ for (Behavior behavior : behaviors)
{
if (behavior == null)
{
@@ -66,13 +66,13 @@ final class Behaviors implements IDetach
}
}
- private void internalAdd(final IBehavior behavior)
+ private void internalAdd(final Behavior behavior)
{
component.data_add(behavior);
}
@SuppressWarnings("unchecked")
- public <M extends IBehavior> List<M> getBehaviors(Class<M> type)
+ public <M extends Behavior> List<M> getBehaviors(Class<M> type)
{
final int len = component.data_length();
final int start = component.data_start();
@@ -85,7 +85,7 @@ final class Behaviors implements IDetach
for (int i = component.data_start(); i < len; i++)
{
Object obj = component.data_get(i);
- if (obj != null && obj instanceof IBehavior)
+ if (obj != null && obj instanceof Behavior)
{
if (type == null || type.isAssignableFrom(obj.getClass()))
{
@@ -97,7 +97,7 @@ final class Behaviors implements IDetach
}
- public void remove(IBehavior behavior)
+ public void remove(Behavior behavior)
{
if (behavior == null)
{
@@ -134,9 +134,9 @@ final class Behaviors implements IDetach
for (int i = component.data_start(); i < len; i++)
{
Object obj = component.data_get(i);
- if (obj != null && obj instanceof IBehavior)
+ if (obj != null && obj instanceof Behavior)
{
- final IBehavior behavior = (IBehavior)obj;
+ final Behavior behavior = (Behavior)obj;
behavior.detach(component);
@@ -148,7 +148,7 @@ final class Behaviors implements IDetach
}
}
- private boolean internalRemove(final IBehavior behavior)
+ private boolean internalRemove(final Behavior behavior)
{
final int len = component.data_length();
for (int i = component.data_start(); i < len; i++)
@@ -160,7 +160,7 @@ final class Behaviors implements IDetach
behavior.unbind(component);
// remove behavior from behavior-ids
- ArrayList<IBehavior> ids = getBehaviorsIdList(false);
+ ArrayList<Behavior> ids = getBehaviorsIdList(false);
if (ids != null)
{
int idx = ids.indexOf(behavior);
@@ -219,7 +219,7 @@ final class Behaviors implements IDetach
return null;
}
- private static class BehaviorIdList extends ArrayList<IBehavior>
+ private static class BehaviorIdList extends ArrayList<Behavior>
{
public BehaviorIdList()
{
@@ -228,7 +228,7 @@ final class Behaviors implements IDetach
}
/** {@inheritDoc} */
- public final int getBehaviorId(IBehavior behavior)
+ public final int getBehaviorId(Behavior behavior)
{
Args.notNull(behavior, "behavior");
@@ -248,7 +248,7 @@ final class Behaviors implements IDetach
behavior + ", Component: " + this);
}
- ArrayList<IBehavior> ids = getBehaviorsIdList(true);
+ ArrayList<Behavior> ids = getBehaviorsIdList(true);
int id = ids.indexOf(behavior);
@@ -277,11 +277,11 @@ final class Behaviors implements IDetach
return id;
}
- public final IBehavior getBehaviorById(int id)
+ public final Behavior getBehaviorById(int id)
{
- IBehavior behavior = null;
+ Behavior behavior = null;
- ArrayList<IBehavior> ids = getBehaviorsIdList(false);
+ ArrayList<Behavior> ids = getBehaviorsIdList(false);
if (ids != null)
{
if (id >= 0 && id < ids.size())
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=1040370&r1=1040369&r2=1040370&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 Tue Nov 30 00:55:09 2010
@@ -27,7 +27,7 @@ import org.apache.wicket.authorization.A
import org.apache.wicket.authorization.AuthorizationException;
import org.apache.wicket.authorization.IAuthorizationStrategy;
import org.apache.wicket.authorization.UnauthorizedActionException;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.event.IEventSink;
@@ -470,7 +470,7 @@ public abstract class Component
* <ul>
* <li>Model (indicated by {@link #FLAG_MODEL_SET})
* <li>MetaDataEntry (optionally {@link MetaDataEntry}[] if more metadata entries are present) *
- * <li>{@link IBehavior}(s) added to component. The behaviors are not stored in separate array,
+ * <li>{@link Behavior}(s) added to component. The behaviors are not stored in separate array,
* they are part of the {@link #data} array (this is in order to save the space of the pointer
* to an empty array as most components have no behaviours). - FIXME - explain why - is this
* correct?
@@ -2075,7 +2075,7 @@ public abstract class Component
return false;
}
- for (IBehavior behavior : getBehaviors())
+ for (Behavior behavior : getBehaviors())
{
if (!behavior.getStatelessHint(this))
{
@@ -2404,7 +2404,7 @@ public abstract class Component
{
// Call each behaviors onException() to allow the
// behavior to clean up
- for (IBehavior behavior : getBehaviors())
+ for (Behavior behavior : getBehaviors())
{
if (isBehaviorAccepted(behavior))
{
@@ -2606,7 +2606,7 @@ public abstract class Component
}
// Than ask all behaviors
- for (IBehavior behavior : getBehaviors())
+ for (Behavior behavior : getBehaviors())
{
if (isBehaviorAccepted(behavior))
{
@@ -3214,7 +3214,7 @@ public abstract class Component
* The listener interface that the URL should call
* @return The URL
*/
- public final CharSequence urlFor(final IBehavior behaviour,
+ public final CharSequence urlFor(final Behavior behaviour,
final RequestListenerInterface listener)
{
PageAndComponentProvider provider = new PageAndComponentProvider(getPage(), this);
@@ -3336,12 +3336,12 @@ public abstract class Component
}
/**
- * {@link IBehavior#beforeRender(Component)} Notify all behaviors that are assigned to this
+ * {@link Behavior#beforeRender(Component)} Notify all behaviors that are assigned to this
* component that the component is about to be rendered.
*/
private void notifyBehaviorsComponentBeforeRender()
{
- for (IBehavior behavior : getBehaviors())
+ for (Behavior behavior : getBehaviors())
{
if (isBehaviorAccepted(behavior))
{
@@ -3351,13 +3351,13 @@ public abstract class Component
}
/**
- * {@link IBehavior#afterRender(Component)} Notify all behaviors that are assigned to this
+ * {@link Behavior#afterRender(Component)} Notify all behaviors that are assigned to this
* component that the component has rendered.
*/
private void notifyBehaviorsComponentRendered()
{
// notify the behaviors that component has been rendered
- for (IBehavior behavior : getBehaviors())
+ for (Behavior behavior : getBehaviors())
{
if (isBehaviorAccepted(behavior))
{
@@ -3505,7 +3505,7 @@ public abstract class Component
}
/**
- * Gets the subset of the currently coupled {@link IBehavior}s that are of the provided type as
+ * Gets the subset of the currently coupled {@link Behavior}s that are of the provided type as
* a unmodifiable list. Returns an empty list rather than null if there are no behaviors coupled
* to this component.
*
@@ -3517,7 +3517,7 @@ public abstract class Component
* A class derived from IBehavior
*/
@SuppressWarnings("unchecked")
- public <M extends IBehavior> List<M> getBehaviors(Class<M> type)
+ public <M extends Behavior> List<M> getBehaviors(Class<M> type)
{
return new Behaviors(this).getBehaviors(type);
}
@@ -3647,7 +3647,7 @@ public abstract class Component
* @param behavior
* @return False, if the component should not apply this behavior
*/
- protected boolean isBehaviorAccepted(final IBehavior behavior)
+ protected boolean isBehaviorAccepted(final Behavior behavior)
{
// Ignore AttributeModifiers when FLAG_IGNORE_ATTRIBUTE_MODIFIER is set
if ((behavior instanceof AttributeModifier) &&
@@ -3821,13 +3821,13 @@ public abstract class Component
if (needToRenderTag(tag))
{
// Apply behavior modifiers
- List<? extends IBehavior> behaviors = getBehaviors();
+ List<? extends Behavior> behaviors = getBehaviors();
if ((behaviors != null) && !behaviors.isEmpty() && !tag.isClose() &&
(isIgnoreAttributeModifier() == false))
{
tag = tag.mutable();
- for (IBehavior behavior : behaviors)
+ for (Behavior behavior : behaviors)
{
// Components may reject some behavior components
if (isBehaviorAccepted(behavior))
@@ -3840,10 +3840,10 @@ public abstract class Component
// apply behaviors that are attached to the component tag.
if (tag.hasBehaviors())
{
- Iterator<? extends IBehavior> tagBehaviors = tag.getBehaviors();
+ Iterator<? extends Behavior> tagBehaviors = tag.getBehaviors();
while (tagBehaviors.hasNext())
{
- final IBehavior behavior = tagBehaviors.next();
+ final Behavior behavior = tagBehaviors.next();
if (behavior.isEnabled(this))
{
behavior.onComponentTag(this, tag);
@@ -4323,20 +4323,20 @@ public abstract class Component
*
* @return this (to allow method call chaining)
*/
- public Component remove(final IBehavior behavior)
+ public Component remove(final Behavior behavior)
{
new Behaviors(this).remove(behavior);
return this;
}
/** {@inheritDoc} */
- public final IBehavior getBehaviorById(int id)
+ public final Behavior getBehaviorById(int id)
{
return new Behaviors(this).getBehaviorById(id);
}
/** {@inheritDoc} */
- public final int getBehaviorId(IBehavior behavior)
+ public final int getBehaviorId(Behavior behavior)
{
return new Behaviors(this).getBehaviorId(behavior);
}
@@ -4354,21 +4354,21 @@ public abstract class Component
* The behavior modifier(s) to be added
* @return this (to allow method call chaining)
*/
- public Component add(final IBehavior... behaviors)
+ public Component add(final Behavior... behaviors)
{
new Behaviors(this).add(behaviors);
return this;
}
/**
- * Gets the currently coupled {@link IBehavior}s as a unmodifiable list. Returns an empty list
+ * Gets the currently coupled {@link Behavior}s as a unmodifiable list. Returns an empty list
* rather than null if there are no behaviors coupled to this component.
*
* @return The currently coupled behaviors as a unmodifiable list
*/
- public final List<? extends IBehavior> getBehaviors()
+ public final List<? extends Behavior> getBehaviors()
{
- return getBehaviors(IBehavior.class);
+ return getBehaviors(Behavior.class);
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java Tue Nov 30 00:55:09 2010
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.wicket.authorization.AuthorizationException;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.request.RequestHandlerStack.ReplaceHandlerException;
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.handler.ListenerInvocationNotAllowedException;
@@ -250,7 +250,7 @@ public class RequestListenerInterface
* @throws ListenerInvocationNotAllowedException
* when listener invocation attempted on a component that does not allow it
*/
- public final void invoke(final IRequestableComponent rcomponent, final IBehavior behavior)
+ public final void invoke(final IRequestableComponent rcomponent, final Behavior behavior)
{
// we are in Wicket core land
final Component component = (Component)rcomponent;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java Tue Nov 30 00:55:09 2010
@@ -128,7 +128,7 @@ public class RestartResponseAtInterceptP
{
data.continueOk = true;
String url = RequestCycle.get().getUrlRenderer().renderUrl(data.originalUrl);
- RequestCycle.get().replaceCurrentRequestHandler(new RedirectRequestHandler(url));
+ RequestCycle.get().replaceAllRequestHandlers(new RedirectRequestHandler(url));
return true;
}
return false;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java Tue Nov 30 00:55:09 2010
@@ -32,7 +32,7 @@ import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.internal.HeaderResponse;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
@@ -715,7 +715,7 @@ public class AjaxRequestTarget implement
private String getAjaxRegionMarkupId(Component component)
{
String markupId = null;
- for (IBehavior behavior : component.getBehaviors())
+ for (Behavior behavior : component.getBehaviors())
{
if (behavior instanceof IAjaxRegionMarkupIdProvider)
{
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=1040370&r1=1040369&r2=1040370&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 Tue Nov 30 00:55:09 2010
@@ -19,7 +19,6 @@ package org.apache.wicket.behavior;
import org.apache.wicket.Component;
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.request.Response;
/**
* Abstract class for handling Ajax roundtrips. This class serves as a base for javascript specific
@@ -29,7 +28,7 @@ import org.apache.wicket.request.Respons
* @author Ralf Ebert
* @author Igor Vaynberg
*/
-public abstract class AbstractAjaxBehavior extends AbstractBehavior implements IBehaviorListener
+public abstract class AbstractAjaxBehavior extends Behavior implements IBehaviorListener
{
private static final long serialVersionUID = 1L;
@@ -91,7 +90,7 @@ public abstract class AbstractAjaxBehavi
}
/**
- * @see org.apache.wicket.behavior.IBehavior#onComponentTag(org.apache.wicket.Component,
+ * @see org.apache.wicket.behavior.Behavior#onComponentTag(org.apache.wicket.Component,
* org.apache.wicket.markup.ComponentTag)
*/
@Override
@@ -101,10 +100,10 @@ public abstract class AbstractAjaxBehavi
}
/**
- * @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
+ * @see org.apache.wicket.behavior.AbstractBehavior#afterRender(org.apache.wicket.Component)
*/
@Override
- public final void onRendered(final Component hostComponent)
+ public final void afterRender(final Component hostComponent)
{
onComponentRendered();
}
@@ -154,32 +153,4 @@ public abstract class AbstractAjaxBehavi
{
return false;
}
-
- // TODO the next three methods will be removed with next commit. Here as
- // final to help with refactoring
-
- /**
- *
- * @return unique implementation id
- */
- protected final String getImplementationId()
- {
- return "foo";
- }
-
- /**
- *
- * @param response
- */
- protected final void onRenderHeadContribution(final Response response)
- {
- }
-
- /**
- *
- * @param response
- */
- protected final void onRenderHeadInitContribution(final Response response)
- {
- }
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractBehavior.java Tue Nov 30 00:55:09 2010
@@ -17,18 +17,20 @@
package org.apache.wicket.behavior;
import org.apache.wicket.Component;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.IHeaderResponse;
/**
- * Adapter implementation of {@link org.apache.wicket.behavior.IBehavior}. It is recommended to
+ * Adapter implementation of {@link org.apache.wicket.behavior.Behavior}. It is recommended to
* extend from this class instead of directly implementing
- * {@link org.apache.wicket.behavior.IBehavior} as this class has an extra {@link #cleanup()} call.
+ * {@link org.apache.wicket.behavior.Behavior} as this class has an extra {@link #cleanup()} call.
*
* @author Ralf Ebert
* @author Eelco Hillenius
+ *
+ * @deprecated extend {@link Behavior} instead
*/
-public abstract class AbstractBehavior implements IBehavior
+// TODO WICKET-1.6: remove this class
+@Deprecated
+public abstract class AbstractBehavior extends Behavior
{
/** */
private static final long serialVersionUID = 1L;
@@ -41,39 +43,19 @@ public abstract class AbstractBehavior i
}
/**
- * @see org.apache.wicket.behavior.IBehavior#beforeRender(org.apache.wicket.Component)
- */
- public void beforeRender(Component component)
- {
- }
-
- /**
- * @see org.apache.wicket.behavior.IBehavior#bind(org.apache.wicket.Component)
- */
- public void bind(final Component component)
- {
- }
-
- /**
* This method is called either by {@link #onRendered(Component)} or
- * {@link #onHandleException(Component, RuntimeException)} AFTER they called their respective template
- * methods. Override this template method to do any necessary cleanup.
+ * {@link #onHandleException(Component, RuntimeException)} AFTER they called their respective
+ * template methods. Override this template method to do any necessary cleanup.
*/
public void cleanup()
{
}
/**
- * @see org.apache.wicket.behavior.IBehavior#detach(Component)
- */
- public void detach(Component component)
- {
- }
-
- /**
- * @see org.apache.wicket.behavior.IBehavior#onException(org.apache.wicket.Component,
+ * @see org.apache.wicket.behavior.Behavior#onException(org.apache.wicket.Component,
* java.lang.RuntimeException)
*/
+ @Override
public final void onException(Component component, RuntimeException exception)
{
try
@@ -87,22 +69,6 @@ public abstract class AbstractBehavior i
}
/**
- * @see org.apache.wicket.behavior.IBehavior#getStatelessHint(org.apache.wicket.Component)
- */
- public boolean getStatelessHint(Component component)
- {
- return true;
- }
-
- /**
- * @see org.apache.wicket.behavior.IBehavior#onComponentTag(org.apache.wicket.Component,
- * org.apache.wicket.markup.ComponentTag)
- */
- public void onComponentTag(final Component component, final ComponentTag tag)
- {
- }
-
- /**
* In case an unexpected exception happened anywhere between onComponentTag() and rendered(),
* onException() will be called for any behavior.
*
@@ -127,8 +93,9 @@ public abstract class AbstractBehavior i
}
/**
- * @see org.apache.wicket.behavior.IBehavior#afterRender(org.apache.wicket.Component)
+ * @see org.apache.wicket.behavior.Behavior#afterRender(org.apache.wicket.Component)
*/
+ @Override
public final void afterRender(final Component component)
{
try
@@ -140,43 +107,4 @@ public abstract class AbstractBehavior i
cleanup();
}
}
-
- /**
- * @see org.apache.wicket.behavior.IBehavior#isEnabled(Component)
- */
- public boolean isEnabled(Component component)
- {
- return true;
- }
-
- /**
- * @see org.apache.wicket.behavior.IBehavior#isTemporary(Component)
- */
- public boolean isTemporary(Component component)
- {
- return false;
- }
-
- /**
- * @see org.apache.wicket.behavior.IBehavior#unbind(org.apache.wicket.Component)
- */
- public void unbind(Component component)
- {
- }
-
- public void renderHead(Component component, IHeaderResponse response)
- {
- }
-
- /**
- * Checks if a listener can be invoked on this behavior. By checks that both
- * {@link Component#canCallListenerInterface()} and {@link #isEnabled(Component)} return true.
- *
- * @param component
- * @return true if a listener interface can be invoked on this behavior
- */
- public boolean canCallListenerInterface(Component component)
- {
- return component.canCallListenerInterface() && isEnabled(component);
- }
}
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/Behavior.java (from r1040357, wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/Behavior.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/Behavior.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java&r1=1040357&r2=1040370&rev=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/Behavior.java Tue Nov 30 00:55:09 2010
@@ -29,16 +29,8 @@ import org.apache.wicket.markup.html.IHe
* can have their own models as well, and they are notified when these are to be detached by the
* component.
* <p>
- * It is recommended that you extend from {@link org.apache.wicket.behavior.AbstractBehavior}
- * instead of directly implementing this interface.
- * </p>
- *
- * <p>
- * Note that behavors are only called during render. They are not the same as events like link
- * listeners etc.
- * </p>
- * <p>
* You also cannot modify a components model with a behavor.
+ * </p>
*
* @see org.apache.wicket.behavior.IBehaviorListener
* @see org.apache.wicket.markup.html.IHeaderContributor
@@ -49,15 +41,19 @@ import org.apache.wicket.markup.html.IHe
* @author Eelco Hillenius
* @author Igor Vaynberg (ivaynberg)
*/
-public interface IBehavior extends IClusterable
+public abstract class Behavior implements IClusterable
{
+ private static final long serialVersionUID = 1L;
+
/**
* Called when a component is about to render.
*
* @param component
* the component that has this behavior coupled
*/
- void beforeRender(Component component);
+ public void beforeRender(Component component)
+ {
+ };
/**
* Called when a component that has this behavior coupled was rendered.
@@ -65,7 +61,9 @@ public interface IBehavior extends IClus
* @param component
* the component that has this behavior coupled
*/
- void afterRender(Component component);
+ public void afterRender(Component component)
+ {
+ };
/**
* Bind this handler to the given component. This method is called by the host component
@@ -78,7 +76,9 @@ public interface IBehavior extends IClus
* @param component
* the component to bind to
*/
- void bind(Component component);
+ public void bind(Component component)
+ {
+ };
/**
* Notifies the behavior it is removed from the specified component
@@ -86,7 +86,9 @@ public interface IBehavior extends IClus
* @param component
* the component this behavior is unbound from
*/
- void unbind(Component component);
+ public void unbind(Component component)
+ {
+ };
/**
* Allows the behavior to detach any state it has attached during request processing.
@@ -94,7 +96,9 @@ public interface IBehavior extends IClus
* @param component
* the component that initiates the detachment of this behavior
*/
- void detach(Component component);
+ public void detach(Component component)
+ {
+ };
/**
* In case an unexpected exception happened anywhere between onComponentTag() and rendered(),
@@ -107,7 +111,9 @@ public interface IBehavior extends IClus
* @param exception
* the unexpected exception
*/
- void onException(Component component, RuntimeException exception);
+ public void onException(Component component, RuntimeException exception)
+ {
+ };
/**
* This method returns false if the behavior generates a callback url (for example ajax
@@ -118,7 +124,10 @@ public interface IBehavior extends IClus
*
* @return boolean true or false.
*/
- boolean getStatelessHint(Component component);
+ public boolean getStatelessHint(Component component)
+ {
+ return true;
+ }
/**
* Called when a components is rendering and wants to render this behavior. If false is returned
@@ -129,7 +138,10 @@ public interface IBehavior extends IClus
*
* @return true if this behavior must be executed/rendered
*/
- boolean isEnabled(Component component);
+ public boolean isEnabled(Component component)
+ {
+ return true;
+ }
/**
* Called any time a component that has this behavior registered is rendering the component tag.
@@ -139,7 +151,9 @@ public interface IBehavior extends IClus
* @param tag
* the tag that is rendered
*/
- void onComponentTag(Component component, ComponentTag tag);
+ public void onComponentTag(Component component, ComponentTag tag)
+ {
+ };
/**
* Specifies whether or not this behavior is temporary. Temporary behaviors are removed at the
@@ -151,7 +165,10 @@ public interface IBehavior extends IClus
*
* @return true if this behavior is temporary
*/
- boolean isTemporary(Component component);
+ public boolean isTemporary(Component component)
+ {
+ return false;
+ };
/**
* Checks if a listener can be invoked on this behavior
@@ -159,7 +176,10 @@ public interface IBehavior extends IClus
* @param component
* @return true if a listener interface can be invoked on this behavior
*/
- boolean canCallListenerInterface(Component component);
+ public boolean canCallListenerInterface(Component component)
+ {
+ return isEnabled(component) && component.canCallListenerInterface();
+ };
/**
* Render to the web response whatever the component wants to contribute to the head section.
@@ -169,5 +189,7 @@ public interface IBehavior extends IClus
* @param response
* Response object
*/
- void renderHead(Component component, IHeaderResponse response);
+ public void renderHead(Component component, IHeaderResponse response)
+ {
+ };
}
\ No newline at end of file
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/Behavior.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/Behavior.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java Tue Nov 30 00:55:09 2010
@@ -20,7 +20,7 @@ import org.apache.wicket.IRequestListene
import org.apache.wicket.RequestListenerInterface;
/**
- * Listens for requests to behaviors. When {@link org.apache.wicket.behavior.IBehavior}s are
+ * Listens for requests to behaviors. When {@link org.apache.wicket.behavior.Behavior}s are
* 'enriched' with this interface, they can receive requests themselves. You can use this for
* example to implement AJAX behavior, though you'll probably want to extend from
* {@link org.apache.wicket.behavior.AbstractAjaxBehavior} directly instead in that case.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/SimpleAttributeModifier.java Tue Nov 30 00:55:09 2010
@@ -18,6 +18,7 @@ package org.apache.wicket.behavior;
import org.apache.wicket.Component;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.util.lang.Args;
/**
* A lightweight version of the attribute modifier. This is convenient for simpler situations where
@@ -25,7 +26,7 @@ import org.apache.wicket.markup.Componen
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class SimpleAttributeModifier extends AbstractBehavior
+public class SimpleAttributeModifier extends Behavior
{
private static final long serialVersionUID = 1L;
@@ -45,14 +46,8 @@ public class SimpleAttributeModifier ext
*/
public SimpleAttributeModifier(final String attribute, final CharSequence value)
{
- if (attribute == null)
- {
- throw new IllegalArgumentException("Argument [attr] cannot be null");
- }
- if (value == null)
- {
- throw new IllegalArgumentException("Argument [value] cannot be null");
- }
+ Args.notNull(attribute, "attribute");
+ Args.notNull(value, "value");
this.attribute = attribute;
this.value = value;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/ComponentTag.java Tue Nov 30 00:55:09 2010
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import org.apache.wicket.Component;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.markup.parser.XmlTag.Type;
import org.apache.wicket.markup.parser.filter.HtmlHandler;
@@ -95,7 +95,7 @@ public class ComponentTag extends Markup
private boolean hasNoCloseTag = false;
/** added behaviors */
- private List<IBehavior> behaviors;
+ private List<Behavior> behaviors;
/** Filters and Handlers may add their own attributes to the tag */
private Map<String, Object> userData;
@@ -146,7 +146,7 @@ public class ComponentTag extends Markup
*
* @param behavior
*/
- public final void addBehavior(final IBehavior behavior)
+ public final void addBehavior(final Behavior behavior)
{
if (behavior == null)
{
@@ -155,7 +155,7 @@ public class ComponentTag extends Markup
if (behaviors == null)
{
- behaviors = new ArrayList<IBehavior>();
+ behaviors = new ArrayList<Behavior>();
}
behaviors.add(behavior);
}
@@ -172,11 +172,11 @@ public class ComponentTag extends Markup
* @return read only iterator over added behaviors
* @TODO change to return unmodifiable list which will never be null. See Component.getBehavior
*/
- public final Iterator<? extends IBehavior> getBehaviors()
+ public final Iterator<? extends Behavior> getBehaviors()
{
if (behaviors == null)
{
- List<IBehavior> lst = Collections.emptyList();
+ List<Behavior> lst = Collections.emptyList();
return lst.iterator();
}
@@ -438,7 +438,7 @@ public class ComponentTag extends Markup
}
if (behaviors != null)
{
- dest.behaviors = new ArrayList<IBehavior>(behaviors.size());
+ dest.behaviors = new ArrayList<Behavior>(behaviors.size());
dest.behaviors.addAll(behaviors);
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java Tue Nov 30 00:55:09 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html;
+import org.apache.wicket.IClusterable;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.MarkupException;
@@ -35,7 +35,7 @@ import org.apache.wicket.util.lang.Class
*
* @author Juergen Donnerstag
*/
-public class ContainerWithAssociatedMarkupHelper extends AbstractBehavior
+public class ContainerWithAssociatedMarkupHelper implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java Tue Nov 30 00:55:09 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.bo
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.MarkupElement;
@@ -236,7 +236,7 @@ public abstract class Border extends Web
* @see #add(Component...)
*/
@Override
- public Component add(final IBehavior... behaviors)
+ public Component add(final Behavior... behaviors)
{
return addToBorderBody(behaviors);
}
@@ -256,7 +256,7 @@ public abstract class Border extends Web
* @param behaviors
* @return this
*/
- public Component addToBorder(final IBehavior... behaviors)
+ public Component addToBorder(final Behavior... behaviors)
{
return super.add(behaviors);
}
@@ -277,7 +277,7 @@ public abstract class Border extends Web
* @param behaviors
* @return this
*/
- public Component addToBorderBody(final IBehavior... behaviors)
+ public Component addToBorderBody(final Behavior... behaviors)
{
super.add(behaviors);
return this;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java Tue Nov 30 00:55:09 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ContainerInfo;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.MarkupElement;
@@ -43,7 +43,7 @@ import org.apache.wicket.util.resource.l
*
* @author jcompagner
*/
-public class MarkupComponentBorder extends AbstractBehavior
+public class MarkupComponentBorder extends Behavior
{
static
{
@@ -121,10 +121,10 @@ public class MarkupComponentBorder exten
}
/**
- * @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
+ * @see org.apache.wicket.behavior.AbstractBehavior#afterRender(org.apache.wicket.Component)
*/
@Override
- public void onRendered(final Component component)
+ public void afterRender(final Component component)
{
final MarkupStream stream = getMarkupStream(component);
final Response response = component.getResponse();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/ContextPathGenerator.java Tue Nov 30 00:55:09 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.html.image;
import org.apache.wicket.Component;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -31,7 +31,7 @@ import org.apache.wicket.util.string.Url
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class ContextPathGenerator extends AbstractBehavior
+public class ContextPathGenerator extends Behavior
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ClientSideImageMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ClientSideImageMap.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ClientSideImageMap.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ClientSideImageMap.java Tue Nov 30 00:55:09 2010
@@ -21,7 +21,7 @@ import java.awt.geom.PathIterator;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.panel.Panel;
@@ -234,7 +234,7 @@ public class ClientSideImageMap extends
/**
* Encapsulates the concept of an <area> within a <map>.
*/
- private static class Area extends AbstractBehavior
+ private static class Area extends Behavior
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java Tue Nov 30 00:55:09 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.na
import java.util.Map;
import org.apache.wicket.Component;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.AbstractLink;
@@ -400,7 +400,7 @@ public class PagingNavigation extends Lo
*
* @author igor.vaynberg
*/
- private final class TitleAppender extends AbstractBehavior
+ private final class TitleAppender extends Behavior
{
private static final long serialVersionUID = 1L;
/** resource key for the message */
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java Tue Nov 30 00:55:09 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.html.navigation.paging;
import org.apache.wicket.Component;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.panel.Panel;
@@ -173,7 +173,7 @@ public class PagingNavigator extends Pan
*
* @author igor.vaynberg
*/
- private final class TitleAppender extends AbstractBehavior
+ private final class TitleAppender extends Behavior
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java Tue Nov 30 00:55:09 2010
@@ -33,7 +33,7 @@ import javax.swing.tree.TreeModel;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
@@ -237,8 +237,8 @@ public abstract class AbstractTree exten
item.onRender();
// go through the behaviors and invoke IBehavior.afterRender
- List<? extends IBehavior> behaviors = item.getBehaviors();
- for (IBehavior behavior : behaviors)
+ List<? extends Behavior> behaviors = item.getBehaviors();
+ for (Behavior behavior : behaviors)
{
behavior.afterRender(item);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java Tue Nov 30 00:55:09 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.MarkupContainer
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -106,7 +106,7 @@ public abstract class BaseTree extends A
item.add(nodeComponent);
// add behavior that conditionally adds the "selected" CSS class name
- item.add(new AbstractBehavior()
+ item.add(new Behavior()
{
private static final long serialVersionUID = 1L;
@@ -189,7 +189,7 @@ public abstract class BaseTree extends A
*
* @author Matej Knopp
*/
- private class JunctionBorder extends AbstractBehavior
+ private class JunctionBorder extends Behavior
{
private static final long serialVersionUID = 1L;
@@ -213,7 +213,7 @@ public abstract class BaseTree extends A
* @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
*/
@Override
- public void onRendered(final Component component)
+ public void afterRender(final Component component)
{
component.getResponse().write("</td>");
}
@@ -294,7 +294,7 @@ public abstract class BaseTree extends A
updateTree(target);
}
});
- junctionLink.add(new AbstractBehavior()
+ junctionLink.add(new Behavior()
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java Tue Nov 30 00:55:09 2010
@@ -20,8 +20,7 @@ import java.text.ParseException;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.behavior.AbstractBehavior;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.MarkupStream;
@@ -71,7 +70,7 @@ public final class RelativePathPrefixHan
* Behavior that adds a prefix to src, href and background attributes to make them
* context-relative
*/
- public static final IBehavior RELATIVE_PATH_BEHAVIOR = new AbstractBehavior()
+ public static final Behavior RELATIVE_PATH_BEHAVIOR = new Behavior()
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java Tue Nov 30 00:55:09 2010
@@ -21,8 +21,7 @@ import java.text.ParseException;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.behavior.AbstractBehavior;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.MarkupStream;
@@ -57,7 +56,7 @@ public final class WicketMessageTagHandl
public final static String WICKET_MESSAGE_CONTAINER_ID = "_message_attr_";
/** singleton instance of {@link AttributeLocalizer} */
- public static final IBehavior ATTRIBUTE_LOCALIZER = new AttributeLocalizer();
+ public static final Behavior ATTRIBUTE_LOCALIZER = new AttributeLocalizer();
/**
* Construct.
@@ -104,7 +103,7 @@ public final class WicketMessageTagHandl
*
* @author Igor Vaynberg (ivaynberg)
*/
- public static class AttributeLocalizer extends AbstractBehavior
+ public static class AttributeLocalizer extends Behavior
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java Tue Nov 30 00:55:09 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.transfo
import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.protocol.http.BufferedWebResponse;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -32,7 +32,7 @@ import org.apache.wicket.request.http.We
*
* @author Juergen Donnerstag
*/
-public abstract class AbstractTransformerBehavior extends AbstractBehavior implements ITransformer
+public abstract class AbstractTransformerBehavior extends Behavior implements ITransformer
{
private static final long serialVersionUID = 1L;
@@ -59,7 +59,7 @@ public abstract class AbstractTransforme
}
/**
- * @see org.apache.wicket.behavior.IBehavior#onComponentTag(org.apache.wicket.Component,
+ * @see org.apache.wicket.behavior.Behavior#onComponentTag(org.apache.wicket.Component,
* org.apache.wicket.markup.ComponentTag)
*/
@Override
@@ -92,11 +92,8 @@ public abstract class AbstractTransforme
requestCycle.setResponse(response);
}
- /**
- * @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
- */
@Override
- public void onRendered(final Component component)
+ public void afterRender(Component component)
{
final RequestCycle requestCycle = RequestCycle.get();
@@ -120,27 +117,12 @@ public abstract class AbstractTransforme
}
}
- /**
- * @see org.apache.wicket.behavior.AbstractBehavior#cleanup()
- */
- @Override
- public void cleanup()
- {
- webResponse = null;
- }
- /**
- * @see org.apache.wicket.behavior.AbstractBehavior#onHandleException(org.apache.wicket.Component,
- * java.lang.RuntimeException)
- */
@Override
- public void onHandleException(Component component, RuntimeException exception)
+ public void detach(Component component)
{
- if (webResponse != null)
- {
- final RequestCycle requestCycle = RequestCycle.get();
- requestCycle.setResponse(webResponse);
- }
+ webResponse = null;
+ super.detach(component);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java Tue Nov 30 00:55:09 2010
@@ -66,7 +66,7 @@ public class XsltTransformerBehavior ext
}
/**
- * @see org.apache.wicket.behavior.IBehavior#onComponentTag(org.apache.wicket.Component,
+ * @see org.apache.wicket.behavior.Behavior#onComponentTag(org.apache.wicket.Component,
* org.apache.wicket.markup.ComponentTag)
*/
@Override
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java Tue Nov 30 00:55:09 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.request.component;
import org.apache.wicket.Component;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.behavior.InvalidBehaviorIdException;
import org.apache.wicket.model.IDetachable;
@@ -74,7 +74,7 @@ public interface IRequestableComponent
* @param behavior
* @return
*/
- public int getBehaviorId(IBehavior behavior);
+ public int getBehaviorId(Behavior behavior);
/**
* Gets the behavior for the specified id
@@ -84,7 +84,7 @@ public interface IRequestableComponent
* @throws InvalidBehaviorIdException
* when behavior with this id cannot be found
*/
- public IBehavior getBehaviorById(int id);
+ public Behavior getBehaviorById(int id);
/**
* Detaches the component.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java Tue Nov 30 00:55:09 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.request.handle
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.component.IRequestablePage;
@@ -195,7 +195,7 @@ public class ListenerInterfaceRequestHan
{
try
{
- IBehavior behavior = getComponent().getBehaviorById(behaviorId);
+ Behavior behavior = getComponent().getBehaviorById(behaviorId);
listenerInterface.invoke(getComponent(), behavior);
}
catch (IndexOutOfBoundsException e)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInvocationNotAllowedException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInvocationNotAllowedException.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInvocationNotAllowedException.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInvocationNotAllowedException.java Tue Nov 30 00:55:09 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.request.handle
import org.apache.wicket.Component;
import org.apache.wicket.RequestListenerInterface;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
/**
* Thrown when a listener invocation is attempted on a component or behavior that does not allow it.
@@ -31,7 +31,7 @@ public class ListenerInvocationNotAllowe
private static final long serialVersionUID = 1L;
private final Component component;
- private final IBehavior behavior;
+ private final Behavior behavior;
private final RequestListenerInterface iface;
/**
@@ -43,7 +43,7 @@ public class ListenerInvocationNotAllowe
* @param message
*/
public ListenerInvocationNotAllowedException(RequestListenerInterface iface,
- Component component, IBehavior behavior, String message)
+ Component component, Behavior behavior, String message)
{
super(message + detail(iface, component, behavior));
this.iface = iface;
@@ -53,7 +53,7 @@ public class ListenerInvocationNotAllowe
}
private static String detail(RequestListenerInterface iface, Component component,
- IBehavior behavior)
+ Behavior behavior)
{
StringBuilder detail = new StringBuilder("Component: ").append(component.toString(false));
if (behavior != null)
@@ -75,7 +75,7 @@ public class ListenerInvocationNotAllowe
/**
* @return behavior that was the target of invocation or {@code null}
*/
- public IBehavior getBehavior()
+ public Behavior getBehavior()
{
return behavior;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Tue Nov 30 00:55:09 2010
@@ -56,7 +56,7 @@ import org.apache.wicket.ajax.markup.htm
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.feedback.FeedbackMessages;
import org.apache.wicket.feedback.IFeedbackMessageFilter;
@@ -1608,7 +1608,7 @@ public class BaseWicketTester
// get the AbstractAjaxBehaviour which is responsible for
// getting the contents of the lazy panel
List<AbstractAjaxTimerBehavior> behaviors = component.getBehaviors(AbstractAjaxTimerBehavior.class);
- for (IBehavior b : behaviors)
+ for (Behavior b : behaviors)
{
checkUsability(component);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTesterHelper.java Tue Nov 30 00:55:09 2010
@@ -27,7 +27,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxEventBehavior;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
@@ -165,7 +165,7 @@ public class WicketTesterHelper
public static AjaxEventBehavior findAjaxEventBehavior(Component component, String event)
{
- for (IBehavior behavior : component.getBehaviors())
+ for (Behavior behavior : component.getBehaviors())
{
if (behavior instanceof AjaxEventBehavior)
{
@@ -178,10 +178,10 @@ public class WicketTesterHelper
return null;
}
- public static IBehavior findBehavior(Component component,
- Class<? extends IBehavior> behaviorClass)
+ public static Behavior findBehavior(Component component,
+ Class<? extends Behavior> behaviorClass)
{
- for (IBehavior behavior : component.getBehaviors())
+ for (Behavior behavior : component.getBehaviors())
{
if (behaviorClass.isAssignableFrom(behavior.getClass()))
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/IValidatorAddListener.java Tue Nov 30 00:55:09 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.validation;
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.validation.IFormValidator;
@@ -30,7 +30,7 @@ import org.apache.wicket.markup.html.for
* Implementation note: currently we keep this case simple, stupid, and non-generic. In future
* versions we may revisit this and support removal events (<i>IF</i> removal of validators is ever
* allowed, which justifies its own discussion). Also, we may look at whether this is a common event
- * to support for {@link IBehavior}s as well. This raises additional questions that need to be
+ * to support for {@link Behavior}s as well. This raises additional questions that need to be
* answered, hence we'll start by supporting just the use case when validators are added to forms or
* form components.
*
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java?rev=1040370&r1=1040369&r2=1040370&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java Tue Nov 30 00:55:09 2010
@@ -16,8 +16,7 @@
*/
package org.apache.wicket;
-import org.apache.wicket.behavior.AbstractBehavior;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.behavior.IBehaviorListener;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -66,12 +65,13 @@ public class BehaviorRequestTest extends
}
}
- private String urlForBehavior(IBehavior behaviorUnderTest)
+ private String urlForBehavior(Behavior behaviorUnderTest)
{
final int index = page.container.getBehaviorId(behaviorUnderTest);
- final IPageAndComponentProvider provider = new PageAndComponentProvider(page, page.container);
- final IRequestHandler handler =
- new ListenerInterfaceRequestHandler(provider, IBehaviorListener.INTERFACE, index);
+ final IPageAndComponentProvider provider = new PageAndComponentProvider(page,
+ page.container);
+ final IRequestHandler handler = new ListenerInterfaceRequestHandler(provider,
+ IBehaviorListener.INTERFACE, index);
return tester.urlFor(handler).toString();
}
@@ -101,7 +101,7 @@ public class BehaviorRequestTest extends
}
}
- private static class TestCallbackBehavior extends AbstractBehavior implements IBehaviorListener
+ private static class TestCallbackBehavior extends Behavior implements IBehaviorListener
{
private boolean enabled;
private boolean called;