[jboss-svn-commits] JBoss Common SVN: r3637 - jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling.

[jboss-svn-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2009-11-05 04:11:55 -0500 (Thu, 05 Nov 2009)
New Revision: 3637

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
Log:
pass correct QName as the argument to endParticle

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2009-11-05 03:23:20 UTC (rev 3636)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2009-11-05 09:11:55 UTC (rev 3637)
@@ -203,7 +203,7 @@
          {
             if(!item.ended) // could be ended if it's a choice
             {
-               endParticle(endName, item, stack.peek1());
+               endParticle(item, stack.peek1());
             }
 
             ParticleBinding currentParticle = item.cursor.getCurrentParticle();
@@ -446,7 +446,7 @@
                if(newCursors.isEmpty())
                {
                   if(!item.ended)
-                     endParticle(startName, item, stack.peek1());
+                     endParticle(item, stack.peek1());
                                     
                   StackItem poped = pop();
                   if(!poped.particle.isRepeatable() && stack.peek().cursor == null)
@@ -731,7 +731,7 @@
 
          StackItem item = parentItem;
          parentItem = stack.peek(--stackIndex);
-         endParticle(startName, item, parentItem);
+         endParticle(item, parentItem);
       }
 
       if(!parentParticle.isRepeatable())
@@ -785,7 +785,7 @@
       // todo startName is wrong here
       StackItem item = parentItem;
       parentItem = stack.peek(stackIndex - 1);
-      endParticle(startName, item, parentItem);
+      endParticle(item, parentItem);
 
       ParticleHandler handler = getHandler(item.particle);
       item.reset();
@@ -820,7 +820,7 @@
       repeatableHandler.endRepeatableParticle(parent, o, elementName, particle, parentParticle);
    }
 
-   private void endParticle(QName qName, StackItem item, StackItem parentItem)
+   private void endParticle(StackItem item, StackItem parentItem)
    {
       if(item.ended)
       {
@@ -830,7 +830,7 @@
       ParticleBinding modelGroupParticle = item.particle;
       ParticleHandler handler = item.handler;//getHandler(modelGroupParticle);
 
-      Object o = handler.endParticle(item.o, qName, modelGroupParticle);
+      Object o = handler.endParticle(item.o, item.qName, modelGroupParticle);
 
       item.ended = true;
 
@@ -843,11 +843,11 @@
             parentParticle = parentItem.particle;
          
          if(parentItem.repeatableParticleValue == null)
-            setParent(handler, parentItem.o, o, qName, modelGroupParticle, parentParticle);
+            setParent(handler, parentItem.o, o, item.qName, modelGroupParticle, parentParticle);
          else
          {
             RepeatableParticleHandler repeatableHandler = modelGroupParticle.getTerm().getRepeatableHandler();
-            repeatableHandler.addTermValue(parentItem.repeatableParticleValue, o, qName, modelGroupParticle, parentParticle, handler);
+            repeatableHandler.addTermValue(parentItem.repeatableParticleValue, o, item.qName, modelGroupParticle, parentParticle, handler);
          }
       }
    }