You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2010/09/06 15:23:37 UTC
svn commit: r993023 - in /wicket/trunk:
wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/
wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/
wicket/src/main/java/org/apache/wicket/markup/ht...
Author: pete
Date: Mon Sep 6 13:23:37 2010
New Revision: 993023
URL: http://svn.apache.org/viewvc?rev=993023&view=rev
Log:
fixed generics for tree
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.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/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java?rev=993023&r1=993022&r2=993023&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java Mon Sep 6 13:23:37 2010
@@ -158,7 +158,7 @@ public abstract class DefaultAbstractTre
* @param model
* The tree model
*/
- public DefaultAbstractTree(String id, IModel<TreeModel> model)
+ public DefaultAbstractTree(String id, IModel<? extends TreeModel> model)
{
super(id, model);
}
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=993023&r1=993022&r2=993023&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 Mon Sep 6 13:23:37 2010
@@ -57,7 +57,7 @@ public class Tree extends DefaultAbstrac
* @param model
* The tree model
*/
- public Tree(String id, IModel<TreeModel> model)
+ public Tree(String id, IModel<? extends TreeModel> model)
{
super(id, model);
}
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=993023&r1=993022&r2=993023&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 Mon Sep 6 13:23:37 2010
@@ -170,7 +170,7 @@ public class TreeTable extends DefaultAb
* @param columns
* The columns
*/
- public TreeTable(String id, IModel<TreeModel> model, IColumn columns[])
+ public TreeTable(String id, IModel<? extends TreeModel> model, IColumn columns[])
{
super(id, model);
init(columns);
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=993023&r1=993022&r2=993023&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 Mon Sep 6 13:23:37 2010
@@ -502,9 +502,9 @@ public abstract class AbstractTree exten
* @return model
*/
@SuppressWarnings("unchecked")
- public IModel<TreeModel> getModel()
+ public IModel<? extends TreeModel> getModel()
{
- return (IModel<TreeModel>)getDefaultModel();
+ return (IModel<? extends TreeModel>)getDefaultModel();
}
/**
@@ -520,7 +520,7 @@ public abstract class AbstractTree exten
* @param model
* @return this
*/
- public MarkupContainer setModel(IModel<TreeModel> model)
+ public MarkupContainer setModel(IModel<? extends TreeModel> model)
{
setDefaultModel(model);
return this;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java?rev=993023&r1=993022&r2=993023&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java Mon Sep 6 13:23:37 2010
@@ -47,7 +47,7 @@ public class LabelTree extends BaseTree
* @param model
* model that provides the {@link TreeModel}
*/
- public LabelTree(String id, IModel<TreeModel> model)
+ public LabelTree(String id, IModel<? extends TreeModel> model)
{
super(id, model);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java?rev=993023&r1=993022&r2=993023&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java Mon Sep 6 13:23:37 2010
@@ -51,7 +51,7 @@ public class LinkTree extends LabelTree
* @param model
* model that provides the {@link TreeModel}
*/
- public LinkTree(String id, IModel<TreeModel> model)
+ public LinkTree(String id, IModel<? extends TreeModel> model)
{
super(id, model);
}