svn commit: r571131 - /maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java

[vsiveton]

Author: vsiveton
Date: Thu Aug 30 05:24:21 2007
New Revision: 571131

URL: http://svn.apache.org/viewvc?rev=571131&view=rev
Log:
o fixed potential NPE

Modified:
    
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java?rev=571131&r1=571130&r2=571131&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java
 Thu Aug 30 05:24:21 2007
@@ -222,7 +222,7 @@
                             outTmp = outTmp.substring( 0, outTmp.lastIndexOf( 
"." ) );
 
                             String outRef = StringUtils.replace( 
tocItem.getRef(), "\\", "/" );
-                            if (outRef.lastIndexOf( "." )!= -1)
+                            if ( outRef.lastIndexOf( "." ) != -1 )
                             {
                                 outRef = outRef.substring( 0, 
outRef.lastIndexOf( "." ) );
                             }
@@ -400,11 +400,23 @@
      */
     private void addTransformerParameters( Transformer transformer, 
DocumentModel documentModel )
     {
-        transformer.setParameter( "title", documentModel.getMeta().getTitle() 
);
-        transformer.setParameter( "author", 
documentModel.getMeta().getAuthor() );
+        if ( documentModel.getMeta().getTitle() != null )
+        {
+            transformer.setParameter( "title", 
documentModel.getMeta().getTitle() );
+        }
+        if ( documentModel.getMeta().getAuthor() != null )
+        {
+            transformer.setParameter( "author", 
documentModel.getMeta().getAuthor() );
+        }
         transformer.setParameter( "creationdate", new Date().toString() );
-        transformer.setParameter( "subject", 
documentModel.getMeta().getSubject() );
-        transformer.setParameter( "keywords", 
documentModel.getMeta().getKeywords() );
+        if ( documentModel.getMeta().getSubject() != null )
+        {
+            transformer.setParameter( "subject", 
documentModel.getMeta().getSubject() );
+        }
+        if ( documentModel.getMeta().getKeywords() != null )
+        {
+            transformer.setParameter( "keywords", 
documentModel.getMeta().getKeywords() );
+        }
         transformer.setParameter( "producer", "Generated with Doxia by " + 
System.getProperty( "user.name" ) );
         if ( ITextUtil.isPageSizeSupported( documentModel.getMeta().getTitle() 
) )
         {
@@ -416,7 +428,10 @@
         }
 
         transformer.setParameter( "frontPageHeader", "" );
-        transformer.setParameter( "frontPageTitle", 
documentModel.getMeta().getTitle() );
+        if ( documentModel.getMeta().getTitle() != null )
+        {
+            transformer.setParameter( "frontPageTitle", 
documentModel.getMeta().getTitle() );
+        }
         transformer.setParameter( "frontPageFooter", "Generated date " + new 
Date().toString() );
     }