sandygao 2003/02/26 11:35:24
Modified: java/src/org/apache/xerces/impl/xs
SubstitutionGroupHandler.java
Log:
1. E1-23 was updated. The head's block is considered when determine the
substitution group for an element declaration.
2. Fixing a bug in determining the substitution group.
Revision Changes Path
1.13 +4 -6
xml-xerces/java/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java
Index: SubstitutionGroupHandler.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SubstitutionGroupHandler.java 12 Feb 2003 14:44:19 -0000 1.12
+++ SubstitutionGroupHandler.java 26 Feb 2003 19:35:23 -0000 1.13
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001, 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -178,9 +178,7 @@
// HEAD's actual substitution group is then the set consisting of each
member of PSG such that all of the following must be true:
// 1 Its {abstract} is false.
// 2 It is validly substitutable for HEAD subject to an empty blocking
constraint, as defined in Substitution Group OK (Transitive) (3.3.6).
- // REVISIT: should use exemplar.fBlock
- return substitutionGroupOK(element, exemplar, (short)0);
- //return substitutionGroupOK(element, exemplar, exemplar.fBlock);
+ return substitutionGroupOK(element, exemplar, exemplar.fBlock);
}
// to store substitution group information
@@ -299,7 +297,7 @@
// Ignore it if it's blocked
if ((dSubMethod & bSubMethod) != 0)
continue;
- group.addElement(new OneSubGroup(group1[j].sub, dSubMethod,
bSubMethod));
+ newGroup.addElement(new OneSubGroup(group1[j].sub, dSubMethod,
bSubMethod));
}
}
// Convert to an array
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
