diff -uNr ../srcold/com/sun/tools/xjc/addon/collection_setter_injector/PluginImpl.java ./com/sun/tools/xjc/addon/collection_setter_injector/PluginImpl.java
--- ../srcold/com/sun/tools/xjc/addon/collection_setter_injector/PluginImpl.java	2009-07-24 16:55:49.000000000 -0700
+++ ./com/sun/tools/xjc/addon/collection_setter_injector/PluginImpl.java	2009-07-24 15:52:24.000000000 -0700
@@ -35,7 +35,6 @@
 import com.sun.tools.xjc.Plugin;
 import com.sun.tools.xjc.generator.bean.ClassOutlineImpl;
 import com.sun.tools.xjc.generator.bean.MethodWriter;
-import com.sun.tools.xjc.generator.bean.field.UntypedListField;
 import com.sun.tools.xjc.model.CPropertyInfo;
 import com.sun.tools.xjc.model.CTypeInfo;
 import com.sun.tools.xjc.outline.Aspect;
@@ -138,8 +137,8 @@
             if (null != (fo = co.getDeclaredFields()) &&
                     0 < fo.length){
                 for (int i = 0; i < fo.length; i++) {
-                    if (fo[i] instanceof UntypedListField){
-                        declareMethod((ClassOutlineImpl) co, (UntypedListField) fo[i]);
+                    if (fo[i].getPropertyInfo().isCollection()) {
+                        declareMethod((ClassOutlineImpl) co, fo[i]);
                     }
                 }
             }
@@ -162,7 +161,7 @@
      *        be correctly encoded by {@link java.beans.XMLEncoder}
      *        based routines
      */
-    private void declareMethod(ClassOutlineImpl context, UntypedListField field){
+    private void declareMethod(ClassOutlineImpl context, FieldOutline field){
         
         MethodWriter writer = context.createMethodWriter();
         Map <String,JFieldVar> fields = null;