svn commit: r772917 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

[vsiveton]

Author: vsiveton
Date: Fri May  8 10:17:35 2009
New Revision: 772917

URL: http://svn.apache.org/viewvc?rev=772917&view=rev
Log:
o improved exception messages

Modified:
    
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=772917&r1=772916&r2=772917&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 Fri May  8 10:17:35 2009
@@ -251,6 +251,7 @@
                 }
 
                 String key = context.getOutputName();
+                key = StringUtils.replace( key, "\\", "/" );
 
                 if ( files.containsKey( key ) )
                 {
@@ -260,7 +261,8 @@
 
                     File originalDoc = new File( originalContext.getBasedir(), 
originalContext.getInputName() );
 
-                    throw new RendererException( "Files '" + doc + "' clashes 
with existing '" + originalDoc + "'." );
+                    throw new RendererException( "Files '" + 
module.getSourceDirectory() + File.separator + doc
+                        + "' clashes with existing '" + originalDoc + "'." );
                 }
                 // 
-----------------------------------------------------------------------
                 // Handle key without case differences
@@ -276,23 +278,21 @@
 
                         File originalDoc = new File( 
originalContext.getBasedir(), originalContext.getInputName() );
 
-                        if ( Os.isFamily( "windows" ) )
+                        if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
                         {
-                            throw new RendererException(
-                                    "Files '" + doc + "' clashes with existing 
'" + originalDoc + "'." );
+                            throw new RendererException( "Files '" + 
module.getSourceDirectory() + File.separator
+                                + doc + "' clashes with existing '" + 
originalDoc + "'." );
                         }
 
                         if ( getLogger().isWarnEnabled() )
                         {
                             getLogger().warn(
-                                              "Files '" + doc + "' could 
clashes with existing '" + originalDoc
-                                                  + "'." );
+                                              "Files '" + 
module.getSourceDirectory() + File.separator + doc
+                                                  + "' could clashes with 
existing '" + originalDoc + "'." );
                         }
                     }
                 }
 
-                key = StringUtils.replace( key, "\\", "/" );
-
                 files.put( key, new DoxiaDocumentRenderer( context ) );
             }
         }