You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2009/01/18 04:16:58 UTC
svn commit: r735380 -
/wicket/sandbox/knopp/experimental/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
Author: knopp
Date: Sat Jan 17 19:16:57 2009
New Revision: 735380
URL: http://svn.apache.org/viewvc?rev=735380&view=rev
Log:
merged with trunk (713218)
Modified:
wicket/sandbox/knopp/experimental/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
Modified: wicket/sandbox/knopp/experimental/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java?rev=735380&r1=735379&r2=735380&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java (original)
+++ wicket/sandbox/knopp/experimental/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java Sat Jan 17 19:16:57 2009
@@ -174,9 +174,9 @@
private static final long serialVersionUID = 1L;
@Override
- public <X> IConverter<X> getConverter(Class<X> clazz)
+ public IConverter getConverter(Class<?> clazz)
{
- return (IConverter<X>)new IConverter<URL>()
+ return new IConverter()
{
private static final long serialVersionUID = 1L;
@@ -200,7 +200,7 @@
* @see org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object,
* java.util.Locale)
*/
- public String convertToString(URL value, Locale locale)
+ public String convertToString(Object value, Locale locale)
{
return value != null ? value.toString() : null;
}
@@ -212,12 +212,10 @@
{
private static final long serialVersionUID = 1L;
- @SuppressWarnings("unchecked")
@Override
- public <X> IConverter<X> getConverter(Class<X> clazz)
+ public IConverter getConverter(Class<?> clazz)
{
- return (IConverter<X>)new MaskConverter<UsPhoneNumber>("(###) ###-####",
- UsPhoneNumber.class);
+ return new MaskConverter("(###) ###-####", UsPhoneNumber.class);
}
});