Author: mrglavas
Date: Mon Nov 16 05:44:44 2009
New Revision: 880595
URL: http://svn.apache.org/viewvc?rev=880595&view=rev
Log:
Replacing non-ASCII characters to fix compilation errors with Ant.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.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=880595&r1=880594&r2=880595&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
Mon Nov 16 05:44:44 2009
@@ -415,14 +415,14 @@
if (formAtt != null) {
reportSchemaError ("src-attribute.6.2", new Object[]
{nameAtt}, attrDecl);
}
- // 6.3 If the ancestor <schema> does not have a targetNamespace
[attribute] or its ·actual value· is different from the ·actual value· of
targetNamespace of <attribute>:
+ // 6.3 If the ancestor <schema> does not have a targetNamespace
[attribute] or its 'actual value' is different from the 'actual value' of
targetNamespace of <attribute>:
String schemaTns = schemaDoc.fTargetNamespace;
if (schemaTns==null || tnsAtt!=schemaTns) {
// 6.3.1 <attribute> must have <complexType> as an ancestor
if (enclCT == null) {
reportSchemaError ("src-attribute.6.3.1", new Object[]
{nameAtt}, attrDecl);
}
- // 6.3.2 There must be a <restriction> ancestor between the
<attribute> and the nearest <complexType> ancestor, and the ·actual value· of
the base [attribute] of <restriction> does not ·match· the name of ·xs:anyType·.
+ // 6.3.2 There must be a <restriction> ancestor between the
<attribute> and the nearest <complexType> ancestor, and the 'actual value' of
the base [attribute] of <restriction> does not 'match' the name of 'xs:anyType'.
else if ((enclCT.getDerivationMethod() !=
XSConstants.DERIVATION_RESTRICTION) || enclCT.getBaseType() ==
SchemaGrammar.getXSAnyType(fSchemaHandler.fSchemaVersion)) {
reportSchemaError ("src-attribute.6.3.2", new Object[]
{nameAtt}, attrDecl);
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java?rev=880595&r1=880594&r2=880595&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
Mon Nov 16 05:44:44 2009
@@ -518,14 +518,14 @@
if (formAtt != null) {
reportSchemaError ("src-element.4.2", new Object[] {nameAtt},
elmDecl);
}
- // 4.3 If the ancestor <schema> does not have a targetNamespace
[attribute] or its ·actual value· is different from the ·actual value· of
targetNamespace of <attribute>:
+ // 4.3 If the ancestor <schema> does not have a targetNamespace
[attribute] or its 'actual value' is different from the 'actual value' of
targetNamespace of <attribute>:
String schemaTns = schemaDoc.fTargetNamespace;
if (schemaTns==null || targetNsAtt!=schemaTns) {
// 4.3.1 <element> must have <complexType> as an ancestor
if (parent==null || !(parent instanceof XSComplexTypeDecl)) {
reportSchemaError ("src-element.4.3.1", new Object[]
{nameAtt}, elmDecl);
}
- // 4.3.2 There must be a <restriction> ancestor between the
<attribute> and the nearest <complexType> ancestor, and the ·actual value· of
the base [attribute] of <restriction> does not ·match· the name of ·xs:anyType·.
+ // 4.3.2 There must be a <restriction> ancestor between the
<attribute> and the nearest <complexType> ancestor, and the 'actual value' of
the base [attribute] of <restriction> does not 'match' the name of 'xs:anyType'.
else if ((((XSComplexTypeDecl)parent).getDerivationMethod() !=
XSConstants.DERIVATION_RESTRICTION) ||
(((XSComplexTypeDecl)parent).getBaseType() ==
SchemaGrammar.getXSAnyType(fSchemaHandler.fSchemaVersion))) {
reportSchemaError ("src-element.4.3.2", new Object[]
{nameAtt}, elmDecl);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
