[Jboss-svn-commits] JBossWS SVN: r556 - branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb

[<jbo...@li...>]

Author: hei...@jb...
Date: 2006-07-04 15:04:16 -0400 (Tue, 04 Jul 2006)
New Revision: 556

Modified:
   branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/SchemaBindingBuilder.java
Log:
cleanup

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/SchemaBindingBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/SchemaBindingBuilder.java	2006-07-04 19:03:58 UTC (rev 555)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/SchemaBindingBuilder.java	2006-07-04 19:04:16 UTC (rev 556)
@@ -52,11 +52,14 @@
 import org.xml.sax.Attributes;
 
 /**
- * An implementation of a JAXB Unmarshaller.
+ * Create SchemaBinding from XSModel and jaxrpc-mapping.
  *
  * @author Tho...@jb...
  * @author Ale...@jb...
  * @since 18-Oct-2004
+ *
+ * @see XSModel
+ * @see JavaWsdlMapping
  */
 public class SchemaBindingBuilder
 {
@@ -144,31 +147,36 @@
       TypeBinding typeBinding = getTypeBinding(schemaBinding, typeMapping);
       if (typeBinding != null)
       {
-         // Set the java type
-         ClassMetaData classMetaData = typeBinding.getClassMetaData();
-         if (classMetaData == null)
+         // Set the java type, but skip SimpleTypes
+         boolean isSimpleTypeBinding = (typeBinding instanceof SimpleTypeBinding);
+
+         if(isSimpleTypeBinding == false)
          {
-            classMetaData = new ClassMetaData();            
-            if( (typeBinding instanceof SimpleTypeBinding) == false )
+            ClassMetaData classMetaData = typeBinding.getClassMetaData();
+            if (classMetaData == null)
+            {
+               classMetaData = new ClassMetaData();
                typeBinding.setClassMetaData(classMetaData);
-         }
-         classMetaData.setImpl(javaType);
+            }
 
-         // exception mapping drives whether we should use the noarg ctor
-         JavaWsdlMapping wsdlMapping = typeMapping.getJavaWsdlMapping();
-         for (ExceptionMapping aux : wsdlMapping.getExceptionMappings())
-         {
-            if (javaType.equals(aux.getExceptionType()))
+            classMetaData.setImpl(javaType);
+
+            // exception mapping drives whether we should use the noarg ctor
+            JavaWsdlMapping wsdlMapping = typeMapping.getJavaWsdlMapping();
+            for (ExceptionMapping aux : wsdlMapping.getExceptionMappings())
             {
-               classMetaData.setUseNoArgCtor(false);
-               break;
+               if (javaType.equals(aux.getExceptionType()))
+               {
+                  classMetaData.setUseNoArgCtor(false);
+                  break;
+               }
             }
-         }
 
-         if (log.isTraceEnabled())
-         {
-            QName typeQName = typeBinding.getQName();
-            log.trace("Bound: [xmlType=" + typeQName + ",javaType=" + javaType + "]");
+            if (log.isTraceEnabled())
+            {
+               QName typeQName = typeBinding.getQName();
+               log.trace("Bound: [xmlType=" + typeQName + ",javaType=" + javaType + "]");
+            }
          }
 
          VariableMapping[] variableMappings = typeMapping.getVariableMappings();