Author: vsiveton
Date: Thu Jun 11 00:11:20 2009
New Revision: 783586
URL: http://svn.apache.org/viewvc?rev=783586&view=rev
Log:
DOXIA-337: Update document model due to MODELLO-199
o updated the model
o fixed code due to these changes
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java?rev=783586&r1=783585&r2=783586&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
Thu Jun 11 00:11:20 2009
@@ -375,7 +375,7 @@
System.getProperty( "user.name", "null" ) );
// see com.lowagie.text.Document#addCreationDate()
SimpleDateFormat sdf = new SimpleDateFormat( "EEE MMM dd HH:mm:ss zzz
yyyy" );
- addTransformerParameter( transformer, "meta.creationdate",
documentModel.getMeta().getCreationDate_(),
+ addTransformerParameter( transformer, "meta.creationdate",
documentModel.getMeta().getCreationdate(),
sdf.format( new Date() ) );
addTransformerParameter( transformer, "meta.keywords",
documentModel.getMeta().getAllKeyWords() );
addTransformerParameter( transformer, "meta.pagesize",
documentModel.getMeta().getSubject(),
@@ -403,15 +403,15 @@
String companyLogo = getLogoURL(
documentModel.getCover().getCompanyLogo(), iTextFile.getParentFile() );
addTransformerParameter( transformer, "cover.companyLogo", companyLogo
);
addTransformerParameter( transformer, "cover.companyName",
documentModel.getCover().getCompanyName() );
- if ( documentModel.getCover().getCoverDate_() == null )
+ if ( documentModel.getCover().getCoverdate() == null )
{
documentModel.getCover().setCoverDate( new Date() );
- addTransformerParameter( transformer, "cover.date",
documentModel.getCover().getCoverDate_() );
+ addTransformerParameter( transformer, "cover.date",
documentModel.getCover().getCoverdate() );
documentModel.getCover().setCoverDate( null );
}
else
{
- addTransformerParameter( transformer, "cover.date",
documentModel.getCover().getCoverDate_() );
+ addTransformerParameter( transformer, "cover.date",
documentModel.getCover().getCoverdate() );
}
addTransformerParameter( transformer, "cover.subtitle",
documentModel.getCover().getCoverSubTitle() );
addTransformerParameter( transformer, "cover.title",
documentModel.getCover().getCoverTitle() );
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo?rev=783586&r1=783585&r2=783586&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/mdo/document.mdo Thu Jun 11
00:11:20 2009
@@ -234,7 +234,7 @@
<type>Date</type>
<identifier>true</identifier>
</field>
- <field>
+ <field java.getter="false">
<name>creationdate</name>
<version>1.0.1+</version>
<description><![CDATA[
@@ -255,7 +255,7 @@
<type>Date</type>
<identifier>true</identifier>
</field>
- <field>
+ <field java.getter="false">
<name>modifydate</name>
<version>1.0.1+</version>
<description><![CDATA[
@@ -276,7 +276,7 @@
<type>Date</type>
<identifier>true</identifier>
</field>
- <field>
+ <field java.getter="false">
<name>printdate</name>
<version>1.0.1+</version>
<description><![CDATA[
@@ -489,57 +489,54 @@
* Get the date and time when the document was created initially.
*
* @return the <code>getCreationDate()</code> if setted, formatted using
ISO-8601 English format, otherwise return
- * the <code>getCreationdate()</code>.
+ * the <code>creationdate</code>.
* @since 1.1.1
* @see #getCreationDate()
- * @see #getCreationdate()
*/
- public String getCreationDate_()
+ public String getCreationdate()
{
if ( getCreationDate() != null )
{
return ISO_8601_FORMAT.format( getCreationDate() );
}
- return getCreationdate();
+ return this.creationdate;
}
/**
* Get the date and time when the document was last modified.
*
* @return the <code>getDate()</code> if setted, formatted using ISO-8601
English format, otherwise return
- * the <code>getModifydate()</code>.
+ * the <code>modifydate</code>.
* @since 1.1.1
* @see #getDate()
- * @see #getModifydate()
*/
- public String getModifyDate_()
+ public String getModifydate()
{
if ( getDate() != null )
{
return ISO_8601_FORMAT.format( getDate() );
}
- return getModifydate();
+ return this.modifydate;
}
/**
* Get the date and time when the document was last printed.
*
* @return the <code>getPrintDate()</code> if setted, formatted using
ISO-8601 English format, otherwise return
- * the <code>getPrintdate()</code>.
+ * the <code>printdate</code>.
* @since 1.1.1
* @see #getPrintDate()
- * @see #getPrintdate()
*/
- public String getPrintDate_()
+ public String getPrintdate()
{
if ( getPrintDate() != null )
{
return ISO_8601_FORMAT.format( getPrintDate() );
}
- return getPrintdate();
+ return this.printdate;
}
]]>
</code>
@@ -752,7 +749,7 @@
<type>Date</type>
<identifier>true</identifier>
</field>
- <field xml.attribute="true">
+ <field java.getter="false" xml.attribute="true">
<name>modifydate</name>
<version>1.0.1+</version>
<description><![CDATA[
@@ -775,19 +772,18 @@
* Get the date and time when the template was last modified.
*
* @return the <code>getDate()</code> if setted, formatted using ISO-8601
English format, otherwise return
- * the <code>getModifydate()</code>.
+ * the <code>modifydate</code>.
* @since 1.1.1
* @see #getDate()
- * @see #getModifydate()
*/
- public String getModifyDate_()
+ public String getModifydate()
{
if ( getDate() != null )
{
return ISO_8601_FORMAT.format( getDate() );
}
- return getModifydate();
+ return this.modifydate;
}
]]>
</code>
@@ -1041,7 +1037,7 @@
<type>Date</type>
<identifier>true</identifier>
</field>
- <field>
+ <field java.getter="false">
<name>coverdate</name>
<description><![CDATA[
The date as String (recommended format is ISO 8601) to appear on
the cover.
@@ -1158,19 +1154,18 @@
* Get the date to appear on the cover.
*
* @return the <code>getCoverDate()</code> if setted, formatted using
ISO-8601 English format, otherwise return
- * the <code>getCoverdate()</code>.
+ * the <code>coverdate</code>.
* @since 1.1.1
* @see #getCoverDate()
- * @see #getCoverdate()
*/
- public String getCoverDate_()
+ public String getCoverdate()
{
if ( getCoverDate() != null )
{
return ISO_8601_FORMAT.format( getCoverDate() );
}
- return getCoverdate();
+ return this.coverdate;
}
]]>
</code>
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java?rev=783586&r1=783585&r2=783586&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
Thu Jun 11 00:11:20 2009
@@ -80,7 +80,7 @@
assertTrue( model.toString().length() > 0 );
assertEquals( "outputName", model.getOutputName() );
- //assertEquals( "ISO-8859-1", model.getModelEncoding() ); //
MODELLO-189
+ assertEquals( "ISO-8859-1", model.getModelEncoding() );
verifyDocumentCover( model.getCover() );
verifyDocumentTOC( model.getToc() );
verifyDocumentMeta( model.getMeta() );
@@ -136,7 +136,6 @@
cover.setCompanyLogo( "companyLogo" );
cover.setCompanyName( "companyName" );
cover.setCoverDate( new Date( 0L ) );
- cover.setCoverdate( "coverDate" );
cover.setCoverSubTitle( "coverSubTitle" );
cover.setCoverTitle( "coverTitle" );
cover.setCoverType( "coverType" );
@@ -157,7 +156,7 @@
assertEquals( "companyLogo", cover.getCompanyLogo() );
assertEquals( "companyName", cover.getCompanyName() );
assertEquals( 0L, cover.getCoverDate().getTime() );
- assertEquals( "coverDate", cover.getCoverdate() );
+ assertEquals( "1969-12-31", cover.getCoverdate() );
assertEquals( "coverSubTitle", cover.getCoverSubTitle() );
assertEquals( "coverTitle", cover.getCoverTitle() );
assertEquals( "coverType", cover.getCoverType() );
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=783586&r1=783585&r2=783586&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
Thu Jun 11 00:11:20 2009
@@ -1109,15 +1109,15 @@
{
compName = cover.getCompanyName();
- if ( cover.getCoverDate_() == null )
+ if ( cover.getCoverdate() == null )
{
cover.setCoverDate( new Date() );
- date = cover.getCoverDate_();
+ date = cover.getCoverdate();
cover.setCoverDate( null );
}
else
{
- date = cover.getCoverDate_();
+ date = cover.getCoverdate();
}
}
