doxia (1.1.2-1) modello.patch

Summary

 doxia-core/src/main/mdo/document.mdo                                                              |   15 ++++++----
 doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java |    2 -
 2 files changed, 11 insertions(+), 6 deletions(-)

    
download this patch

Patch contents

Index: doxia-1.1.1/doxia-core/src/main/mdo/document.mdo
===================================================================
--- doxia-1.1.1.orig/doxia-core/src/main/mdo/document.mdo	2009-10-01 00:38:16.000000000 +0200
+++ doxia-1.1.1/doxia-core/src/main/mdo/document.mdo	2009-10-01 00:59:38.000000000 +0200
@@ -500,7 +500,7 @@
             return ISO_8601_FORMAT.format( getCreationDate() );
         }
 
-        return this.creationdate;
+        return this.creationDate.toString();
     }
 
     /**
@@ -518,7 +518,7 @@
             return ISO_8601_FORMAT.format( getDate() );
         }
 
-        return this.modifydate;
+        return this.date.toString();
     }
 
     /**
@@ -536,7 +536,7 @@
             return ISO_8601_FORMAT.format( getPrintDate() );
         }
 
-        return this.printdate;
+        return this.printDate.toString();
     }
             ]]>
           </code>
@@ -701,10 +701,12 @@
      */
     public String getFullName()
     {
+        /*
         if ( getName() != null && getName().trim().length() > 0 )
         {
             return getName().trim();
         }
+        */
 
         return ( getFirstName() != null ? getFirstName().trim() : "null" ) + " "
             + ( getLastName() != null ? getLastName().trim() : "null" );
@@ -783,7 +785,7 @@
             return ISO_8601_FORMAT.format( getDate() );
         }
 
-        return this.modifydate;
+        return this.date.toString();
     }
             ]]>
           </code>
@@ -1124,10 +1126,13 @@
     public String getAllAuthorNames()
     {
         StringBuffer sb = new StringBuffer();
+
+        /*
         if ( getAuthor() != null && getAuthor().trim().length() > 0 )
         {
             return getAuthor().trim();
         }
+        */
 
         if ( getAuthors() != null )
         {
@@ -1165,7 +1170,7 @@
             return ISO_8601_FORMAT.format( getCoverDate() );
         }
 
-        return this.coverdate;
+        return this.coverDate.toString();
     }
             ]]>
           </code>
--- doxia-1.1.1.orig/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
+++ doxia-1.1.1/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
@@ -1128,7 +1128,7 @@
         att.addAttribute( "height", "0.3in" );
         att.addAttribute( "text-align", "left" );
         writeStartTag( BLOCK_TAG, att );
-        write( compName == null ? ( cover.getAuthor() == null ? "" : cover.getAuthor() ) : compName );
+        write( compName == null ? ( cover.getAllAuthorNames() == null ? "" : cover.getAllAuthorNames() ) : compName );
         writeEndTag( BLOCK_TAG );
         writeEndTag( TABLE_CELL_TAG );