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 2010/08/20 19:43:43 UTC
svn commit: r987587 - in /xerces/java/branches/xml-schema-1.1-dev:
samples/xni/PSVIWriter.java src/org/apache/xerces/impl/xs/XSElementDecl.java
src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
src/org/apache/xerces/xs/XSElementDeclaration.java
Author: sandygao
Date: Fri Aug 20 17:43:43 2010
New Revision: 987587
URL: http://svn.apache.org/viewvc?rev=987587&view=rev
Log:
Revert a signature change in XSElementDeclaration. Need to update XSModel to support schema 1.1, but the changes must be backward compatible to not affect existing applications.
Modified:
xerces/java/branches/xml-schema-1.1-dev/samples/xni/PSVIWriter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSElementDeclaration.java
Modified: xerces/java/branches/xml-schema-1.1-dev/samples/xni/PSVIWriter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/samples/xni/PSVIWriter.java?rev=987587&r1=987586&r2=987587&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/samples/xni/PSVIWriter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/samples/xni/PSVIWriter.java Fri Aug 20 17:43:43 2010
@@ -1859,11 +1859,12 @@ public class PSVIWriter implements XMLCo
sendElementEvent("psv:substitutionGroupAffiliation");
} else {
sendIndentedElement("psv:substitutionGroupAffiliation");
- XSElementDeclaration[] subgroups = elem.getSubstitutionGroupAffiliation();
- for (int i=0; i<subgroups.length; i++) {
- XSElementDeclaration subgroup = subgroups[i];
- processPSVIElementRef("psv:elementDeclaration", subgroup);
- }
+ processPSVIElementRef("psv:elementDeclaration", elem.getSubstitutionGroupAffiliation());
+// XSElementDeclaration[] subgroups = elem.getSubstitutionGroupAffiliations();
+// for (int i=0; i<subgroups.length; i++) {
+// XSElementDeclaration subgroup = subgroups[i];
+// processPSVIElementRef("psv:elementDeclaration", subgroup);
+// }
sendUnIndentedElement("psv:substitutionGroupAffiliation");
}
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java?rev=987587&r1=987586&r2=987587&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java Fri Aug 20 17:43:43 2010
@@ -359,8 +359,8 @@ public class XSElementDecl implements XS
* {substitution group affiliation} Optional. A top-level element
* definition.
*/
- public XSElementDeclaration[] getSubstitutionGroupAffiliation() {
- return fSubGroup;
+ public XSElementDeclaration getSubstitutionGroupAffiliation() {
+ return fSubGroup != null && fSubGroup.length > 0 ? fSubGroup[0] : null;
}
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java?rev=987587&r1=987586&r2=987587&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java Fri Aug 20 17:43:43 2010
@@ -3131,7 +3131,7 @@ public class XSDHandler {
addRelatedType(enclosingType, componentList, namespace, dependencies);
}*/
- final XSElementDeclaration[] subElemDecl = decl.getSubstitutionGroupAffiliation();
+ final XSElementDeclaration[] subElemDecl = ((XSElementDecl)decl).fSubGroup;
if (subElemDecl != null) {
for (int i=0; i<subElemDecl.length; i++) {
addRelatedElement(subElemDecl[i], componentList, namespace, dependencies);
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSElementDeclaration.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSElementDeclaration.java?rev=987587&r1=987586&r2=987587&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSElementDeclaration.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSElementDeclaration.java Fri Aug 20 17:43:43 2010
@@ -128,7 +128,7 @@ public interface XSElementDeclaration ex
* [substitution group affiliation]: a top-level element definition if it
* exists, otherwise <code>null</code>.
*/
- public XSElementDeclaration[] getSubstitutionGroupAffiliation();
+ public XSElementDeclaration getSubstitutionGroupAffiliation();
/**
* Convenience method that checks if <code>exclusion</code> is a
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org