You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by sa...@apache.org on 2001/06/14 22:46:20 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/schema SubstitutionGroupComparator.java SchemaGrammar.java
sandygao 01/06/14 13:46:19
Modified: java/src/org/apache/xerces/validators/schema
SubstitutionGroupComparator.java SchemaGrammar.java
Log:
UPA checking: substitutionGroup against wildcards
this fixes [bug 2047] in bugzilla
Revision Changes Path
1.4 +1 -1 xml-xerces/java/src/org/apache/xerces/validators/schema/SubstitutionGroupComparator.java
Index: SubstitutionGroupComparator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/schema/SubstitutionGroupComparator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SubstitutionGroupComparator.java 2001/06/14 20:35:57 1.3
+++ SubstitutionGroupComparator.java 2001/06/14 20:46:15 1.4
@@ -293,7 +293,7 @@
// then check whether there exists one elemet that is allowed by the wildcard
int size = substitutionGroupQNames == null ? 0 : substitutionGroupQNames.size();
for (int i = 0; i < size; i++) {
- QName name = ((SchemaGrammar.OneSubGroup)substitutionGroupQNames.get(i)).name;
+ QName name = ((SchemaGrammar.OneSubGroup)substitutionGroupQNames.elementAt(i)).name;
if (!wother && name.uri == wuri ||
//wother && name.uri != wuri && name.uri != fStringPool.EMPTY_STRING) { // ??? TODO
wother && name.uri != wuri) {
1.34 +4 -4 xml-xerces/java/src/org/apache/xerces/validators/schema/SchemaGrammar.java
Index: SchemaGrammar.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/schema/SchemaGrammar.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- SchemaGrammar.java 2001/06/14 20:35:59 1.33
+++ SchemaGrammar.java 2001/06/14 20:46:16 1.34
@@ -60,7 +60,7 @@
* @author Eric Ye
*
* @see
- * @version $Id: SchemaGrammar.java,v 1.33 2001/06/14 20:35:59 sandygao Exp $
+ * @version $Id: SchemaGrammar.java,v 1.34 2001/06/14 20:46:16 sandygao Exp $
*/
package org.apache.xerces.validators.schema;
@@ -310,7 +310,7 @@
Vector substitutionGroupQNames = getElementDeclSubstitutionGroupQNames(elementDeclIndex);
int size = substitutionGroupQNames == null ? 0 : substitutionGroupQNames.size();
for (int i = 0; i < size; i++) {
- OneSubGroup oneGroup = (OneSubGroup)substitutionGroupQNames.get(i);
+ OneSubGroup oneGroup = (OneSubGroup)substitutionGroupQNames.elementAt(i);
SchemaGrammar sGrammar = oneGroup.grammar;
int subElementIndex = oneGroup.eleIndex;
@@ -355,7 +355,7 @@
int bsize = subSubGroup == null ? 0 : subSubGroup.size();
for (i = 0; i < bsize; i++) {
// and add them to the list too
- SubGroupBlockQName name = (SubGroupBlockQName)subSubGroup.get(i);
+ SubGroupBlockQName name = (SubGroupBlockQName)subSubGroup.elementAt(i);
oneName = new SubGroupBlockQName();
oneName.name = name.name;
// note that we need to append the dev/pdev method
@@ -396,7 +396,7 @@
// now check it
// 3 The set of all {derivation method}s involved in the derivation of D's {type definition} from C's {type definition} does not intersect with the union of the blocking constraint, C's {prohibited substitutions} (if C is complex, otherwise the empty set) and the {prohibited substitutions} (respectively the empty set) of any intermediate {type definition}s in the derivation of D's {type definition} from C's {type definition}.
for (int i = 0; i < substitutionGroupQNamesBlock.size(); i++) {
- SubGroupBlockQName oneName = (SubGroupBlockQName)substitutionGroupQNamesBlock.get(i);
+ SubGroupBlockQName oneName = (SubGroupBlockQName)substitutionGroupQNamesBlock.elementAt(i);
if (((blockSet | oneName.pmethod) & oneName.method) == 0)
groups.addElement(oneName.name);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org