[jboss-svn-commits] JBoss Common SVN: r2658 - jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax.

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

Author: alex.loubyansky at jboss.com
Date: 2007-10-26 10:01:34 -0400 (Fri, 26 Oct 2007)
New Revision: 2658

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax/SaxJBossXBParser.java
Log:
JBXB-112

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax/SaxJBossXBParser.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax/SaxJBossXBParser.java	2007-10-25 21:09:28 UTC (rev 2657)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax/SaxJBossXBParser.java	2007-10-26 14:01:34 UTC (rev 2658)
@@ -90,21 +90,7 @@
       try
       {
          parser = saxFactory.newSAXParser();
-
-         StringBuffer sb = new StringBuffer();
-         sb.append("Created parser: ").append(parser)
-         .append(", isNamespaceAware: ").append(parser.isNamespaceAware())
-         .append(", isValidating: ").append(parser.isValidating())
-         .append(", isXIncludeAware: ");
-         try
-         {
-            sb.append(parser.isXIncludeAware());
-         }
-         catch(UnsupportedOperationException e)
-         {
-            sb.append("unsupported operation '").append(e.getMessage()).append('\'');
-         }
-         log.debug(sb.toString());
+         logParserInfo();
       }
       catch(Exception e)
       {
@@ -180,16 +166,13 @@
    {
       this.contentHandler = handler;
       trace = log.isTraceEnabled();
+
+      logParserInfo();
       try
       {
-         log.debug("Using parser: "+parser
-               + ", isNamespaceAware: "+parser.isValidating()
-               + ", isValidating: "+parser.isValidating()
-               + ", isXIncludeAware: "+parser.isXIncludeAware()
-               );
          reader.parse(systemId);
       }
-      catch(Exception e)
+      catch(Throwable e)
       {
          throw new JBossXBException("Failed to parse source: " + getLocationAsString(systemId), e);
       }
@@ -199,16 +182,13 @@
    {
       this.contentHandler = handler;
       trace = log.isTraceEnabled();
+      
+      logParserInfo();
       try
       {
-         log.debug("Using parser: "+parser
-               + ", isNamespaceAware: "+parser.isValidating()
-               + ", isValidating: "+parser.isValidating()
-               + ", isXIncludeAware: "+parser.isXIncludeAware()
-               );
          reader.parse(new InputSource(is));
       }
-      catch(Exception e)
+      catch(Throwable e)
       {
          throw new JBossXBException("Failed to parse source: " + e.getMessage(), e);
       }
@@ -218,16 +198,13 @@
    {
       this.contentHandler = handler;
       trace = log.isTraceEnabled();
+      
+      logParserInfo();
       try
       {
-         log.debug("Using parser: "+parser
-               + ", isNamespaceAware: "+parser.isValidating()
-               + ", isValidating: "+parser.isValidating()
-               + ", isXIncludeAware: "+parser.isXIncludeAware()
-               );
          this.reader.parse(new InputSource(reader));
       }
-      catch(Exception e)
+      catch(Throwable e)
       {
          throw new JBossXBException("Failed to parse source: " + e.getMessage(), e);
       }
@@ -252,6 +229,24 @@
       }
    }
 
+   private void logParserInfo()
+   {
+      StringBuffer sb = new StringBuffer();
+      sb.append("Created parser: ").append(parser)
+      .append(", isNamespaceAware: ").append(parser.isNamespaceAware())
+      .append(", isValidating: ").append(parser.isValidating())
+      .append(", isXIncludeAware: ");
+      try
+      {
+         sb.append(parser.isXIncludeAware());
+      }
+      catch(UnsupportedOperationException e)
+      {
+         sb.append("unsupported operation '").append(e.getMessage()).append('\'');
+      }
+      log.debug(sb.toString());
+   }
+
    // Inner
 
    private final class DelegatingContentHandler