[jboss-svn-commits] JBoss Common SVN: r3811 - 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 06:02:52 -0500 (Sun, 29 Nov 2009)
New Revision: 3811

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

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ChoiceBinding.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ChoiceBinding.java	2009-11-29 10:49:14 UTC (rev 3810)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ChoiceBinding.java	2009-11-29 11:02:52 UTC (rev 3811)
@@ -111,11 +111,6 @@
          super(name, particle, currentParticle, next);
       }
 
-      private ChoicePosition(QName name, ParticleBinding particle, ParticleBinding currentParticle, ElementBinding wildcardContent)
-      {
-         super(name, particle, currentParticle, wildcardContent);
-      }
-
       protected NonElementPosition startElement(QName qName, Attributes atts, boolean required)
       {
          if(trace)

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-29 10:49:14 UTC (rev 3810)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/NonElementPosition.java	2009-11-29 11:02:52 UTC (rev 3811)
@@ -32,10 +32,7 @@
 public abstract class NonElementPosition extends SundayContentHandler.Position
 {
    protected int occurrence;
-
    protected ParticleBinding currentParticle;
-   protected ElementBinding wildcardContent;
-
    protected NonElementPosition next;
    
    protected NonElementPosition(QName qName, ParticleBinding particle)
@@ -59,14 +56,6 @@
       occurrence = 1;
    }
 
-   protected NonElementPosition(QName name, ParticleBinding particle, ParticleBinding currentParticle, ElementBinding wildcardContent)
-   {
-      this(name, particle);
-      this.currentParticle = currentParticle;
-      this.wildcardContent = wildcardContent;
-      occurrence = 1;
-   }
-
    protected boolean isElement()
    {
       return false;
@@ -92,16 +81,6 @@
       return currentParticle;
    }
 
-   public boolean isWildcardContent()
-   {
-      return wildcardContent != null;
-   }
-
-   public ElementBinding getWildcardContent()
-   {
-      return wildcardContent;
-   }
-
    public NonElementPosition startElement(QName qName, Attributes attrs)
    {
       return startElement(qName, attrs, true);
@@ -137,7 +116,6 @@
       }
       else
       {
-         wildcardContent = null;
          currentParticle = null;
          occurrence = 0;
       }

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SequenceBinding.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SequenceBinding.java	2009-11-29 10:49:14 UTC (rev 3810)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SequenceBinding.java	2009-11-29 11:02:52 UTC (rev 3811)
@@ -134,12 +134,6 @@
          this.pos = pos;
       }
 
-      protected SequencePosition(QName qName, ParticleBinding particle, int pos, ParticleBinding currentParticle, ElementBinding wildcardContent)
-      {
-         super(qName, particle, currentParticle, wildcardContent);
-         this.pos = pos;
-      }
-
       protected NonElementPosition startElement(QName qName, Attributes atts, boolean required)
       {
          if(trace)

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/UnorderedSequenceBinding.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/UnorderedSequenceBinding.java	2009-11-29 10:49:14 UTC (rev 3810)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/UnorderedSequenceBinding.java	2009-11-29 11:02:52 UTC (rev 3811)
@@ -142,11 +142,6 @@
          super(name, particle, currentParticle, next);
       }
 
-      private UnorderedSequencePosition(QName name, ParticleBinding particle, ParticleBinding currentParticle, ElementBinding wildcardContent)
-      {
-         super(name, particle, currentParticle, wildcardContent);
-      }
-
       @Override
       protected NonElementPosition startElement(QName qName, Attributes atts, boolean required)
       {

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/WildcardBinding.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/WildcardBinding.java	2009-11-29 10:49:14 UTC (rev 3810)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/WildcardBinding.java	2009-11-29 11:02:52 UTC (rev 3811)
@@ -247,7 +247,7 @@
    {
       ElementBinding wildcardContent = getElement(qName, attrs);
       if(wildcardContent != null)
-         return new WildcardPosition(qName, particle, new ParticleBinding(wildcardContent), wildcardContent);
+         return new WildcardPosition(qName, particle, new ParticleBinding(wildcardContent));
       return null;
    }
    
@@ -293,10 +293,9 @@
    
    private final class WildcardPosition extends NonElementPosition
    {
-      protected WildcardPosition(QName name, ParticleBinding particle, ParticleBinding currentParticle,
-            ElementBinding wildcardContent)
+      protected WildcardPosition(QName name, ParticleBinding particle, ParticleBinding currentParticle)
       {
-         super(name, particle, currentParticle, wildcardContent);
+         super(name, particle, currentParticle);
       }
 
       @Override
@@ -306,7 +305,7 @@
          if(currentParticle != null && repeatTerm(qName, atts))
             return this;
 
-         wildcardContent = getElement(name, atts);
+         ElementBinding wildcardContent = getElement(name, atts);
          if(wildcardContent != null)
          {
             currentParticle = new ParticleBinding(wildcardContent);