Index: trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java	(revision 17916)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java	(revision 17917)
@@ -142,10 +142,9 @@
      * @return The converted object or <code>null</code> if the conversion failed
      */
-    @SuppressWarnings("unchecked")
     public static <T> T convertTo(Object o, Class<T> klass) {
         if (o == null)
             return null;
         if (klass.isInstance(o))
-            return (T) o;
+            return klass.cast(o);
 
         return GENERIC_PARSER.supports(klass)