Author: sletellier Date: 2010-04-14 15:42:42 +0200 (Wed, 14 Apr 2010) New Revision: 1840 Log: Allow to create typed Maps in entry def Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java 2010-04-14 12:48:17 UTC (rev 1839) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java 2010-04-14 13:42:42 UTC (rev 1840) @@ -130,17 +130,17 @@ return contextEntryDef; } - public static <K, V> JAXXContextEntryDef<Map> newMapContextEntryDef( + public static <K, V> JAXXContextEntryDef<Map<K, V>> newMapContextEntryDef( String name) { - Class<Map> mapClass = Map.class; - JAXXContextEntryDef<Map> contextEntryDef = - new JAXXContextEntryDef<Map>(name, mapClass); + Class<Map<K, V>> mapClass = castMap(); + JAXXContextEntryDef<Map<K, V>> contextEntryDef = + new JAXXContextEntryDef<Map<K, V>>(name, mapClass); return contextEntryDef; } @SuppressWarnings({"unchecked"}) - protected static Class<Map> castMap() { - return Map.class; + protected static<K, V> Class<Map<K, V>> castMap() { + return (Class<Map<K, V>>) Collections.emptyMap().getClass(); } @SuppressWarnings({"unchecked"})