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 2008/06/07 09:05:28 UTC
svn commit: r664292 - in
/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket:
Component.java markup/html/list/ListItem.java
Author: ivaynberg
Date: Sat Jun 7 00:05:27 2008
New Revision: 664292
URL: http://svn.apache.org/viewvc?rev=664292&view=rev
Log:
removing component type wip
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItem.java
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java?rev=664292&r1=664291&r2=664292&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Component.java Sat Jun 7 00:05:27 2008
@@ -2932,11 +2932,13 @@
/**
* Sets the backing model object; shorthand for getModel().setObject(object).
*
+ * OVERRIDE ONLY TO USE A COVARIANT <code>object</code> TYPE.
+ *
* @param object
* The object to set
* @return This
*/
- public final Component setModelObject(final Object object)
+ public Component setModelObject(final Object object)
{
final IModel model = getModel();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItem.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItem.java?rev=664292&r1=664291&r2=664292&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItem.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItem.java Sat Jun 7 00:05:27 2008
@@ -61,12 +61,18 @@
return index;
}
+ /**
+ * @param model
+ * @return
+ */
@Override
- public MarkupContainer setModel(IModel<T> model)
+ public MarkupContainer setModel(final IModel<T> model)
{
- return super.setModel(model);
+ super.setModel(model);
+ return this;
}
+
@Override
public IModel<T> getModel()
{