svn commit: r1126339 - in /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table: PropertyRenderableColumn.java PropertyTreeColumn.java

[mgrigorov]

Author: mgrigorov
Date: Mon May 23 07:05:38 2011
New Revision: 1126339

URL: http://svn.apache.org/viewvc?rev=1126339&view=rev
Log:
WICKET-3734 
org.apache.wicket.extensions.markup.html.tree.table.PropertyRenderableColumn 
IConverter type param

Add generics to PropertyRenderableColumn and PropertyTreeColumn


Modified:
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java?rev=1126339&r1=1126338&r2=1126339&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java
 Mon May 23 07:05:38 2011
@@ -29,13 +29,14 @@ import org.apache.wicket.util.lang.Prope
  * Lightweight column that uses a property expression to get the value from 
the node.
  * 
  * @author Matej Knopp
+ * @param <T>
+ *            the type of the property that is rendered in this column
  */
-public class PropertyRenderableColumn extends AbstractRenderableColumn
+public class PropertyRenderableColumn<T> extends AbstractRenderableColumn
 {
        private static final long serialVersionUID = 1L;
 
-       @SuppressWarnings("rawtypes")
-       private IConverter converter;
+       private IConverter<T> converter;
 
        private Locale locale;
 
@@ -65,7 +66,7 @@ public class PropertyRenderableColumn ex
         * 
         * @return The converter or null
         */
-       public IConverter<?> getConverter()
+       public IConverter<T> getConverter()
        {
                return converter;
        }
@@ -94,8 +95,9 @@ public class PropertyRenderableColumn ex
                        {
                                locale = Session.get().getLocale();
                        }
+
                        @SuppressWarnings("unchecked")
-                       String string = converter.convertToString(result, 
locale);
+                       String string = converter.convertToString((T)result, 
locale);
                        return string;
                }
                else
@@ -111,7 +113,7 @@ public class PropertyRenderableColumn ex
         * @param converter
         *            any converter
         */
-       public void setConverter(final IConverter<?> converter)
+       public void setConverter(final IConverter<T> converter)
        {
                this.converter = converter;
        }

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java?rev=1126339&r1=1126338&r2=1126339&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java
 Mon May 23 07:05:38 2011
@@ -29,13 +29,14 @@ import org.apache.wicket.util.lang.Prope
  * TreeColumn class that uses a property expression to get the value from the 
node.
  * 
  * @author Matej Knopp
+ * @param <T>
+ *            the type of the property that is rendered in this column
  */
-public class PropertyTreeColumn extends AbstractTreeColumn
+public class PropertyTreeColumn<T> extends AbstractTreeColumn
 {
        private static final long serialVersionUID = 1L;
 
-       @SuppressWarnings("rawtypes")
-       private IConverter converter;
+       private IConverter<T> converter;
 
        private Locale locale;
 
@@ -95,7 +96,7 @@ public class PropertyTreeColumn extends 
                                locale = Session.get().getLocale();
                        }
                        @SuppressWarnings("unchecked")
-                       String string = converter.convertToString(result, 
locale);
+                       String string = converter.convertToString((T)result, 
locale);
                        return string;
                }
                else
@@ -111,7 +112,7 @@ public class PropertyTreeColumn extends 
         * @param converter
         *            Any converter
         */
-       public void setConverter(final IConverter<?> converter)
+       public void setConverter(final IConverter<T> converter)
        {
                this.converter = converter;
        }