[jboss-svn-commits] JBoss Common SVN: r2459 - jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder.

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

Author: alex.loubyansky at jboss.com
Date: 2007-07-25 10:03:01 -0400 (Wed, 25 Jul 2007)
New Revision: 2459

Modified:
   jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
Log:
bind a class annotated with JBossXmlModelGroup to its own model group

Modified: jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
===================================================================
--- jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2007-07-25 12:05:16 UTC (rev 2458)
+++ jbossxb-builder/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2007-07-25 14:03:01 UTC (rev 2459)
@@ -1061,18 +1061,18 @@
                if(trace)
                   log.trace("Property " + property.getName() + " is bound to " + xmlModelGroup.kind());
 
-               localModel = new SequenceBinding(schemaBinding);
+               ModelGroupBinding propertyGroup = new SequenceBinding(schemaBinding);
                if(!JBossXmlConstants.DEFAULT.equals(xmlModelGroup.name()))
                {
                   // TODO what if it doesn't have a name? should an artificial one be created?
-                  localModel.setQName(new QName(name));
+                  propertyGroup.setQName(new QName(name));
                }
 
                //ClassMetaData classMd = new ClassMetaData();
                //classMd.setImpl(propClassInfo.getName());
                //localModel.setClassMetaData(classMd);
-               localModel.setSkip(Boolean.FALSE);
-               model.addParticle(new ParticleBinding(localModel));
+               propertyGroup.setSkip(Boolean.FALSE);
+               model.addParticle(new ParticleBinding(propertyGroup));
 
                // model group value handler based on the model group name
                // TODO what if it doesn't have a name?
@@ -1083,7 +1083,7 @@
                {
                   propertyHandler = new PropertyHandler(property, propClassInfo);
                }
-               beanAdapterFactory.addProperty(localModel.getQName(), propertyHandler);
+               beanAdapterFactory.addProperty(propertyGroup.getQName(), propertyHandler);
                
                // handler for the model group members
                BeanInfo propBeanInfo = JBossXBBuilder.configuration.getBeanInfo(propClassInfo);
@@ -1099,7 +1099,7 @@
                   throw new RuntimeException("Error creating BeanAdapterFactory for " + beanAdapterBuilderClass.getName(), t); 
                }
                BeanHandler propHandler = new BeanHandler(propBeanInfo.getName(), propBeanAdapterFactory);
-               localModel.setHandler(propHandler);
+               propertyGroup.setHandler(propHandler);
                
                String[] memberOrder = xmlModelGroup.propOrder();
                if(memberOrder.length == 0 || memberOrder[0].length() == 0)
@@ -1161,7 +1161,7 @@
                   ElementBinding memberElement = createElementBinding(memberTypeInfo, memberTypeBinding, memberQName, false);
                   memberElement.setNillable(true);
                   ParticleBinding memberParticle = new ParticleBinding(memberElement, 0, 1, isCol);
-                  localModel.addParticle(memberParticle);
+                  propertyGroup.addParticle(memberParticle);
                   
                   if(trace)
                      log.trace("added " + memberParticle + " to " + xmlModelGroup.kind() + ", property " + property.getName());