Author: ivaynberg
Date: Mon Jun 23 22:09:02 2008
New Revision: 671027
URL: http://svn.apache.org/viewvc?rev=671027&view=rev
Log:
a bit of cleanup
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListItem.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java
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=671027&r1=671026&r2=671027&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
Mon Jun 23 22:09:02 2008
@@ -18,6 +18,7 @@
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.lang.Generics;
/**
* Container that holds components in a ListView.
@@ -64,10 +65,9 @@
*
* @return model
*/
- @SuppressWarnings("unchecked")
public final IModel<T> getModel()
{
- return (IModel<T>)getDefaultModel();
+ return Generics.unsafeCast(getDefaultModel());
}
/**
@@ -85,10 +85,9 @@
*
* @return model object
*/
- @SuppressWarnings("unchecked")
public final T getModelObject()
{
- return (T)getDefaultModelObject();
+ return Generics.unsafeCast(getDefaultModelObject());
}
/**
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java?rev=671027&r1=671026&r2=671027&view=diff
==============================================================================
---
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java
(original)
+++
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/util/lang/Generics.java
Mon Jun 23 22:09:02 2008
@@ -22,7 +22,6 @@
import java.util.concurrent.ConcurrentHashMap;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
/**
* Generics related utilities
@@ -50,19 +49,32 @@
}
/**
- * Supresses generics warning when converting model types
+ * Performs unsafe model cast without a warning. WARNING: use sparingly.
*
* @param <T>
* @param model
* @return <code>model</code>
*/
@SuppressWarnings("unchecked")
- public static <T> IModel<T> model(Model<?> model)
+ public static <T> IModel<T> unsafeCast(IModel<?> model)
{
return (IModel<T>)model;
}
/**
+ * Performs unsafe object cast without a warning. WARNING: use
sparingly.
+ *
+ * @param <T>
+ * @param object
+ * @return <code>object</code>
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> T unsafeCast(Object object)
+ {
+ return (T)object;
+ }
+
+ /**
* Creates a new HashMap
*
* @param <K>
