[jboss-svn-commits] JBoss Common SVN: r2057 - jbossxb/trunk/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-09-25 10:46:59 -0400 (Mon, 25 Sep 2006)
New Revision: 2057

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime/RtCharactersHandler.java
Log:
re-formatting

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime/RtCharactersHandler.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime/RtCharactersHandler.java	2006-09-24 14:05:43 UTC (rev 2056)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/impl/runtime/RtCharactersHandler.java	2006-09-25 14:46:59 UTC (rev 2057)
@@ -126,87 +126,79 @@
    {
       //todo: assert if type is not null it must simple...
 
-      if(owner != null) // todo: owner should never be null
+      if(owner == null) // todo: owner should never be null
       {
-         if(owner instanceof MapEntry)
+         return;
+      }
+      
+      if (owner instanceof MapEntry)
+      {
+         TypeBinding type = element.getType();
+         CharactersMetaData characters = type.getCharactersMetaData();
+         if (characters != null)
          {
-            TypeBinding type = element.getType();
-            CharactersMetaData characters = type.getCharactersMetaData();
-            if(characters != null)
+            if (characters.isMapEntryKey())
             {
-               if(characters.isMapEntryKey())
-               {
-                  ((MapEntry)owner).setKey(value);
-               }
-               else if(characters.isMapEntryValue())
-               {
-                  ((MapEntry)owner).setValue(value);
-               }
-               else
-               {
-                  throw new JBossXBRuntimeException("Parent object is a map entry but characters of element " +
-                     qName +
-                     " of type " +
-                     type.getQName() +
-                     " were bound to niether key nor value in a map entry."
-                  );
-               }
+               ((MapEntry) owner).setKey(value);
             }
+            else if (characters.isMapEntryValue())
+            {
+               ((MapEntry) owner).setValue(value);
+            }
             else
             {
-               throw new JBossXBRuntimeException("Parent object is a map entry but characters of element " +
-                  qName +
-                  " of type " +
-                  type.getQName() +
-                  " were bound to niether key nor value in a map entry."
-               );
+               throw new JBossXBRuntimeException("Parent object is a map entry but characters of element " + qName
+                     + " of type " + type.getQName() + " were bound to niether key nor value in a map entry.");
             }
          }
          else
          {
-            String propName = null;
-            String colType = null;
-            TypeBinding type = element.getType();
-            if(type != null && !type.isSimple()/* && type.hasSimpleContent()*/)
+            throw new JBossXBRuntimeException("Parent object is a map entry but characters of element " + qName
+                  + " of type " + type.getQName() + " were bound to niether key nor value in a map entry.");
+         }
+      }
+      else
+      {
+         String propName = null;
+         String colType = null;
+         TypeBinding type = element.getType();
+         if (type != null && !type.isSimple()/* && type.hasSimpleContent()*/)
+         {
+            PropertyMetaData propertyMetaData = type.getPropertyMetaData();
+            if (propertyMetaData == null)
             {
-               PropertyMetaData propertyMetaData = type.getPropertyMetaData();
-               if(propertyMetaData == null)
-               {
-                  CharactersMetaData charactersMetaData = type.getCharactersMetaData();
-                  propertyMetaData = charactersMetaData == null ? null : charactersMetaData.getProperty();
-               }
+               CharactersMetaData charactersMetaData = type.getCharactersMetaData();
+               propertyMetaData = charactersMetaData == null ? null : charactersMetaData.getProperty();
+            }
 
-               if(propertyMetaData != null)
-               {
-                  propName = propertyMetaData.getName();
-                  colType = propertyMetaData.getCollectionType();
-               }
+            if (propertyMetaData != null)
+            {
+               propName = propertyMetaData.getName();
+               colType = propertyMetaData.getCollectionType();
+            }
 
-               if(propName == null)
-               {
-                  propName = type.getSchemaBinding().getSimpleContentProperty();
-               }
+            if (propName == null)
+            {
+               propName = type.getSchemaBinding().getSimpleContentProperty();
             }
-            else
+         }
+         else
+         {
+            PropertyMetaData PropertyMetaData = element.getPropertyMetaData();
+            if (PropertyMetaData != null)
             {
-               PropertyMetaData PropertyMetaData = element.getPropertyMetaData();
-               if(PropertyMetaData != null)
-               {
-                  propName = PropertyMetaData.getName();
-                  colType = PropertyMetaData.getCollectionType();
-               }
-
-               if(propName == null)
-               {
-                  propName = Util.xmlNameToFieldName(qName.getLocalPart(), element.getSchema().isIgnoreLowLine());
-               }
+               propName = PropertyMetaData.getName();
+               colType = PropertyMetaData.getCollectionType();
             }
 
-            RtUtil.set(owner, value, propName, colType,
-               element.getSchema().isIgnoreUnresolvedFieldOrClass(),
-               element.getValueAdapter()
-            );
+            if (propName == null)
+            {
+               propName = Util.xmlNameToFieldName(qName.getLocalPart(), element.getSchema().isIgnoreLowLine());
+            }
          }
+
+         RtUtil.set(owner, value, propName, colType, element.getSchema().isIgnoreUnresolvedFieldOrClass(), element
+               .getValueAdapter());
       }
    }
 }