--- jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty.java 2005-09-27 02:37:21.000000000 +0200 +++ jaxb-ri/xjc/src/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty.java-gil 2010-03-22 10:26:08.000000000 +0100 @@ -40,12 +40,14 @@ import com.sun.xml.xsom.XSComponent; import com.sun.xml.xsom.XSContentType; 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.XSSchema; import com.sun.xml.xsom.XSSimpleType; import com.sun.xml.xsom.XSWildcard; +import com.sun.xml.xsom.XSXPath; import com.sun.xml.xsom.util.XSFinder; import com.sun.xml.xsom.visitor.XSFunction; @@ -321,15 +323,15 @@ return b?Boolean.TRUE:Boolean.FALSE; } - public Object attributeDecl(XSAttributeDecl decl) { + public Boolean attributeDecl(XSAttributeDecl decl) { return toBoolean(decl.getFixedValue()!=null); } - public Object attributeUse(XSAttributeUse use) { + public Boolean attributeUse(XSAttributeUse use) { return toBoolean(use.getFixedValue()!=null); } - public Object schema(XSSchema s) { + public Boolean schema(XSSchema s) { // we allow globalBindings to have isConstantProperty==true, // so this method returns true to allow this. return Boolean.TRUE; @@ -421,6 +423,14 @@ return null; } + public Object identityConstraint(XSIdentityConstraint decl) { + return null; + } + + public Object xpath(XSXPath xpath) { + return null; + } + // delegates to the context schema object public Object attributeDecl(XSAttributeDecl decl) { return decl.getOwnerSchema(); } public Object wildcard(XSWildcard wc) { return wc.getOwnerSchema(); }