--- jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/FieldBuilder.java 2005-09-10 20:20:34.000000000 +0200 +++ jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/FieldBuilder.java-gil 2010-03-22 10:14:29.000000000 +0100 @@ -55,12 +55,16 @@ import com.sun.xml.xsom.XSContentType; import com.sun.xml.xsom.XSDeclaration; import com.sun.xml.xsom.XSElementDecl; +import com.sun.xml.xsom.XSIdentityConstraint; import com.sun.xml.xsom.XSModelGroup; import com.sun.xml.xsom.XSModelGroupDecl; import com.sun.xml.xsom.XSParticle; import com.sun.xml.xsom.XSSimpleType; import com.sun.xml.xsom.XSTerm; import com.sun.xml.xsom.XSWildcard; +import com.sun.xml.xsom.XSXPath; +import com.sun.xml.xsom.impl.AnnotationImpl; +import com.sun.xml.xsom.impl.ForeignAttributesImpl; import com.sun.xml.xsom.impl.ModelGroupImpl; import com.sun.xml.xsom.impl.ParticleImpl; import com.sun.xml.xsom.impl.Ref; @@ -236,6 +240,13 @@ } + public Object identityConstraint(XSIdentityConstraint decl) { + return null; + } + + public Object xpath(XSXPath xpath) { + return null; + } @@ -335,9 +346,9 @@ } else { // make a shallow copy of this model group so that the class customization // attached to this model group won't be recognized by the particle builder. - XSModelGroup mg2 = new ModelGroupImpl( - (SchemaImpl)mg.getOwnerSchema(), null, mg.getLocator(), - mg.getCompositor(), mg.getChildren() ); + XSModelGroup mg2 = new ModelGroupImpl( + (SchemaImpl)mg.getOwnerSchema(), (AnnotationImpl)null, mg.getLocator(), + (ForeignAttributesImpl)null, mg.getCompositor(), (ParticleImpl[])mg.getChildren() ); return particle( makeParticle(mg2), null ); }