Index: lutinutil/src/java/org/codelutin/util/EnumEditor.java diff -u lutinutil/src/java/org/codelutin/util/EnumEditor.java:1.3 lutinutil/src/java/org/codelutin/util/EnumEditor.java:1.4 --- lutinutil/src/java/org/codelutin/util/EnumEditor.java:1.3 Sun Feb 24 18:47:38 2008 +++ lutinutil/src/java/org/codelutin/util/EnumEditor.java Sun Feb 24 19:31:44 2008 @@ -18,6 +18,8 @@ * ##% */ package org.codelutin.util; +import static org.codelutin.util.CollectionUtil.toGenericSet; + import javax.swing.JComboBox; import java.util.EnumSet; @@ -30,16 +32,18 @@ protected Class> type; - public static > EnumEditor newEditor(Class type) { + public static EnumEditor newEditor(Class type) { return new EnumEditor(type); } - public > EnumEditor(Class type) { + public EnumEditor(Class type) { super(buildModel(type)); } - protected static > Enum[] buildModel(Class type) { - EnumSet result = EnumSet.allOf(type); - return result.toArray(new Enum[result.size()]); + protected static Object[] buildModel(Class type) { + Class enumClass = ReflectUtil.getEnumClass(type); + EnumSet result = EnumSet.allOf(enumClass); + return toGenericSet(result,Object.class).toArray(new Object[result.size()]); } + }