Author: mukulg
Date: Tue Mar 13 10:19:25 2012
New Revision: 1300055
URL: http://svn.apache.org/viewvc?rev=1300055&view=rev
Log:
doing some minor refactoring and cleanup of schema 1.1 code base.
Added:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XS11TypeHelper.java
- copied, changed from r1234360,
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSTypeHelper.java
Removed:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSTypeHelper.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDAssertionValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertionXPath2ValueImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java?rev=1300055&r1=1300054&r2=1300055&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java
Tue Mar 13 10:19:25 2012
@@ -27,7 +27,7 @@ import javax.xml.XMLConstants;
import org.apache.xerces.impl.Constants;
import org.apache.xerces.impl.xs.assertion.XSAssertImpl;
import org.apache.xerces.impl.xs.traversers.XSDHandler;
-import org.apache.xerces.impl.xs.util.XSTypeHelper;
+import org.apache.xerces.impl.xs.util.XS11TypeHelper;
import org.apache.xerces.util.NamespaceSupport;
import org.apache.xerces.xs.XSModel;
import org.eclipse.wst.xml.xpath2.processor.DefaultDynamicContext;
@@ -164,10 +164,10 @@ public class AbstractPsychoPathXPath2Imp
} catch (XPathParserException ex) {
// XPath parser exception
if
(SchemaSymbols.XS11_XPATHEXPR_COMPILE_WRN_MESG_1.equals(ex.getMessage())) {
- fSchemaHandler.reportSchemaWarning("cvc-xpath.3.13.4.2b", new
Object[] {assertImpl.getTest().getXPathStr(),
XSTypeHelper.getSchemaTypeName(assertImpl.getTypeDefinition())},
schemaContextElem);
+ fSchemaHandler.reportSchemaWarning("cvc-xpath.3.13.4.2b", new
Object[] {assertImpl.getTest().getXPathStr(),
XS11TypeHelper.getSchemaTypeName(assertImpl.getTypeDefinition())},
schemaContextElem);
}
else {
- fSchemaHandler.reportSchemaError("cvc-xpath.3.13.4.2a", new
Object[] {assertImpl.getTest().getXPathStr(),
XSTypeHelper.getSchemaTypeName(assertImpl.getTypeDefinition())},
schemaContextElem);
+ fSchemaHandler.reportSchemaError("cvc-xpath.3.13.4.2a", new
Object[] {assertImpl.getTest().getXPathStr(),
XS11TypeHelper.getSchemaTypeName(assertImpl.getTypeDefinition())},
schemaContextElem);
}
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java?rev=1300055&r1=1300054&r2=1300055&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
Tue Mar 13 10:19:25 2012
@@ -36,7 +36,7 @@ import org.apache.xerces.impl.xs.asserti
import org.apache.xerces.impl.xs.assertion.XSAssert;
import org.apache.xerces.impl.xs.assertion.XSAssertImpl;
import org.apache.xerces.impl.xs.util.ObjectListImpl;
-import org.apache.xerces.impl.xs.util.XSTypeHelper;
+import org.apache.xerces.impl.xs.util.XS11TypeHelper;
import org.apache.xerces.xni.Augmentations;
import org.apache.xerces.xni.QName;
import org.apache.xerces.xni.XMLAttributes;
@@ -408,7 +408,7 @@ public class XMLAssertPsychopathXPath2Im
*/
private void evaluateAssertsFromItemTypeOfSTList(QName element,
XSSimpleTypeDefinition listItemType, String value) throws Exception {
- Vector itemTypeAsserts =
XSTypeHelper.getAssertsFromSimpleType(listItemType);
+ Vector itemTypeAsserts =
XS11TypeHelper.getAssertsFromSimpleType(listItemType);
if (listItemType.getVariety() ==
XSSimpleTypeDefinition.VARIETY_ATOMIC && itemTypeAsserts.size() > 0) {
for (int assertIdx = 0; assertIdx < itemTypeAsserts.size();
assertIdx++) {
XSAssertImpl itemTypeAssert = (XSAssertImpl)
itemTypeAsserts.get(assertIdx);
@@ -511,7 +511,7 @@ public class XMLAssertPsychopathXPath2Im
savePsviInfoWithUntypingOfAssertRoot(elemPsvi, true);
} else {
// complex type with complex content. set xpath context variable
$value to an empty sequence.
- fXpath2DynamicContext.set_variable(new
org.eclipse.wst.xml.xpath2.processor.internal.types.QName("value"),
XSTypeHelper.getXPath2ResultSequence(new ArrayList()));
+ fXpath2DynamicContext.set_variable(new
org.eclipse.wst.xml.xpath2.processor.internal.types.QName("value"),
XS11TypeHelper.getXPath2ResultSequence(new ArrayList()));
}
XSObjectList assertList = (XSObjectList) assertions;
@@ -540,7 +540,7 @@ public class XMLAssertPsychopathXPath2Im
simpleTypeDefn = (XSSimpleTypeDefinition) xsTypeDefn;
}
XSComplexTypeDefinition complexTypeDef =
(XSComplexTypeDefinition)elemPsvi.getTypeDefinition();
- if
(XSTypeHelper.isComplexTypeDerivedFromSTList(complexTypeDef,
XSConstants.DERIVATION_EXTENSION)) {
+ if
(XS11TypeHelper.isComplexTypeDerivedFromSTList(complexTypeDef,
XSConstants.DERIVATION_EXTENSION)) {
// reassign value to simple type instance
simpleTypeDefn =
(XSSimpleTypeDefinition)complexTypeDef.getBaseType();
}
@@ -621,7 +621,7 @@ public class XMLAssertPsychopathXPath2Im
XSSimpleTypeDefinition memType = (XSSimpleTypeDefinition)
memberTypes.item(memberTypeIdx);
// check for assertions on types in an non-schema namespace
- if
(!SchemaSymbols.URI_SCHEMAFORSCHEMA.equals(memType.getNamespace()) &&
XSTypeHelper.simpleTypeHasAsserts(memType)) {
+ if
(!SchemaSymbols.URI_SCHEMAFORSCHEMA.equals(memType.getNamespace()) &&
XS11TypeHelper.simpleTypeHasAsserts(memType)) {
XSObjectList memberTypeFacets = memType.getMultiValueFacets();
final int memberTypeFacetsLength =
memberTypeFacets.getLength();
for (int memberTypeFacetIdx = 0; memberTypeFacetIdx <
memberTypeFacetsLength; memberTypeFacetIdx++) {
@@ -706,7 +706,7 @@ public class XMLAssertPsychopathXPath2Im
exceptionMesg = exceptionMesg + ".";
}
- String typeNameStr =
XSTypeHelper.getSchemaTypeName(assertImpl.getTypeDefinition());
+ String typeNameStr =
XS11TypeHelper.getSchemaTypeName(assertImpl.getTypeDefinition());
String elemNameAnnotation = element.rawname;
if (assertImpl.getAttrName() != null) {
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java?rev=1300055&r1=1300054&r2=1300055&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
Tue Mar 13 10:19:25 2012
@@ -54,7 +54,7 @@ import org.apache.xerces.impl.xs.models.
import org.apache.xerces.impl.xs.models.XSCMValidator;
import org.apache.xerces.impl.xs.util.ObjectListImpl;
import org.apache.xerces.impl.xs.util.XSObjectListImpl;
-import org.apache.xerces.impl.xs.util.XSTypeHelper;
+import org.apache.xerces.impl.xs.util.XS11TypeHelper;
import org.apache.xerces.util.AugmentationsImpl;
import org.apache.xerces.util.IntStack;
import org.apache.xerces.util.SymbolTable;
@@ -5118,7 +5118,7 @@ public class XMLSchemaValidator
*/
private void extraCheckForSTUnionAsserts(XSSimpleType simpleTypeDv, String
content, ValidatedInfo validatedInfo, Augmentations augs) {
if (simpleTypeDv.getVariety() == XSSimpleTypeDefinition.VARIETY_UNION
&& ((XSSimpleType) simpleTypeDv.getBaseType()).getVariety() !=
XSSimpleTypeDefinition.VARIETY_UNION) {
- if
(XSTypeHelper.isAtomicStrValueValidForSTUnion(simpleTypeDv.getMemberTypes(),
content, validatedInfo, Constants.SCHEMA_VERSION_1_1)) {
+ if
(XS11TypeHelper.isAtomicStrValueValidForSTUnion(simpleTypeDv.getMemberTypes(),
content, validatedInfo, Constants.SCHEMA_VERSION_1_1)) {
fIsAssertProcessingNeededForSTUnion = false;
}
if (augs != null) {
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDAssertionValidator.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDAssertionValidator.java?rev=1300055&r1=1300054&r2=1300055&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDAssertionValidator.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDAssertionValidator.java
Tue Mar 13 10:19:25 2012
@@ -29,7 +29,7 @@ import org.apache.xerces.impl.xs.asserti
import org.apache.xerces.impl.xs.assertion.XSAssert;
import org.apache.xerces.impl.xs.assertion.XSAssertImpl;
import org.apache.xerces.impl.xs.util.XSObjectListImpl;
-import org.apache.xerces.impl.xs.util.XSTypeHelper;
+import org.apache.xerces.impl.xs.util.XS11TypeHelper;
import org.apache.xerces.util.AugmentationsImpl;
import org.apache.xerces.util.NamespaceSupport;
import org.apache.xerces.xni.Augmentations;
@@ -210,14 +210,14 @@ public class XSDAssertionValidator {
if (simpleContentType != null) {
if (complexTypeDef.getDerivationMethod() ==
XSConstants.DERIVATION_RESTRICTION) {
// add assertions for complexType -> simpleContent ->
restriction cases
- Vector simpleContentAsserts =
XSTypeHelper.getAssertsFromSimpleType(simpleContentType);
+ Vector simpleContentAsserts =
XS11TypeHelper.getAssertsFromSimpleType(simpleContentType);
for (int assertIdx = 0; assertIdx <
simpleContentAsserts.size(); assertIdx++) {
complexTypeAsserts.addXSObject((XSAssert)
simpleContentAsserts.get(assertIdx));
}
}
- else if
(XSTypeHelper.isComplexTypeDerivedFromSTList(complexTypeDef,
XSConstants.DERIVATION_EXTENSION)) {
+ else if
(XS11TypeHelper.isComplexTypeDerivedFromSTList(complexTypeDef,
XSConstants.DERIVATION_EXTENSION)) {
// add assertions from the list->itemType of base schema
simple type
- Vector baseItemTypeAsserts =
XSTypeHelper.getAssertsFromSimpleType(((XSSimpleTypeDefinition)complexTypeDef.getBaseType()).getItemType());
+ Vector baseItemTypeAsserts =
XS11TypeHelper.getAssertsFromSimpleType(((XSSimpleTypeDefinition)complexTypeDef.getBaseType()).getItemType());
for (int assertIdx = 0; assertIdx <
baseItemTypeAsserts.size(); assertIdx++) {
complexTypeAsserts.addXSObject((XSAssert)
baseItemTypeAsserts.get(assertIdx));
}
@@ -251,7 +251,7 @@ public class XSDAssertionValidator {
Augmentations attrAugs = attributes.getAugmentations(attrIndx);
AttributePSVImpl attrPSVI = (AttributePSVImpl)
attrAugs.getItem(Constants.ATTRIBUTE_PSVI);
XSSimpleTypeDefinition attrType = (XSSimpleTypeDefinition)
attrPSVI.getTypeDefinition();
- if (attrType != null &&
!XSTypeHelper.isListContainsType(xsTypeList, attrType)) {
+ if (attrType != null &&
!XS11TypeHelper.isListContainsType(xsTypeList, attrType)) {
// since different attributes may be validated by the same
type, so we deduplicate the type list here
// to only store unique assertions.
xsTypeList.add(attrType);
@@ -318,7 +318,7 @@ public class XSDAssertionValidator {
for (int memberTypeIdx = 0; memberTypeIdx <
unionMemberTypes.getLength(); memberTypeIdx++) {
XSSimpleTypeDefinition unionMemberType = (XSSimpleTypeDefinition)
unionMemberTypes.item(memberTypeIdx);
if
(!SchemaSymbols.URI_SCHEMAFORSCHEMA.equals(unionMemberType.getNamespace())) {
- Vector memberTypeAsserts =
XSTypeHelper.getAssertsFromSimpleType(unionMemberType);
+ Vector memberTypeAsserts =
XS11TypeHelper.getAssertsFromSimpleType(unionMemberType);
if (!memberTypeAsserts.isEmpty()) {
assertImpl = (XSAssertImpl) memberTypeAsserts.get(0);
break;
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java?rev=1300055&r1=1300054&r2=1300055&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java
Tue Mar 13 10:19:25 2012
@@ -21,7 +21,7 @@ import java.util.Vector;
import org.apache.xerces.impl.xs.alternative.Test;
import org.apache.xerces.impl.xs.alternative.XSTypeAlternativeImpl;
-import org.apache.xerces.impl.xs.util.XSTypeHelper;
+import org.apache.xerces.impl.xs.util.XS11TypeHelper;
import org.apache.xerces.util.XMLAttributesImpl;
import org.apache.xerces.xni.NamespaceContext;
import org.apache.xerces.xni.QName;
@@ -116,7 +116,7 @@ public class XSDTypeAlternativeValidator
private boolean isInheritedAttributeOverridden(XMLAttributes attributes,
XSAttributeDeclaration inhrAttrDecl) {
boolean attrExists = false;
for (int attrIndx = 0; attrIndx < attributes.getLength(); attrIndx++)
{
- if
((attributes.getLocalName(attrIndx)).equals(inhrAttrDecl.getName()) &&
XSTypeHelper.isURIEqual(attributes.getURI(attrIndx),
inhrAttrDecl.getNamespace())) {
+ if
((attributes.getLocalName(attrIndx)).equals(inhrAttrDecl.getName()) &&
XS11TypeHelper.isURIEqual(attributes.getURI(attrIndx),
inhrAttrDecl.getNamespace())) {
attrExists = true;
break;
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java?rev=1300055&r1=1300054&r2=1300055&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java
Tue Mar 13 10:19:25 2012
@@ -19,7 +19,7 @@ package org.apache.xerces.impl.xs.assert
import org.apache.xerces.impl.xs.AbstractPsychoPathXPath2Impl;
import org.apache.xerces.impl.xs.traversers.XSDHandler;
-import org.apache.xerces.impl.xs.util.XSTypeHelper;
+import org.apache.xerces.impl.xs.util.XS11TypeHelper;
import org.apache.xerces.util.NamespaceSupport;
import org.apache.xerces.xs.XSConstants;
import org.apache.xerces.xs.XSNamespaceItem;
@@ -230,7 +230,7 @@ public class XSAssertImpl extends Abstra
String currXpathStr = this.getTest().getXPathStr();
// if type and the xpath string are same, the asserts are equal
- if
(XSTypeHelper.isSchemaTypesIdentical(pAssertion.getTypeDefinition(),
fTypeDefinition) &&
+ if
(XS11TypeHelper.isSchemaTypesIdentical(pAssertion.getTypeDefinition(),
fTypeDefinition) &&
currXpathStr.equals(xpathStr)) {
returnVal = true;
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertionXPath2ValueImpl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertionXPath2ValueImpl.java?rev=1300055&r1=1300054&r2=1300055&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertionXPath2ValueImpl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertionXPath2ValueImpl.java
Tue Mar 13 10:19:25 2012
@@ -25,7 +25,7 @@ import org.apache.xerces.dom.PSVIElement
import org.apache.xerces.impl.Constants;
import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.impl.xs.SchemaSymbols;
-import org.apache.xerces.impl.xs.util.XSTypeHelper;
+import org.apache.xerces.impl.xs.util.XS11TypeHelper;
import org.apache.xerces.util.XMLChar;
import org.apache.xerces.xs.ElementPSVI;
import org.apache.xerces.xs.XSComplexTypeDefinition;
@@ -123,7 +123,7 @@ public class XSAssertionXPath2ValueImpl
String itemValue = listStrTokens.nextToken();
xdmItemList.add(SchemaTypeValueFactory.newSchemaTypeValue(listOrUnionType.getBuiltInKind(),
itemValue));
}
- xpath2DynamicContext.set_variable(new
org.eclipse.wst.xml.xpath2.processor.internal.types.QName("value"),
XSTypeHelper.getXPath2ResultSequence(xdmItemList));
+ xpath2DynamicContext.set_variable(new
org.eclipse.wst.xml.xpath2.processor.internal.types.QName("value"),
XS11TypeHelper.getXPath2ResultSequence(xdmItemList));
}
else {
xsdTypecode = getXercesXSDTypeCodeFor$value(listOrUnionType);
@@ -144,7 +144,7 @@ public class XSAssertionXPath2ValueImpl
}
else if (typeDef instanceof XSComplexTypeDefinition &&
((XSComplexTypeDefinition) typeDef).getSimpleType() == null) {
// set xpath context variable $value to an empty sequence
- xpath2DynamicContext.set_variable(new
org.eclipse.wst.xml.xpath2.processor.internal.types.QName("value"),
XSTypeHelper.getXPath2ResultSequence(new ArrayList()));
+ xpath2DynamicContext.set_variable(new
org.eclipse.wst.xml.xpath2.processor.internal.types.QName("value"),
XS11TypeHelper.getXPath2ResultSequence(new ArrayList()));
}
else {
xsdTypecode = getXercesXSDTypeCodeFor$value(typeDef);
@@ -192,7 +192,7 @@ public class XSAssertionXPath2ValueImpl
// first, and set the type annotation of XPath2 context variable
$value with this member type definition.
for (int memTypeIdx = 0; memTypeIdx < memberTypes.getLength();
memTypeIdx++) {
XSSimpleType simpleTypeDv = (XSSimpleType)
memberTypes.item(memTypeIdx);
- if (XSTypeHelper.isStrValueValidForASimpleType(value,
simpleTypeDv, Constants.SCHEMA_VERSION_1_1)) {
+ if (XS11TypeHelper.isStrValueValidForASimpleType(value,
simpleTypeDv, Constants.SCHEMA_VERSION_1_1)) {
setXDMTypedValueOf$valueForSTVarietyAtomic(value,
getXercesXSDTypeCodeFor$value(simpleTypeDv), xpath2DynamicContext);
break;
}
@@ -232,7 +232,7 @@ public class XSAssertionXPath2ValueImpl
}
// assign an XPath2 sequence to xpath context variable $value
- xpath2DynamicContext.set_variable(new
org.eclipse.wst.xml.xpath2.processor.internal.types.QName("value"),
XSTypeHelper.getXPath2ResultSequence(xdmItemList));
+ xpath2DynamicContext.set_variable(new
org.eclipse.wst.xml.xpath2.processor.internal.types.QName("value"),
XS11TypeHelper.getXPath2ResultSequence(xdmItemList));
}
else if (complexTypeSimplContentType.getVariety() ==
XSSimpleTypeDefinition.VARIETY_UNION) {
// simple content type has variety xs:union
@@ -291,7 +291,7 @@ public class XSAssertionXPath2ValueImpl
final int memberTypesLength = memberTypes.getLength();
for (int memTypeIdx = 0; memTypeIdx < memberTypesLength; memTypeIdx++)
{
XSSimpleType memSimpleType = (XSSimpleType)
memberTypes.item(memTypeIdx);
- if (XSTypeHelper.isStrValueValidForASimpleType(xdmItemStrValue,
memSimpleType, Constants.SCHEMA_VERSION_1_1)) {
+ if (XS11TypeHelper.isStrValueValidForASimpleType(xdmItemStrValue,
memSimpleType, Constants.SCHEMA_VERSION_1_1)) {
// no more memberTypes need to be checked
xdmItemType = memSimpleType;
break;
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java?rev=1300055&r1=1300054&r2=1300055&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/opti/SchemaDOMParser.java
Tue Mar 13 10:19:25 2012
@@ -28,7 +28,7 @@ import org.apache.xerces.impl.Constants;
import org.apache.xerces.impl.XMLErrorReporter;
import org.apache.xerces.impl.xs.SchemaSymbols;
import org.apache.xerces.impl.xs.XSMessageFormatter;
-import org.apache.xerces.impl.xs.util.XSTypeHelper;
+import org.apache.xerces.impl.xs.util.XS11TypeHelper;
import org.apache.xerces.util.XMLAttributesImpl;
import org.apache.xerces.util.XMLChar;
import org.apache.xerces.xni.Augmentations;
@@ -809,7 +809,7 @@ public class SchemaDOMParser extends Def
while (st.hasMoreTokens()) {
String QNameStr = st.nextToken();
- XSTypeHelper.validateQNameValue(QNameStr, fNamespaceContext,
fErrorReporter);
+ XS11TypeHelper.validateQNameValue(QNameStr, fNamespaceContext,
fErrorReporter);
stringTokens.add(QNameStr);
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java?rev=1300055&r1=1300054&r2=1300055&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
Tue Mar 13 10:19:25 2012
@@ -38,7 +38,7 @@ import org.apache.xerces.impl.xs.asserti
import org.apache.xerces.impl.xs.assertion.XSAssertImpl;
import org.apache.xerces.impl.xs.util.XInt;
import org.apache.xerces.impl.xs.util.XSObjectListImpl;
-import org.apache.xerces.impl.xs.util.XSTypeHelper;
+import org.apache.xerces.impl.xs.util.XS11TypeHelper;
import org.apache.xerces.util.DOMUtil;
import org.apache.xerces.util.NamespaceSupport;
import org.apache.xerces.util.SymbolTable;
@@ -535,7 +535,7 @@ abstract class XSDAbstractTraverser {
assertData.addElement(assertImpl);
} else {
// 'test' attribute is mandatory on an <assertion> element
- reportSchemaError("src-assert.3.13.1", new Object[] {
DOMUtil.getLocalName(content), XSTypeHelper.getSchemaTypeName(typeDef) },
content);
+ reportSchemaError("src-assert.3.13.1", new Object[] {
DOMUtil.getLocalName(content), XS11TypeHelper.getSchemaTypeName(typeDef) },
content);
}
} else {
if (facet.equals(SchemaSymbols.ELT_MINLENGTH)) {
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java?rev=1300055&r1=1300054&r2=1300055&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
Tue Mar 13 10:19:25 2012
@@ -42,7 +42,7 @@ import org.apache.xerces.impl.xs.asserti
import org.apache.xerces.impl.xs.assertion.XSAssertImpl;
import org.apache.xerces.impl.xs.util.XInt;
import org.apache.xerces.impl.xs.util.XSObjectListImpl;
-import org.apache.xerces.impl.xs.util.XSTypeHelper;
+import org.apache.xerces.impl.xs.util.XS11TypeHelper;
import org.apache.xerces.util.DOMUtil;
import org.apache.xerces.util.XMLChar;
import org.apache.xerces.util.XMLSymbols;
@@ -1762,7 +1762,7 @@ class XSDComplexTypeTraverser extends X
}
} else {
// 'test' attribute is mandatory on an <assert> element
- reportSchemaError("src-assert.3.13.1", new Object[] {
DOMUtil.getLocalName(assertElement),
XSTypeHelper.getSchemaTypeName(enclosingCT) }, assertElement);
+ reportSchemaError("src-assert.3.13.1", new Object[] {
DOMUtil.getLocalName(assertElement),
XS11TypeHelper.getSchemaTypeName(enclosingCT) }, assertElement);
}
fAttrChecker.returnAttrArray(attrValues, schemaDoc);
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java?rev=1300055&r1=1300054&r2=1300055&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java
Tue Mar 13 10:19:25 2012
@@ -33,7 +33,7 @@ import org.apache.xerces.impl.xs.XSEleme
import org.apache.xerces.impl.xs.alternative.Test;
import org.apache.xerces.impl.xs.alternative.XSTypeAlternativeImpl;
import org.apache.xerces.impl.xs.util.XSObjectListImpl;
-import org.apache.xerces.impl.xs.util.XSTypeHelper;
+import org.apache.xerces.impl.xs.util.XS11TypeHelper;
import org.apache.xerces.util.DOMUtil;
import org.apache.xerces.util.NamespaceSupport;
import org.apache.xerces.util.XMLSymbols;
@@ -180,7 +180,7 @@ class XSDTypeAlternativeTraverser extend
if
(!fSchemaHandler.fXSConstraints.checkTypeDerivationOk(alternativeType,
element.fType, block)) {
reportSchemaError(
"e-props-correct.7",
- new Object[] {element.getName(),
XSTypeHelper.getSchemaTypeName(alternativeType),
XSTypeHelper.getSchemaTypeName(element.fType)},
+ new Object[] {element.getName(),
XS11TypeHelper.getSchemaTypeName(alternativeType),
XS11TypeHelper.getSchemaTypeName(element.fType)},
altElement);
// fall back to element declaration's type
alternativeType = element.fType;
Copied:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XS11TypeHelper.java
(from r1234360,
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSTypeHelper.java)
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XS11TypeHelper.java?p2=xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XS11TypeHelper.java&p1=xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSTypeHelper.java&r1=1234360&r2=1300055&rev=1300055&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSTypeHelper.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XS11TypeHelper.java
Tue Mar 13 10:19:25 2012
@@ -51,7 +51,7 @@ import org.eclipse.wst.xml.xpath2.proces
* @author Mukul Gandhi, IBM
* @version $Id$
*/
-public class XSTypeHelper {
+public class XS11TypeHelper {
/*
* Checks if the two schema type components are identical.
@@ -100,7 +100,7 @@ public class XSTypeHelper {
// to the 1st available type in union's member type collection, is
sufficient to achieve the objective of this method.
for (int memTypeIdx = 0; memTypeIdx < memberTypes.getLength();
memTypeIdx++) {
XSSimpleType simpleTypeDv = (XSSimpleType)
memberTypes.item(memTypeIdx);
- if
(SchemaSymbols.URI_SCHEMAFORSCHEMA.equals(simpleTypeDv.getNamespace()) &&
XSTypeHelper.isStrValueValidForASimpleType(content, simpleTypeDv,
schemaVersion)) {
+ if
(SchemaSymbols.URI_SCHEMAFORSCHEMA.equals(simpleTypeDv.getNamespace()) &&
XS11TypeHelper.isStrValueValidForASimpleType(content, simpleTypeDv,
schemaVersion)) {
isValueValid = true;
validatedInfo.memberType = simpleTypeDv;
break;
@@ -147,16 +147,12 @@ public class XSTypeHelper {
String prefix = parsedQname[0];
String localpart = parsedQname[1];
- // both prefix (if any) and localpart must be valid NCName
- if (prefix.length() > 0 && !XMLChar.isValidNCName(prefix)) {
+ // both prefix (if any) and localpart of QName, must be valid NCName
+ if ((prefix.length() > 0 && !XMLChar.isValidNCName(prefix)) ||
!XMLChar.isValidNCName(localpart)) {
errorReporter.reportError(XSMessageFormatter.SCHEMA_DOMAIN,
"cvc-datatype-valid.1.2.1", new Object[] {qNameStr, "QName"},
XMLErrorReporter.SEVERITY_ERROR);
}
- if(!XMLChar.isValidNCName(localpart)) {
- errorReporter.reportError(XSMessageFormatter.SCHEMA_DOMAIN,
"cvc-datatype-valid.1.2.1", new Object[] {qNameStr, "QName"},
XMLErrorReporter.SEVERITY_ERROR);
- }
-
- // resove prefix to a uri, report an error if failed
+ // try to resolve QName prefix to a namespace URI, and report an error
if resolution fails.
String uri = namespaceContext.getURI(prefix.intern());
if (prefix.length() > 0 && uri == null) {
errorReporter.reportError(XSMessageFormatter.SCHEMA_DOMAIN,
"UndeclaredPrefix", new Object[] {qNameStr, prefix},
XMLErrorReporter.SEVERITY_ERROR);
@@ -238,7 +234,7 @@ public class XSTypeHelper {
boolean typeExists = false;
for (Iterator iter = typeList.iterator(); iter.hasNext();) {
- if (XSTypeHelper.isSchemaTypesIdentical((XSTypeDefinition)
iter.next(), targetType)) {
+ if (XS11TypeHelper.isSchemaTypesIdentical((XSTypeDefinition)
iter.next(), targetType)) {
typeExists = true;
break;
}
@@ -253,8 +249,9 @@ public class XSTypeHelper {
*/
public static boolean
isComplexTypeDerivedFromSTList(XSComplexTypeDefinition complexTypeDef, short
derivationMethod) {
- return complexTypeDef.getDerivationMethod() == derivationMethod &&
complexTypeDef.getBaseType() instanceof XSSimpleTypeDefinition &&
-
((XSSimpleTypeDefinition)complexTypeDef.getBaseType()).getVariety() ==
XSSimpleTypeDefinition.VARIETY_LIST;
+ XSTypeDefinition baseType = complexTypeDef.getBaseType();
+ return complexTypeDef.getDerivationMethod() == derivationMethod &&
baseType instanceof XSSimpleTypeDefinition &&
+ ((XSSimpleTypeDefinition)baseType).getVariety() ==
XSSimpleTypeDefinition.VARIETY_LIST;
} // isComplexTypeDerivedFromSTList
@@ -282,8 +279,9 @@ public class XSTypeHelper {
* Check if a simpleType definition is one of special types (i.e
xs:anyAtomicType or xs:anySimpleType).
*/
public static boolean isSpecialSimpleType(XSSimpleType simpleType) {
- boolean isSpecialSimpleType = false;
- if (Constants.NS_XMLSCHEMA.equals(simpleType.getNamespace()) &&
(SchemaSymbols.ATTVAL_ANYATOMICTYPE.equals(simpleType.getName()) ||
SchemaSymbols.ATTVAL_ANYSIMPLETYPE.equals(simpleType.getName()))) {
+ boolean isSpecialSimpleType = false;
+ String typeName = simpleType.getName();
+ if (Constants.NS_XMLSCHEMA.equals(simpleType.getNamespace()) &&
(SchemaSymbols.ATTVAL_ANYATOMICTYPE.equals(typeName) ||
SchemaSymbols.ATTVAL_ANYSIMPLETYPE.equals(typeName))) {
isSpecialSimpleType = true;
}
return isSpecialSimpleType;
@@ -306,4 +304,4 @@ public class XSTypeHelper {
} // getXPath2ResultSequence
-} // class XSTypeHelper
+} // class XS11TypeHelper
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org
For additional commands, e-mail: commits-h...@xerces.apache.org
