Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java?rev=1040370&r1=1040369&r2=1040370&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.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.behavior.IBehaviorListener; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -91,7 +91,7 @@ public class BehaviorUrlTest extends Wic } } - private static class TestTemporaryBehavior extends AbstractBehavior + private static class TestTemporaryBehavior extends Behavior { @Override public boolean isTemporary(Component c) @@ -100,7 +100,7 @@ public class BehaviorUrlTest extends Wic } } - private static class TestCallbackBehavior extends AbstractBehavior implements IBehaviorListener + private static class TestCallbackBehavior extends Behavior implements IBehaviorListener { @Override public void onComponentTag(Component component, ComponentTag tag)
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java?rev=1040370&r1=1040369&r2=1040370&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.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.behavior.IBehaviorListener; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -94,7 +94,7 @@ public class ComponentWithLazyModelCreat } } - private static class TestCallbackBehavior extends AbstractBehavior implements IBehaviorListener + private static class TestCallbackBehavior extends Behavior implements IBehaviorListener { private boolean requested; // simulating the callback URL generated for component aware behaviors Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/MockComponent.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/MockComponent.java?rev=1040370&r1=1040369&r2=1040370&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/MockComponent.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/MockComponent.java Tue Nov 30 00:55:09 2010 @@ -16,7 +16,7 @@ */ package org.apache.wicket; -import org.apache.wicket.behavior.IBehavior; +import org.apache.wicket.behavior.Behavior; import org.apache.wicket.request.component.IRequestableComponent; import org.apache.wicket.request.component.IRequestablePage; import org.apache.wicket.util.string.Strings; @@ -143,12 +143,12 @@ public class MockComponent implements IR return false; } - public int getBehaviorId(IBehavior behavior) + public int getBehaviorId(Behavior behavior) { throw new IllegalArgumentException(); } - public IBehavior getBehaviorById(int id) + public Behavior getBehaviorById(int id) { return null; } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java?rev=1040370&r1=1040369&r2=1040370&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java Tue Nov 30 00:55:09 2010 @@ -46,12 +46,12 @@ public class ImmutableBehaviorIdsTest ex */ public void testUrlIndexRendering() { - IBehavior border = new SimpleAttributeModifier("class", "border"); - IBehavior border2 = new SimpleAttributeModifier("class2", "border"); - IBehavior auto = new SimpleAttributeModifier("autocomplete", "off"); - IBehavior auto2 = new SimpleAttributeModifier("autocomplete2", "off"); - IBehavior link = new LinkBehavior("href"); - IBehavior link2 = new LinkBehavior("onclick"); + Behavior border = new SimpleAttributeModifier("class", "border"); + Behavior border2 = new SimpleAttributeModifier("class2", "border"); + Behavior auto = new SimpleAttributeModifier("autocomplete", "off"); + Behavior auto2 = new SimpleAttributeModifier("autocomplete2", "off"); + Behavior link = new LinkBehavior("href"); + Behavior link2 = new LinkBehavior("onclick"); MyPage page = new MyPage(); @@ -85,12 +85,12 @@ public class ImmutableBehaviorIdsTest ex */ public void testBehaviorDataArrayCleanup() { - IBehavior border = new SimpleAttributeModifier("class", "border"); - IBehavior border2 = new SimpleAttributeModifier("class2", "border"); - IBehavior auto = new SimpleAttributeModifier("autocomplete", "off"); - IBehavior auto2 = new SimpleAttributeModifier("autocomplete2", "off"); - IBehavior link = new LinkBehavior("href"); - IBehavior link2 = new LinkBehavior("onclick"); + Behavior border = new SimpleAttributeModifier("class", "border"); + Behavior border2 = new SimpleAttributeModifier("class2", "border"); + Behavior auto = new SimpleAttributeModifier("autocomplete", "off"); + Behavior auto2 = new SimpleAttributeModifier("autocomplete2", "off"); + Behavior link = new LinkBehavior("href"); + Behavior link2 = new LinkBehavior("onclick"); MyPage page = new MyPage(); page.getContainer().add(border, auto, link, border2, link2, auto2); @@ -102,7 +102,7 @@ public class ImmutableBehaviorIdsTest ex int linkId = page.container.getBehaviorId(link); int link2Id = page.container.getBehaviorId(link2); - List<? extends IBehavior> behaviors = page.getContainer().getBehaviors(); + List<? extends Behavior> behaviors = page.getContainer().getBehaviors(); assertEquals(6, behaviors.size()); // test removal of various behaviors and make sure they preserve indexes as long as there is @@ -138,7 +138,7 @@ public class ImmutableBehaviorIdsTest ex } - private static class LinkBehavior extends AbstractBehavior implements IBehaviorListener + private static class LinkBehavior extends Behavior implements IBehaviorListener { private static final long serialVersionUID = 1L; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java?rev=1040370&r1=1040369&r2=1040370&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java Tue Nov 30 00:55:09 2010 @@ -18,7 +18,7 @@ package org.apache.wicket.markup.renderS 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.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; @@ -56,7 +56,7 @@ public class SimplePage1 extends WebPage { MarkupContainer container = new WebMarkupContainer(id); parent.add(container); - container.add(new AbstractBehavior() + container.add(new Behavior() { @Override public void renderHead(Component component, IHeaderResponse response) Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java?rev=1040370&r1=1040369&r2=1040370&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java Tue Nov 30 00:55:09 2010 @@ -18,7 +18,7 @@ package org.apache.wicket.markup.renderS 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.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; @@ -58,7 +58,7 @@ public class SimplePage2 extends WebPage { MarkupContainer container = new WebMarkupContainer(id); parent.add(container); - container.add(new AbstractBehavior() + container.add(new Behavior() { @Override public void renderHead(Component component, IHeaderResponse response) Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java?rev=1040370&r1=1040369&r2=1040370&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java Tue Nov 30 00:55:09 2010 @@ -18,7 +18,7 @@ package org.apache.wicket.markup.renderS 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.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.panel.Panel; @@ -66,7 +66,7 @@ public class SimplePanel1 extends Panel { MarkupContainer container = new WebMarkupContainer(id); parent.add(container); - container.add(new AbstractBehavior() + container.add(new Behavior() { @Override public void renderHead(Component component, IHeaderResponse response) Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java?rev=1040370&r1=1040369&r2=1040370&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/request/cycle/RequestHandlerStackTest.java Tue Nov 30 00:55:09 2010 @@ -88,7 +88,7 @@ public class RequestHandlerStackTest ext { testFlag2 = false; - stack.replaceCurrentRequestHandler(handler3); + stack.replaceAllRequestHandlers(handler3); // this code must not be executed testFlag2 = true; Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/VersioningTestPage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/VersioningTestPage.java?rev=1040370&r1=1040369&r2=1040370&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/VersioningTestPage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/VersioningTestPage.java Tue Nov 30 00:55:09 2010 @@ -19,7 +19,7 @@ package org.apache.wicket.versioning; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; 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.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; @@ -135,7 +135,7 @@ public class VersioningTestPage extends @Override public void onClick() { - targetComponent.add(new AbstractBehavior() + targetComponent.add(new Behavior() { /** @@ -165,7 +165,7 @@ public class VersioningTestPage extends @Override public void onClick() { - targetComponent.add(new AbstractBehavior() + targetComponent.add(new Behavior() { /**
