You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2011/01/18 19:32:56 UTC
svn commit: r1060521 -
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java
Author: knoaman
Date: Tue Jan 18 18:32:56 2011
New Revision: 1060521
URL: http://svn.apache.org/viewvc?rev=1060521&view=rev
Log:
Rolling back the changes in Revision 1058860, will use the S4S grammar instead
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java?rev=1060521&r1=1060520&r2=1060521&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java Tue Jan 18 18:32:56 2011
@@ -19,7 +19,6 @@ package org.apache.xerces.impl.xs.traver
import org.apache.xerces.impl.Constants;
import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
-import org.apache.xerces.impl.dv.SchemaDVFactory;
import org.apache.xerces.impl.dv.ValidatedInfo;
import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.impl.xs.SchemaGrammar;
@@ -64,8 +63,6 @@ import org.w3c.dom.Element;
*/
class XSDAttributeTraverser extends XSDAbstractTraverser {
- private static final String SCHEMA11_FACTORY_CLASS = "org.apache.xerces.impl.dv.xs.Schema11DVFactoryImpl";
-
public XSDAttributeTraverser (XSDHandler handler,
XSAttributeChecker gAttrCheck) {
super(handler, gAttrCheck);
@@ -91,13 +88,7 @@ class XSDAttributeTraverser extends XSDA
XSAnnotationImpl annotation = null;
if (attrDecl.getAttributeNode(SchemaSymbols.ATT_REF) != null) {
if (refAtt != null) {
- if (SchemaSymbols.URI_XSI.equals(refAtt.uri) && fSchemaHandler.fSchemaVersion == Constants.SCHEMA_VERSION_1_1) {
- SchemaDVFactory schemaFactory = SchemaDVFactory.getInstance(SCHEMA11_FACTORY_CLASS);
- attribute = getAttributeDeclForXSINamespace(refAtt.localpart, enclosingParent, schemaFactory);
- }
- else {
- attribute = (XSAttributeDecl)fSchemaHandler.getGlobalDecl(schemaDoc, XSDHandler.ATTRIBUTE_TYPE, refAtt, attrDecl);
- }
+ attribute = (XSAttributeDecl)fSchemaHandler.getGlobalDecl(schemaDoc, XSDHandler.ATTRIBUTE_TYPE, refAtt, attrDecl);
Element child = DOMUtil.getFirstChildElement(attrDecl);
if (child != null && DOMUtil.getLocalName(child).equals(SchemaSymbols.ELT_ANNOTATION)) {
@@ -230,36 +221,6 @@ class XSDAttributeTraverser extends XSDA
return attrUse;
}
- /*
- * Construct an XSAttributeDecl object for attributes in the namespace http://www.w3.org/2001/XMLSchema-instance.
- */
- private XSAttributeDecl getAttributeDeclForXSINamespace(String localpart, XSObject enclosingParent, SchemaDVFactory schemaFactory) {
-
- XSAttributeDecl attrDecl = new XSAttributeDecl();
-
- XSSimpleType anyURI = schemaFactory.getBuiltInType(SchemaSymbols.ATTVAL_ANYURI);
- if (SchemaSymbols.XSI_TYPE.equals(localpart)) {
- attrDecl.setValues(SchemaSymbols.XSI_TYPE, SchemaSymbols.URI_XSI, schemaFactory.getBuiltInType(SchemaSymbols.ATTVAL_QNAME),
- XSConstants.VC_NONE, XSConstants.SCOPE_GLOBAL, null, enclosingParent, null, false);
- }
- else if (SchemaSymbols.XSI_NIL.equals(localpart)) {
- attrDecl.setValues(SchemaSymbols.XSI_NIL, SchemaSymbols.URI_XSI, schemaFactory.getBuiltInType(SchemaSymbols.ATTVAL_BOOLEAN),
- XSConstants.VC_NONE, XSConstants.SCOPE_GLOBAL, null, enclosingParent, null, false);
- }
- else if (SchemaSymbols.XSI_SCHEMALOCATION.equals(localpart)) {
- attrDecl.setValues(SchemaSymbols.XSI_SCHEMALOCATION, SchemaSymbols.URI_XSI, schemaFactory.createTypeList("#AnonType_schemaLocation",
- SchemaSymbols.URI_XSI, (short)0, anyURI, null), XSConstants.VC_NONE, XSConstants.SCOPE_GLOBAL, null, enclosingParent,
- null, false);
- }
- else if (SchemaSymbols.XSI_NONAMESPACESCHEMALOCATION.equals(localpart)) {
- attrDecl.setValues(SchemaSymbols.XSI_NONAMESPACESCHEMALOCATION, SchemaSymbols.URI_XSI, anyURI, XSConstants.VC_NONE, XSConstants.SCOPE_GLOBAL,
- null, enclosingParent, null, false);
- }
-
- return attrDecl;
-
- } // getAttributeDeclForXSINamespace
-
protected XSAttributeDecl traverseGlobal(Element attrDecl,
XSDocumentInfo schemaDoc,
SchemaGrammar grammar) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org