You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by lm...@apache.org on 2001/05/16 22:50:15 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/framework XMLContentSpec.java
lmartin 01/05/16 13:50:14
Modified: java/src/org/apache/xerces/framework XMLContentSpec.java
Log:
New contentspec node type of all. Checkin for Henry Zongaro
Revision Changes Path
1.12 +15 -5 xml-xerces/java/src/org/apache/xerces/framework/XMLContentSpec.java
Index: XMLContentSpec.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/framework/XMLContentSpec.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMLContentSpec.java 2000/10/12 18:42:10 1.11
+++ XMLContentSpec.java 2001/05/16 20:50:09 1.12
@@ -109,7 +109,7 @@
* string pool index, as the "#PCDATA" leaf is not used in the declarations
* for element content models.
*
- * @version $Id: XMLContentSpec.java,v 1.11 2000/10/12 18:42:10 ericye Exp $
+ * @version $Id: XMLContentSpec.java,v 1.12 2001/05/16 20:50:09 lmartin Exp $
*/
public class XMLContentSpec {
@@ -162,6 +162,9 @@
/** Represents any local element (XML Schema: ##local). */
public static final int CONTENTSPECNODE_ANY_LOCAL = 8;
+ /** Represents <ALL> */
+ public static final int CONTENTSPECNODE_ALL = 9;
+
/** prcessContent is 'lax' **/
public static final int CONTENTSPECNODE_ANY_LAX = 22;
@@ -189,6 +192,7 @@
* @see CONTENTSPECNODE_ONE_OR_MORE
* @see CONTENTSPECNODE_CHOICE
* @see CONTENTSPECNODE_SEQ
+ * @see CONTENTSPECNODE_ALL
*/
public int type;
@@ -399,10 +403,12 @@
str.append('+');
break;
}
+ case XMLContentSpec.CONTENTSPECNODE_ALL:
case XMLContentSpec.CONTENTSPECNODE_CHOICE:
case XMLContentSpec.CONTENTSPECNODE_SEQ: {
appendContentSpec(provider, stringPool,
- contentSpec, str, true, parentContentSpecType );
+ contentSpec, str, true,
+ parentContentSpecType );
break;
}
case XMLContentSpec.CONTENTSPECNODE_ANY: {
@@ -548,11 +554,15 @@
break;
}
case XMLContentSpec.CONTENTSPECNODE_CHOICE:
- case XMLContentSpec.CONTENTSPECNODE_SEQ: {
+ case XMLContentSpec.CONTENTSPECNODE_SEQ:
+ case XMLContentSpec.CONTENTSPECNODE_ALL: {
+ int type = contentSpec.type;
if (parens) {
- str.append('(');
+ if (type == XMLContentSpec.CONTENTSPECNODE_ALL)
+ str.append("all(");
+ else
+ str.append('(');
}
- int type = contentSpec.type;
int otherValue = contentSpec.otherValue;
provider.getContentSpec(contentSpec.value, contentSpec);
appendContentSpec(provider, stringPool,
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org