[jboss-svn-commits] JBoss Common SVN: r3115 - in jbossxb/trunk/src/main/java/org/jboss/xb: builder/runtime and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2009-04-16 09:59:46 -0400 (Thu, 16 Apr 2009)
New Revision: 3115

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
   jbossxb/trunk/src/main/java/org/jboss/xb/builder/runtime/AbstractPropertyHandler.java
Log:
include the cause for failed handle() call into the exception, remove old commented code

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2009-04-16 09:50:50 UTC (rev 3114)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2009-04-16 13:59:46 UTC (rev 3115)
@@ -116,39 +116,6 @@
       }
       
       ElementBinding e = (ElementBinding) stackItem.particle.getTerm();
-/*      if(!stackItem.ended && e.getType().isTextContentAllowed())
-      {
-         int i = start;
-         while (i < start + length)
-         {
-            if(ch[i] == 0x0a)
-            {
-               stackItem.indentation = true;
-            }
-            else
-            {
-               if (ch[i] == ' ' || ch[i] == 0x0d)
-               {
-               }
-               else
-               {
-                  stackItem.indentation = false;
-                  break;
-               }
-            }
-            ++i;
-         }
-
-         if(!stackItem.indentation)
-         {
-            if (stackItem.textContent == null)
-            {
-               stackItem.textContent = new StringBuffer();
-            }
-            stackItem.textContent.append(ch, start, length);
-         }
-      }
-*/
       // if current is ended the characters belong to its parent
       if(stackItem.ended)
       {
@@ -451,19 +418,6 @@
                   throw new JBossXBRuntimeException("No cursor for " + startName);
                }
 
-               // todo review
-               /*
-               if(!item.ended && cursor.isPositioned() && !cursor.getCurrentParticle().isRepeatable() && cursor.getParticle().getTerm() instanceof ChoiceBinding)
-               {
-                  endParticle(item, startName, 1);
-                  if(!item.particle.isRepeatable()) // this is for repeatable choices that should stay on the stack
-                  {
-                     pop();
-                  }
-                  continue;
-               }
-               */
-
                //int prevOccurence = cursor.getOccurence();
                ParticleBinding prevParticle = cursor.isPositioned() ? cursor.getCurrentParticle() : null;
                List<ModelGroupBinding.Cursor> newCursors = cursor.startElement(startName, atts);

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/builder/runtime/AbstractPropertyHandler.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/builder/runtime/AbstractPropertyHandler.java	2009-04-16 09:50:50 UTC (rev 3114)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/builder/runtime/AbstractPropertyHandler.java	2009-04-16 13:59:46 UTC (rev 3115)
@@ -103,7 +103,7 @@
       }
       catch (Throwable t)
       {
-         throw new RuntimeException("QName " + qName + "error setting property " + propertyInfo.getName() + " with value " + BuilderUtil.toDebugString(child) + " to " + BuilderUtil.toDebugString(parent));
+         throw new RuntimeException("QName " + qName + " error setting property " + propertyInfo.getName() + " with value " + BuilderUtil.toDebugString(child) + " to " + BuilderUtil.toDebugString(parent), t);
       }
    }