Author: ivaynberg
Date: Sun Feb 28 08:11:54 2010
New Revision: 917140
URL: http://svn.apache.org/viewvc?rev=917140&view=rev
Log:
fixed behavior url generation
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIndexTest.java
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=917140&r1=917139&r2=917140&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 Sun Feb
28 08:11:54 2010
@@ -3227,7 +3227,7 @@
final RequestListenerInterface listener)
{
PageAndComponentProvider provider = new
PageAndComponentProvider(getPage(), this);
- int index = getBehaviors().indexOf(behaviour);
+ int index = getBehaviorsRawList().indexOf(behaviour);
IRequestHandler handler;
if (getPage().isPageStateless())
{
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIndexTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIndexTest.java?rev=917140&r1=917139&r2=917140&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIndexTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIndexTest.java
Sun Feb 28 08:11:54 2010
@@ -59,13 +59,12 @@
tester.startPage(page);
String output = tester.getLastResponseAsString();
- System.out.println(output);
assertTrue(output.contains("class=\"border\""));
assertTrue(output.contains("autocomplete=\"off\""));
assertTrue(output.contains("class2=\"border\""));
assertTrue(output.contains("autocomplete2=\"off\""));
- assertTrue(output.contains("IBehaviorListener:2"));
- assertTrue(output.contains("IBehaviorListener:4"));
+ assertTrue(output.contains("IBehaviorListener.2"));
+ assertTrue(output.contains("IBehaviorListener.4"));
// if we remove a behavior that is before the ibehaviorlistener
its url index should not
// change
@@ -76,8 +75,9 @@
page.getContainer().remove(auto2);
tester.startPage(page);
output = tester.getLastResponseAsString();
- assertTrue(output.contains("IBehaviorListener:2"));
- assertTrue(output.contains("IBehaviorListener:4"));
+ System.out.println(output);
+ assertTrue(output.contains("IBehaviorListener.2"));
+ assertTrue(output.contains("IBehaviorListener.4"));
}
/**
