Package: doxia / 1.1.4-6

0001-modello.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
From: Torsten Werner <twerner@debian.org>
Date: Fri, 9 Sep 2011 21:14:55 +0200
Subject: modello

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

diff --git a/doxia-core/src/main/mdo/document.mdo b/doxia-core/src/main/mdo/document.mdo
index a338c49..1807f42 100644
--- a/doxia-core/src/main/mdo/document.mdo
+++ b/doxia-core/src/main/mdo/document.mdo
@@ -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>
diff --git a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
index 72d6789..7aa1d63 100644
--- a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
+++ b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
@@ -1219,7 +1219,7 @@ public class FoAggregateSink
         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 );
 
--