svn commit: r784725 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java

[vsiveton]

Author: vsiveton
Date: Mon Jun 15 10:57:11 2009
New Revision: 784725

URL: http://svn.apache.org/viewvc?rev=784725&view=rev
Log:
o logging improvements

Modified:
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java?rev=784725&r1=784724&r2=784725&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
 Mon Jun 15 10:57:11 2009
@@ -83,25 +83,13 @@
     public void parse( Reader source, Sink sink )
         throws ParseException
     {
-        super.parse( source, sink );
-
-        if ( getLog().isWarnEnabled() && this.warnMessages != null && 
!isSecondParsing() )
+        try
         {
-            for ( Iterator it = this.warnMessages.entrySet().iterator(); 
it.hasNext(); )
-            {
-                Map.Entry entry = (Map.Entry) it.next();
-
-                Set set = (Set) entry.getValue();
-
-                for ( Iterator it2 = set.iterator(); it2.hasNext(); )
-                {
-                    String msg = (String) it2.next();
-
-                    getLog().warn( msg );
-                }
-            }
-
-            this.warnMessages = null;
+            super.parse( source, sink );
+        }
+        finally
+        {
+            logWarnings();
         }
     }
 
@@ -964,4 +952,28 @@
         set.add( msg );
         warnMessages.put( key, set );
     }
+
+    /**
+     * @since 1.1.1
+     */
+    private void logWarnings()
+    {
+        if ( getLog().isWarnEnabled() && this.warnMessages != null && 
!isSecondParsing() )
+        {
+            for ( Iterator it = this.warnMessages.entrySet().iterator(); 
it.hasNext(); )
+            {
+                Map.Entry entry = (Map.Entry) it.next();
+
+                Set set = (Set) entry.getValue();
+                for ( Iterator it2 = set.iterator(); it2.hasNext(); )
+                {
+                    String msg = (String) it2.next();
+
+                    getLog().warn( msg );
+                }
+            }
+
+            this.warnMessages = null;
+        }
+    }
 }

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java?rev=784725&r1=784724&r2=784725&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
 Mon Jun 15 10:57:11 2009
@@ -108,16 +108,22 @@
             IOUtil.close( source );
         }
 
-        Reader tmp = new StringReader( sourceContent );
+        try
+        {
+            Reader tmp = new StringReader( sourceContent );
 
-        this.faqs = new Faqs();
+            this.faqs = new Faqs();
 
-        // this populates faqs
-        super.parse( tmp, sink );
+            // this populates faqs
+            super.parse( tmp, sink );
 
-        writeFaqs( sink );
+            writeFaqs( sink );
+        }
+        finally
+        {
 
-        logWarnings();
+            logWarnings();
+        }
     }
 
     /** {...@inheritdoc} */
@@ -710,6 +716,9 @@
         warnMessages.put( key, set );
     }
 
+    /**
+     * @since 1.1.1
+     */
     private void logWarnings()
     {
         if ( getLog().isWarnEnabled() && this.warnMessages != null && 
!isSecondParsing() )
@@ -717,13 +726,16 @@
             for ( Iterator it = this.warnMessages.entrySet().iterator(); 
it.hasNext(); )
             {
                 Map.Entry entry = (Map.Entry) it.next();
+
                 Set set = (Set) entry.getValue();
                 for ( Iterator it2 = set.iterator(); it2.hasNext(); )
                 {
                     String msg = (String) it2.next();
+
                     getLog().warn( msg );
                 }
             }
+
             this.warnMessages = null;
         }
     }