[jboss-svn-commits] JBoss Common SVN: r3813 - jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Nov 29 13:40:32 EST 2009
Author: alex.loubyansky at jboss.com
Date: 2009-11-29 13:40:32 -0500 (Sun, 29 Nov 2009)
New Revision: 3813
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/ElementBinding.java
jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ModelGroupBinding.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/SundayContentHandler.java
jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/TermBinding.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:
moved 'implements NonElementTermBinding' to TermBinding from its subclasses, use Position instead of NonElementPosition where possible
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 16:22:40 UTC (rev 3812)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ChoiceBinding.java 2009-11-29 18:40:32 UTC (rev 3813)
@@ -76,17 +76,16 @@
for(int i = 0; i < choices.size(); ++i)
{
ParticleBinding particle = (ParticleBinding)choices.get(i);
- TermBinding item = particle.getTerm();
- if(item.isElement())
+ TermBinding term = particle.getTerm();
+ if(term.isElement())
{
- ElementBinding element = (ElementBinding)item;
+ ElementBinding element = (ElementBinding)term;
if(qName.equals(element.getQName()))
return new ChoicePosition(qName, choiceParticle, particle);
}
else
{
- NonElementTermBinding ne = (NonElementTermBinding)item;
- Position next = ne.newPosition(qName, attrs, particle);
+ Position next = term.newPosition(qName, attrs, particle);
if(next != null)
return new ChoicePosition(qName, choiceParticle, particle, next);
}
@@ -136,17 +135,16 @@
{
boolean found = false;
ParticleBinding particle = (ParticleBinding)choices.get(i);
- TermBinding item = particle.getTerm();
- if(item.isElement())
+ TermBinding term = particle.getTerm();
+ if(term.isElement())
{
- ElementBinding element = (ElementBinding)item;
+ ElementBinding element = (ElementBinding)term;
if(qName.equals(element.getQName()))
found = true;
}
else
{
- NonElementTermBinding ne = (NonElementTermBinding)item;
- next = ne.newPosition(qName, atts, particle);
+ next = term.newPosition(qName, atts, particle);
found = next != null;
}
Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ElementBinding.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ElementBinding.java 2009-11-29 16:22:40 UTC (rev 3812)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ElementBinding.java 2009-11-29 18:40:32 UTC (rev 3813)
@@ -42,7 +42,7 @@
* @version <tt>$Revision$</tt>
*/
public class ElementBinding
- extends TermBinding implements NonElementTermBinding
+ extends TermBinding
{
protected List<ElementInterceptor> interceptors = Collections.emptyList();
Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ModelGroupBinding.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ModelGroupBinding.java 2009-11-29 16:22:40 UTC (rev 3812)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ModelGroupBinding.java 2009-11-29 18:40:32 UTC (rev 3813)
@@ -33,7 +33,7 @@
* @version <tt>$Revision$</tt>
*/
public abstract class ModelGroupBinding
- extends TermBinding implements NonElementTermBinding
+ extends TermBinding
{
protected final Logger log = Logger.getLogger(getClass());
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 16:22:40 UTC (rev 3812)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SequenceBinding.java 2009-11-29 18:40:32 UTC (rev 3813)
@@ -94,8 +94,7 @@
}
else
{
- NonElementTermBinding ne = (NonElementTermBinding)term;
- Position next = ne.newPosition(qName, attrs, particle);
+ Position next = term.newPosition(qName, attrs, particle);
if(next != null)
return new SequencePosition(qName, seqParticle, i, particle, next);
}
@@ -156,10 +155,10 @@
while(i < sequence.size() - 1)
{
ParticleBinding particle = sequence.get(++i);
- TermBinding item = particle.getTerm();
- if(item.isElement())
+ TermBinding term = particle.getTerm();
+ if(term.isElement())
{
- ElementBinding element = (ElementBinding)item;
+ ElementBinding element = (ElementBinding)term;
if(qName.equals(element.getQName()))
{
pos = i;
@@ -188,8 +187,7 @@
}
else
{
- NonElementTermBinding ne = (NonElementTermBinding) item;
- next = ne.newPosition(qName, atts, particle);
+ next = term.newPosition(qName, atts, particle);
if (next != null)
{
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-29 16:22:40 UTC (rev 3812)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java 2009-11-29 18:40:32 UTC (rev 3813)
@@ -518,9 +518,7 @@
handler = type.getHandler();
if(handler == null)
- {
handler = defParticleHandler;
- }
List<ElementInterceptor> localInterceptors = parentType == null ? Collections.EMPTY_LIST : parentType.getInterceptors(startName);
List<ElementInterceptor> interceptors = element.getInterceptors();
@@ -554,13 +552,9 @@
String nil = atts.getValue(Constants.NS_XML_SCHEMA_INSTANCE, "nil");
if(nil == null || !("1".equals(nil) || "true".equals(nil)))
- {
o = handler.startParticle(parent, startName, particle, atts, nsRegistry);
- }
else
- {
o = NIL;
- }
}
else
{
@@ -1241,16 +1235,15 @@
occurrence < currentParticle.getMinOccurs() ||
occurrence < currentParticle.getMaxOccurs())
{
- TermBinding item = currentParticle.getTerm();
- if(item.isElement())
+ TermBinding term = currentParticle.getTerm();
+ if(term.isElement())
{
- ElementBinding element = (ElementBinding)item;
+ ElementBinding element = (ElementBinding)term;
repeated = qName.equals(element.getQName());
}
else
{
- NonElementTermBinding ne = (NonElementTermBinding)item;
- next = ne.newPosition(qName, atts, currentParticle);
+ next = term.newPosition(qName, atts, currentParticle);
repeated = next != null;
}
}
Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/TermBinding.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/TermBinding.java 2009-11-29 16:22:40 UTC (rev 3812)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/TermBinding.java 2009-11-29 18:40:32 UTC (rev 3813)
@@ -35,7 +35,7 @@
* @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
* @version <tt>$Revision$</tt>
*/
-public abstract class TermBinding
+public abstract class TermBinding implements NonElementTermBinding
{
protected SchemaBinding schema;
protected QName qName;
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 16:22:40 UTC (rev 3812)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/UnorderedSequenceBinding.java 2009-11-29 18:40:32 UTC (rev 3813)
@@ -108,16 +108,14 @@
for (ParticleBinding particle : groupParticles)
{
- NonElementTermBinding term = (NonElementTermBinding) particle.getTerm();
- Position next = term.newPosition(qName, attrs, particle);
+ Position next = particle.getTerm().newPosition(qName, attrs, particle);
if (next != null)
return new UnorderedSequencePosition(qName, seqParticle, particle, next);
}
for (ParticleBinding particle : wildcardParticles)
{
- NonElementTermBinding term = (NonElementTermBinding) particle.getTerm();
- Position next = term.newPosition(qName, attrs, particle);
+ Position next = particle.getTerm().newPosition(qName, attrs, particle);
if (next != null)
return new UnorderedSequencePosition(qName, seqParticle, particle, next);
}
@@ -169,8 +167,7 @@
for (ParticleBinding particle : groupParticles)
{
- NonElementTermBinding term = (NonElementTermBinding) particle.getTerm();
- next = term.newPosition(qName, atts, particle);
+ next = particle.getTerm().newPosition(qName, atts, particle);
if (next != null)
{
@@ -182,8 +179,7 @@
for (ParticleBinding particle : wildcardParticles)
{
- NonElementTermBinding term = (NonElementTermBinding) particle.getTerm();
- next = term.newPosition(qName, atts, particle);
+ next = particle.getTerm().newPosition(qName, atts, particle);
if (next != null)
{
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 16:22:40 UTC (rev 3812)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/WildcardBinding.java 2009-11-29 18:40:32 UTC (rev 3813)
@@ -34,7 +34,7 @@
* @version <tt>$Revision$</tt>
*/
public class WildcardBinding
- extends TermBinding implements NonElementTermBinding
+ extends TermBinding
{
private static final Logger log = Logger.getLogger(WildcardBinding.class);
More information about the jboss-svn-commits
mailing list