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

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

Author: alesj
Date: 2009-07-13 15:36:43 -0400 (Mon, 13 Jul 2009)
New Revision: 3373

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ModelGroupBinding.java
Log:
Code tidy up.

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-07-13 15:35:03 UTC (rev 3372)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/ModelGroupBinding.java	2009-07-13 19:36:43 UTC (rev 3373)
@@ -118,7 +118,7 @@
     */
    public boolean mayStartWith(QName qName)
    {
-      return mayStartWith(qName, Collections.EMPTY_SET);
+      return mayStartWith(qName, Collections.<ModelGroupBinding>emptySet());
    }
 
    public abstract Cursor newCursor(ParticleBinding particle);
@@ -134,7 +134,7 @@
 
    public boolean isSkip()
    {
-      return skip == null ? true : skip.booleanValue();
+      return skip == null || skip;
    }
 
    public boolean isModelGroup()
@@ -217,12 +217,12 @@
 
       public List<ModelGroupBinding.Cursor> startElement(QName qName, Attributes attrs)
       {
-         return startElement(qName, attrs, Collections.EMPTY_SET, Collections.EMPTY_LIST, true);
+         return startElement(qName, attrs, Collections.<Cursor>emptySet(), Collections.<Cursor>emptyList(), true);
       }
 
       public ElementBinding getElement(QName qName, Attributes attrs, boolean ignoreWildcards)
       {
-         return getElement(qName, attrs, Collections.EMPTY_SET, ignoreWildcards);
+         return getElement(qName, attrs, Collections.<Cursor>emptySet(), ignoreWildcards);
       }
 
       public abstract void endElement(QName qName);
@@ -262,7 +262,7 @@
          ElementBinding element = null;
          for(int i = 0; i < group.size(); ++i)
          {
-            ParticleBinding nextParticle = (ParticleBinding)group.get(i);
+            ParticleBinding nextParticle = group.get(i);
             TermBinding item = nextParticle.getTerm();
             if(item.isElement())
             {
@@ -276,7 +276,7 @@
             else if(item.isModelGroup())
             {
                ModelGroupBinding modelGroup = (ModelGroupBinding)item;
-               if(!passedGroups.contains(modelGroup))
+               if(passedGroups.contains(modelGroup) == false) // FIX-ME ... weird set usage
                {
                   switch(passedGroups.size())
                   {