neilg 2003/07/28 08:38:31
Modified: java/samples/xni PSVIWriter.java
Log:
fixing some minor bugs in the PSVIWriter; thanks to Peter McCracken for the patch.
Revision Changes Path
1.19 +18 -13 xml-xerces/java/samples/xni/PSVIWriter.java
Index: PSVIWriter.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/PSVIWriter.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- PSVIWriter.java 24 Jul 2003 15:17:03 -0000 1.18
+++ PSVIWriter.java 28 Jul 2003 15:38:31 -0000 1.19
@@ -1150,7 +1150,7 @@
processPSVIParticle(type.getParticle());
sendUnIndentedElement("psv:contentType");
sendElementEvent(
- "psv:final",
+ "psv:prohibitedSubstitutions",
this.translateFinal(type.getProhibitedSubstitutions()));
processPSVIAnnotations(type.getAnnotations());
sendUnIndentedElement("psv:complexTypeDefinition");
@@ -1202,8 +1202,8 @@
return;
XSObjectList facets = type.getFacets();
XSObjectList multiValueFacets = type.getMultiValueFacets();
- if ((facets == null || facets.getLength() == 0) &&
- (multiValueFacets == null || multiValueFacets.getLength() == 0)) {
+ if ((facets == null || facets.getLength() == 0)
+ && (multiValueFacets == null || multiValueFacets.getLength() == 0)) {
sendElementEvent("psv:facets");
}
else {
@@ -1214,14 +1214,17 @@
String name = this.translateFacetKind(facet.getFacetKind());
sendIndentedElement("psv:" + name);
sendElementEvent("psv:value", facet.getLexicalFacetValue());
- sendElementEvent("psv:fixed", String.valueOf(facet.isFixed()));
+ sendElementEvent(
+ "psv:fixed",
+ String.valueOf(facet.isFixed()));
processPSVIAnnotation(facet.getAnnotation());
sendUnIndentedElement("psv:" + name);
}
}
if (multiValueFacets != null) {
for (int i = 0; i < multiValueFacets.getLength(); i++) {
- XSMultiValueFacet facet =
(XSMultiValueFacet)multiValueFacets.item(i);
+ XSMultiValueFacet facet =
+ (XSMultiValueFacet)multiValueFacets.item(i);
String name = this.translateFacetKind(facet.getFacetKind());
sendIndentedElement("psv:" + name);
StringList values = facet.getLexicalFacetValues();
@@ -1276,7 +1279,7 @@
}
}
}
-
+
if (empty) {
sendElementEvent("psv:annotations");
}
@@ -1559,15 +1562,15 @@
private void processPSVIIdentityConstraintDefinitions(XSNamedMap constraints) {
if (constraints == null || constraints.getLength() == 0) {
- sendElementEvent("psv:identityContraintDefinitions");
+ sendElementEvent("psv:identityConstraintDefinitions");
}
else {
- sendIndentedElement("psv:identityContraintDefinitions");
+ sendIndentedElement("psv:identityConstraintDefinitions");
for (int i = 0; i < constraints.getLength(); i++) {
XSIDCDefinition constraint =
(XSIDCDefinition)constraints.item(i);
sendIndentedElementWithID(
- "psv:identityContraintDefinition",
+ "psv:identityConstraintDefinition",
constraint);
sendElementEvent("psv:name", constraint.getName());
sendElementEvent(
@@ -1584,9 +1587,9 @@
"psv:referencedKey",
constraint.getRefKey());
processPSVIAnnotations(constraint.getAnnotations());
- sendUnIndentedElement("psv:identityContraintDefinition");
+ sendUnIndentedElement("psv:identityConstraintDefinition");
}
- sendUnIndentedElement("psv:identityContraintDefinitions");
+ sendUnIndentedElement("psv:identityConstraintDefinitions");
}
}
@@ -1633,7 +1636,9 @@
String.valueOf(part.getMinOccurs()));
sendElementEvent(
"psv:maxOccurs",
- String.valueOf(part.getMaxOccurs()));
+ part.getMaxOccurs() == SchemaSymbols.OCCURRENCE_UNBOUNDED
+ ? "unbounded"
+ : String.valueOf(part.getMaxOccurs()));
sendIndentedElement("psv:term");
switch (part.getTerm().getType()) {
case XSConstants.ELEMENT_DECLARATION :
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
