Author: tchemit Date: 2010-04-14 16:46:41 +0200 (Wed, 14 Apr 2010) New Revision: 1841 Log: - fix cast error when Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.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 13:42:42 UTC (rev 1840) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java 2010-04-14 14:46:41 UTC (rev 1841) @@ -32,7 +32,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; import java.awt.*; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListenerProxy; @@ -132,9 +131,8 @@ public static <K, V> JAXXContextEntryDef<Map<K, V>> newMapContextEntryDef( String name) { - Class<Map<K, V>> mapClass = castMap(); JAXXContextEntryDef<Map<K, V>> contextEntryDef = - new JAXXContextEntryDef<Map<K, V>>(name, mapClass); + new JAXXContextEntryDef<Map<K, V>>(Map.class, name); return contextEntryDef; } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java 2010-04-14 13:42:42 UTC (rev 1840) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java 2010-04-14 14:46:41 UTC (rev 1841) @@ -29,6 +29,7 @@ import java.io.Serializable; import java.util.List; +import java.util.Map; import jaxx.runtime.JAXXContext; @@ -80,6 +81,18 @@ this(null, klass); } + /** + * Special constructor for map, otherwise it is not possible to cast to O + * + * @param mapClass map class + * @param name name of content + * @since 2.0.2 + */ + @SuppressWarnings({"unchecked"}) + public JAXXContextEntryDef(Class<Map> mapClass,String name) { + this(name, (Class<O>) mapClass); + } + @SuppressWarnings("unchecked") public JAXXContextEntryDef(String name, Class<O> klass) { if (klass == null) {