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

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

Author: alex.loubyansky at jboss.com
Date: 2007-11-03 15:24:53 -0400 (Sat, 03 Nov 2007)
New Revision: 2668

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
Log:
don't use bean's adapter builder class for a property bound as a group, removed unused variable

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2007-11-01 11:02:02 UTC (rev 2667)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2007-11-03 19:24:53 UTC (rev 2668)
@@ -1143,9 +1143,10 @@
                   BeanAdapterFactory propBeanAdapterFactory = null;
                   try
                   {
-                     BeanInfo propBeanAdapterBuilderInfo = JBossXBBuilder.configuration.getBeanInfo(beanAdapterBuilderClass);
+                     // TODO this has to use its own adapter class and the factory method
+                     BeanInfo propBeanAdapterBuilderInfo = JBossXBBuilder.configuration.getBeanInfo(DefaultBeanAdapterBuilder.class);
                      BeanAdapterBuilder propBeanAdapterBuilder = (BeanAdapterBuilder) propBeanAdapterBuilderInfo.newInstance();
-                     propBeanAdapterFactory = propBeanAdapterBuilder.newFactory(propBeanInfo, factory);
+                     propBeanAdapterFactory = propBeanAdapterBuilder.newFactory(propBeanInfo, null);
                   }
                   catch (Throwable t)
                   {
@@ -1319,8 +1320,6 @@
 
             QName wrapperQName = generateXmlName(property.getName(), elementForm, wrapperNamespace, wrapperName);
 
-            boolean typeIsNew = !typeCache.containsKey(propertyType);
-
             TypeBinding wrapperType = new TypeBinding();
             SequenceBinding seq = new SequenceBinding(schemaBinding);
             seq.setHandler(BuilderParticleHandler.INSTANCE);
@@ -1561,8 +1560,7 @@
                if (!Element.class.getName().equals(propertyType.getName()))
                {
                   TypeBinding elementTypeBinding = resolveTypeBinding(localPropertyType);
-                  ElementBinding elementBinding = createElementBinding(localPropertyType, elementTypeBinding, qName,
-                        false);
+                  ElementBinding elementBinding = createElementBinding(localPropertyType, elementTypeBinding, qName, false);
                   elementBinding.setNillable(nillable);
                   elementBinding.setValueAdapter(valueAdapter);