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

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

Author: alex.loubyansky at jboss.com
Date: 2009-02-12 05:42:36 -0500 (Thu, 12 Feb 2009)
New Revision: 2978

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
Log:
JBXB-179

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2009-02-12 10:10:43 UTC (rev 2977)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2009-02-12 10:42:36 UTC (rev 2978)
@@ -1378,7 +1378,7 @@
          String wrapperNamespace = xmlWrapper.namespace();
          String wrapperName = xmlWrapper.name();
          QName wrapperQName = generateXmlName(property.getName(), elementForm, wrapperNamespace, wrapperName);
-         localModel = bindXmlElementWrapper(propertyType, localModel, xmlWrapper.nillable(), wrapperQName);
+         localModel = bindXmlElementWrapper(propertyType, localModel, xmlWrapper, wrapperQName);
          beanAdapterFactory.addProperty(wrapperQName, new PropertyHandler(property, propertyType));
          if (trace)
             log.trace("Added property " + wrapperQName + " for type=" + property.getBeanInfo().getName() + " property="
@@ -1914,7 +1914,7 @@
       return propertyGroup;
    }
    
-   private SequenceBinding bindXmlElementWrapper(TypeInfo propertyType, ModelGroupBinding parentModel, boolean wrapperNillable, QName wrapperQName)
+   private SequenceBinding bindXmlElementWrapper(TypeInfo propertyType, ModelGroupBinding parentModel, XmlElementWrapper annotation, QName wrapperQName)
    {
       TypeBinding wrapperType = new TypeBinding();
       SequenceBinding seq = new SequenceBinding(schemaBinding);
@@ -1924,9 +1924,9 @@
       wrapperType.setHandler(new DefaultElementHandler());
 
       ElementBinding wrapperElement = createElementBinding(propertyType, wrapperType, wrapperQName, false);
-      wrapperElement.setNillable(wrapperNillable);
+      wrapperElement.setNillable(annotation.nillable());
       wrapperElement.setSkip(Boolean.TRUE);
-      particle = new ParticleBinding(wrapperElement, 1, 1, propertyType.isCollection());
+      particle = new ParticleBinding(wrapperElement, annotation.required() ? 1 : 0, 1, propertyType.isCollection());
       parentModel.addParticle(particle);
       return seq;
    }