[jboss-svn-commits] JBoss Common SVN: r2136 - jbossxb/branches/as405/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime

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

Author: alex.loubyansky at jboss.com
Date: 2006-10-18 16:57:51 -0400 (Wed, 18 Oct 2006)
New Revision: 2136

Modified:
   jbossxb/branches/as405/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime/RtElementHandler.java
Log:
minor: moved property metadata resolution into the block it is used in

Modified: jbossxb/branches/as405/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime/RtElementHandler.java
===================================================================
--- jbossxb/branches/as405/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime/RtElementHandler.java	2006-10-18 20:40:29 UTC (rev 2135)
+++ jbossxb/branches/as405/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime/RtElementHandler.java	2006-10-18 20:57:51 UTC (rev 2136)
@@ -266,72 +266,61 @@
          else if(tryAdd(owner, o, qName, term, wildcard, trace))
          {
          }
+         else if (owner instanceof GenericValueContainer)
+         {
+            if (trace)
+            {
+               log.trace("setParent " + qName + " addChild");
+            }
+            ((GenericValueContainer) owner).addChild(qName, o);
+         }
+         else if (owner instanceof Collection)
+         {
+            if (trace)
+            {
+               log.trace("setParent " + qName + " collection.add()");
+            }
+            ((Collection) owner).add(o);
+         }
          else
          {
             PropertyMetaData propertyMetaData = wildcard == null ? null : wildcard.getPropertyMetaData();
-            if(propertyMetaData == null)
+            if (propertyMetaData == null)
             {
                propertyMetaData = term.getPropertyMetaData();
             }
 
-            /*
-            if(propertyMetaData == null)
+            String propName = null;
+            String colType = null;
+            if (propertyMetaData != null)
             {
-               propertyMetaData = element.getType().getPropertyMetaData();
+               propName = propertyMetaData.getName();
+               colType = propertyMetaData.getCollectionType();
             }
-            */
 
-            if(owner instanceof GenericValueContainer)
+            if (propName == null)
             {
-               if(trace)
-               {
-                  log.trace("setParent " + qName + " addChild");
-               }
-               ((GenericValueContainer)owner).addChild(qName, o);
+               propName = Util.xmlNameToFieldName(qName.getLocalPart(), term.getSchema().isIgnoreLowLine());
             }
-            else if(owner instanceof Collection)
+
+            if (trace)
             {
-               if(trace)
-               {
-                  log.trace("setParent " + qName + " collection.add()");
-               }
-               ((Collection)owner).add(o);
+               log.trace("setParent " + qName + " metadata set " + propName);
             }
-            else
-            {
-               String propName = null;
-               String colType = null;
-               if(propertyMetaData != null)
-               {
-                  propName = propertyMetaData.getName();
-                  colType = propertyMetaData.getCollectionType();
-               }
 
-               if(propName == null)
-               {
-                  propName = Util.xmlNameToFieldName(qName.getLocalPart(), term.getSchema().isIgnoreLowLine());
-               }
-
-               if(trace)
-               {
-                  log.trace("setParent " + qName + " metadata set " + propName);
-               }
-
-/*               if(particle.isRepeatable())
-               {
-                  RtUtil.add(owner, o, propName, colType,
-                     term.getSchema().isIgnoreUnresolvedFieldOrClass(),
-                     term.getValueAdapter()
-                  );
-               }
-               else
-               {
-*/                  RtUtil.set(owner, o, propName, colType,
-                     term.getSchema().isIgnoreUnresolvedFieldOrClass(),
-                     term.getValueAdapter()
-                  );
-//               }
+            /*if(particle.isRepeatable())
+            {
+               RtUtil.add(owner, o, propName, colType,
+                  term.getSchema().isIgnoreUnresolvedFieldOrClass(),
+                  term.getValueAdapter()
+               );
             }
+            else
+            {*/
+               RtUtil.set(owner, o, propName, colType,
+                     term.getSchema().isIgnoreUnresolvedFieldOrClass(),
+                     term.getValueAdapter());
+            //}
          }
       }
    }