svn commit: r990023 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree: LabelIconPanel.java LabelTree.java LinkTree.java

[ivaynberg]

Author: ivaynberg
Date: Fri Aug 27 05:36:06 2010
New Revision: 990023

URL: http://svn.apache.org/viewvc?rev=990023&view=rev
Log:
relaxed generics
Issue: WICKET-1947

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.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/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java?rev=990023&r1=990022&r2=990023&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/LabelIconPanel.java
 Fri Aug 27 05:36:06 2010
@@ -97,7 +97,7 @@ public class LabelIconPanel extends Pane
         * @param model
         * @return content component
         */
-       protected Component newContentComponent(String componentId, BaseTree 
tree, IModel<Object> model)
+       protected Component newContentComponent(String componentId, BaseTree 
tree, IModel<?> model)
        {
                return new Label(componentId, model);
        }

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=990023&r1=990022&r2=990023&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
 Fri Aug 27 05:36:06 2010
@@ -78,7 +78,7 @@ public class LabelTree extends BaseTree
 
                        @Override
                        protected Component newContentComponent(String 
componentId, BaseTree tree,
-                               IModel<Object> model)
+                               IModel<?> model)
                        {
                                return super.newContentComponent(componentId, 
tree, getNodeTextModel(model));
                        }
@@ -103,7 +103,7 @@ public class LabelTree extends BaseTree
         *            model representing the current tree node
         * @return model used for text
         */
-       protected IModel<Object> getNodeTextModel(IModel<Object> nodeModel)
+       protected IModel<?> getNodeTextModel(IModel<?> nodeModel)
        {
                return nodeModel;
        }

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=990023&r1=990022&r2=990023&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
 Fri Aug 27 05:36:06 2010
@@ -90,7 +90,7 @@ public class LinkTree extends LabelTree
 
                        @Override
                        protected Component newContentComponent(String 
componentId, BaseTree tree,
-                               IModel<Object> model)
+                               IModel<?> model)
                        {
                                return new Label(componentId, 
getNodeTextModel(model));
                        }