[jboss-svn-commits] JBoss Common SVN: r3810 - 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-29 05:49:14 -0500 (Sun, 29 Nov 2009)
New Revision: 3810

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/NonElementPosition.java
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
Log:
clean-up

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/NonElementPosition.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/NonElementPosition.java	2009-11-27 16:11:24 UTC (rev 3809)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/NonElementPosition.java	2009-11-29 10:49:14 UTC (rev 3810)
@@ -41,7 +41,6 @@
    protected NonElementPosition(QName qName, ParticleBinding particle)
    {
       super(qName, particle);
-      this.cursor = this;
       this.particle = particle;
    }
 

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-27 16:11:24 UTC (rev 3809)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2009-11-29 10:49:14 UTC (rev 3810)
@@ -234,9 +234,7 @@
       ParticleHandler handler = null;
       TypeBinding parentType = null;
       boolean repeated = false;
-      boolean repeatedParticle = false;
       Position position = null;
-      NonElementPosition groupPosition = null; // used only when particle is a wildcard
       SchemaBinding schemaBinding = schema;
 
       atts = preprocessAttributes(atts);
@@ -287,8 +285,8 @@
                   {
                      if(position.particle.isRepeatable())
                      {
-                        Position parentPosition = stack.peek1();
-                        if(parentPosition.cursor.repeatTerm(startName, atts))
+                        NonElementPosition parentPosition = (NonElementPosition) stack.peek1();
+                        if(parentPosition.repeatTerm(startName, atts))
                         {
                            position.reset();
                            particle = position.particle;
@@ -381,17 +379,18 @@
                   {
                      flushIgnorableCharacters();
 
+                     NonElementPosition groupPosition = null;
                      Object o = position.o;
                      while(newPosition != null)
                      {
                         groupPosition = newPosition;
-                        ParticleBinding modelGroupParticle = groupPosition.getParticle();
-                        if(modelGroupParticle.isRepeatable())
-                           startRepeatableParticle(stack.peek(), o, startName, modelGroupParticle);
+                        ParticleBinding groupParticle = newPosition.getParticle();
+                        if(groupParticle.isRepeatable())
+                           startRepeatableParticle(stack.peek(), o, startName, groupParticle);
 
-                        handler = getHandler(modelGroupParticle.getTerm());
-                        o = handler.startParticle(o, startName, modelGroupParticle, atts, nsRegistry);
-                        push(groupPosition, o, handler, parentType);
+                        handler = getHandler(groupParticle.getTerm());
+                        o = handler.startParticle(o, startName, groupParticle, atts, nsRegistry);
+                        push(newPosition, o, handler, parentType);
                         
                         newPosition = newPosition.getNext();
                      }
@@ -402,9 +401,7 @@
             }
             else
             {
-               groupPosition = position.cursor;
-               if(groupPosition == null)
-                  throw new JBossXBRuntimeException("No cursor for " + startName);
+               NonElementPosition groupPosition = (NonElementPosition) position;
 
                ParticleBinding prevParticle = groupPosition.getCurrentParticle();
                NonElementPosition newPosition = groupPosition.startElement(startName, atts);               
@@ -450,10 +447,6 @@
                         startRepeatableParticle(position, position.o, startName, curParticle);
                      }
                   }
-                  else
-                  {
-                     repeatedParticle = true;
-                  }
 
                   // push all except the last one
                   parentType = position.parentType;
@@ -1222,7 +1215,6 @@
    {
       protected boolean trace;
       final QName qName;
-      NonElementPosition cursor;
       ParticleBinding particle;
       ParticleBinding nonXsiParticle;
       ParticleHandler handler;
@@ -1236,20 +1228,6 @@
       boolean ignorableCharacters = true;
       boolean ended;
 
-/*      public StackItem(QName qName, ModelGroupBinding.Cursor cursor)
-      {
-         if (cursor == null)
-            throw new IllegalArgumentException("Null cursor");
-         // this is modelgroup particle
-         this.cursor = cursor;
-         
-         if(qName == null)
-            throw new IllegalArgumentException("Null qName");
-         this.qName = qName;
-         
-         this.particle = cursor.getParticle();
-      }
-*/
       public Position(QName qName, ParticleBinding particle)
       {
          if (particle == null)