Author: knoaman
Date: Wed Aug 31 18:38:35 2011
New Revision: 1163738
URL: http://svn.apache.org/viewvc?rev=1163738&view=rev
Log:
Support additional rules for EDC - Jira 1526
https://issues.apache.org/jira/browse/XERCESJ-1526
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSWildcardDecl.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSWildcardDecl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSWildcardDecl.java?rev=1163738&r1=1163737&r2=1163738&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSWildcardDecl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSWildcardDecl.java
Wed Aug 31 18:38:35 2011
@@ -127,14 +127,18 @@ public class XSWildcardDecl implements X
*
* Validation Rule: Wildcard allows Name
*/
- public boolean allowQName(QName name) {
+ final public boolean allowQName(QName name) {
+ return allowName(name.uri, name.localpart);
+ }
+
+ final public boolean allowName(String uri, String localPart) {
// 1 The namespace name is valid with respect to C, as defined in
Wildcard allows Namespace Name (3.10.4.3);
// 2 C.{disallowed names} does not contain E.
- if (allowNamespace(name.uri)) {
+ if (allowNamespace(uri)) {
if (fDisallowedNamesList == null || fDisallowedNamesList.length ==
0) {
return true;
}
- return isNameAllowed(name.uri, name.localpart);
+ return isNameAllowed(uri, localPart);
}
// failed
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
