xerces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muk...@apache.org
Subject svn commit: r1032203 - /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
Date Sun, 07 Nov 2010 02:53:37 GMT
Author: mukulg
Date: Sun Nov  7 02:53:37 2010
New Revision: 1032203

URL: http://svn.apache.org/viewvc?rev=1032203&view=rev
Log:
doing little refactoring (cosmetic improvements like naming etc)

Modified:
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java?rev=1032203&r1=1032202&r2=1032203&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
(original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
Sun Nov  7 02:53:37 2010
@@ -165,7 +165,8 @@ abstract class XSDAbstractParticleTraver
      * particles (element and wild-card declarations) to a global particle array (fPArray),
by expanding
      * the input particle (method argument) recursively.
      */
-    private void expandGroupParticleForCompositorAll(XSParticleDecl particle, Element child)
{
+    private void expandGroupParticleForCompositorAll(XSParticleDecl particle, 
+                                                     Element contextElement) {
         
         XSModelGroupImpl group = (XSModelGroupImpl) particle.fValue;
         if (group.getCompositor() == XSModelGroup.COMPOSITOR_ALL) {
@@ -178,7 +179,7 @@ abstract class XSDAbstractParticleTraver
                }
                else {
                    // the sub particle is a model-group. call the method recursively.
-                   expandGroupParticleForCompositorAll(subParticles[partlIdx], child); 
+                   expandGroupParticleForCompositorAll(subParticles[partlIdx], contextElement);

                }
             }
         }
@@ -186,7 +187,7 @@ abstract class XSDAbstractParticleTraver
             String wrongCompsName = (group.getCompositor() == XSModelGroup.COMPOSITOR_SEQUENCE)
? 
                                      "xs:"+SchemaSymbols.ELT_SEQUENCE : "xs:"+SchemaSymbols.ELT_CHOICE;
             // it's an error to have a non-all (xs:all) compositor within "xs:all -> xs:group"
-            reportSchemaError("mg-props-correct.3", new Object[] {wrongCompsName}, child);
+            reportSchemaError("mg-props-correct.3", new Object[] { wrongCompsName }, contextElement);
         }
         
     } // expandGroupParticleForCompositorAll



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org


Mime
View raw message