Author: ltheussl
Date: Fri May 15 12:14:21 2009
New Revision: 775098
URL: http://svn.apache.org/viewvc?rev=775098&view=rev
Log:
Correct footer text
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=775098&r1=775097&r2=775098&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
Fri May 15 12:14:21 2009
@@ -556,9 +556,32 @@
*/
protected String getFooterText()
{
- // TODO: year and company have to come from DocumentMeta
- int actualYear = Calendar.getInstance().get( Calendar.YEAR );
- return "©" + actualYear + " The Apache Software Foundation
• ALL RIGHTS RESERVED";
+ int actualYear;
+ String add = " • ALL RIGHTS RESERVED.";
+ String companyName = "";
+
+ if ( docModel != null && docModel.getMeta() != null &&
docModel.getMeta().isConfidential() )
+ {
+ add = add + " • PROPRIETARY AND CONFIDENTIAL";
+ }
+
+ if ( docModel != null && docModel.getCover() != null &&
docModel.getCover().getCompanyName() != null )
+ {
+ companyName = docModel.getCover().getCompanyName();
+ }
+
+ if ( docModel != null && docModel.getMeta() != null &&
docModel.getMeta().getDate() != null )
+ {
+ Calendar date = Calendar.getInstance();
+ date.setTime( docModel.getMeta().getDate() );
+ actualYear = date.get( Calendar.YEAR );
+ }
+ else
+ {
+ actualYear = Calendar.getInstance().get( Calendar.YEAR );
+ }
+
+ return "©" + actualYear + ", " + companyName + add;
}
/**
@@ -687,7 +710,7 @@
writeEmptyTag( TABLE_COLUMN_TAG, "column-width", "0.45in" );
writeEmptyTag( TABLE_COLUMN_TAG, "column-width", "0.4in" );
writeEmptyTag( TABLE_COLUMN_TAG, "column-width", "0.4in" );
- writeEmptyTag( TABLE_COLUMN_TAG, "column-width", "5in" ); // TODO
+ writeEmptyTag( TABLE_COLUMN_TAG, "column-width", "5in" ); // TODO
{$maxBodyWidth - 1.25}in
writeStartTag( TABLE_BODY_TAG, "" );
writeTocItems( toc.getItems(), 1 );