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/08/14 08:55:20 UTC
svn commit: r985437 - in /wicket/trunk/wicket/src:
main/java/org/apache/wicket/ main/java/org/apache/wicket/behavior/
main/java/org/apache/wicket/markup/html/tree/
main/java/org/apache/wicket/request/component/
test/java/org/apache/wicket/behavior/
Author: ivaynberg
Date: Sat Aug 14 06:55:19 2010
New Revision: 985437
URL: http://svn.apache.org/viewvc?rev=985437&view=rev
Log:
Make Component. 'protected List<IBehavior> getBehaviors(Class<? extends IBehavior>' public
Issue: WICKET-2115
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/BehaviorsUtil.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/component/IRequestableComponent.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=985437&r1=985436&r2=985437&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 Sat Aug 14 06:55:19 2010
@@ -669,8 +669,8 @@ public abstract class Component
final IDebugSettings debugSettings = Application.get().getDebugSettings();
if (debugSettings.isLinePreciseReportingOnNewComponentEnabled())
{
- setMetaData(CONSTRUCTED_AT_KEY,
- ComponentStrings.toString(this, new MarkupException("constructed")));
+ setMetaData(CONSTRUCTED_AT_KEY, ComponentStrings.toString(this, new MarkupException(
+ "constructed")));
}
if (model != null)
@@ -1046,7 +1046,7 @@ public abstract class Component
*
* @return unmodified list of behaviors which may contain null entries
*/
- public final List<IBehavior> getBehaviorsRawList()
+ public final List<? extends IBehavior> getBehaviorsRawList()
{
if (data != null)
{
@@ -1446,7 +1446,7 @@ public abstract class Component
*
* @return The currently coupled behaviors as a unmodifiable list
*/
- public final List<IBehavior> getBehaviors()
+ public final List<? extends IBehavior> getBehaviors()
{
return getBehaviors(IBehavior.class);
}
@@ -3321,13 +3321,9 @@ public abstract class Component
final Page page = findPage();
if (page == null)
{
- return new StringBuffer("[Component id = ").append(getId())
- .append(", page = <No Page>, path = ")
- .append(getPath())
- .append(".")
- .append(Classes.simpleName(getClass()))
- .append("]")
- .toString();
+ return new StringBuffer("[Component id = ").append(getId()).append(
+ ", page = <No Page>, path = ").append(getPath()).append(".").append(
+ Classes.simpleName(getClass())).append("]").toString();
}
else
{
@@ -3684,7 +3680,7 @@ public abstract class Component
@SuppressWarnings("unchecked")
protected <M extends IBehavior> List<M> getBehaviors(Class<M> type)
{
- List<IBehavior> behaviors = getBehaviorsRawList();
+ List<? extends IBehavior> behaviors = getBehaviorsRawList();
if (behaviors == null)
{
return Collections.emptyList();
@@ -4025,7 +4021,7 @@ public abstract class Component
if (needToRenderTag(tag))
{
// Apply behavior modifiers
- List<IBehavior> behaviors = getBehaviors();
+ List<? extends IBehavior> behaviors = getBehaviors();
if ((behaviors != null) && !behaviors.isEmpty() && !tag.isClose() &&
(isIgnoreAttributeModifier() == false))
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/BehaviorsUtil.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/BehaviorsUtil.java?rev=985437&r1=985436&r2=985437&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/BehaviorsUtil.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/BehaviorsUtil.java Sat Aug 14 06:55:19 2010
@@ -51,7 +51,7 @@ public class BehaviorsUtil
public static <M extends IBehavior> List<IBehavior> getBehaviors(Component component,
Class<M> type)
{
- List<IBehavior> behaviors = component.getBehaviors();
+ List<? extends IBehavior> behaviors = component.getBehaviors();
if (behaviors == null)
{
return Collections.emptyList();
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=985437&r1=985436&r2=985437&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 Sat Aug 14 06:55:19 2010
@@ -224,7 +224,7 @@ public abstract class AbstractTree exten
item.onRender();
// go through the behaviors and invoke IBehavior.afterRender
- List<IBehavior> behaviors = item.getBehaviors();
+ List<? extends IBehavior> behaviors = item.getBehaviors();
for (IBehavior behavior : behaviors)
{
behavior.afterRender(item);
@@ -1659,6 +1659,7 @@ public abstract class AbstractTree exten
return nodeToItemMap.get(node);
}
+ @Override
public void renderHead(IHeaderResponse response)
{
response.renderJavascriptReference(JAVASCRIPT);
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=985437&r1=985436&r2=985437&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 Sat Aug 14 06:55:19 2010
@@ -74,7 +74,7 @@ public interface IRequestableComponent
*
* @return The currently coupled behaviors as a unmodifiable list
*/
- public List<IBehavior> getBehaviors();
+ public List<? extends IBehavior> getBehaviors();
/**
* Detaches the component.
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=985437&r1=985436&r2=985437&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 Sat Aug 14 06:55:19 2010
@@ -95,7 +95,7 @@ public class ImmutableBehaviorIndexTest
MyPage page = new MyPage();
page.getContainer().add(border, auto, link, border2, link2, auto2);
- List<IBehavior> behaviors = page.getContainer().getBehaviorsRawList();
+ List<? extends IBehavior> behaviors = page.getContainer().getBehaviorsRawList();
assertEquals(6, behaviors.size());
// test removal of various behaviors and make sure they preserve indexes as long as there is