Author: vsiveton
Date: Sat Aug 4 03:55:34 2007
New Revision: 562689
URL: http://svn.apache.org/viewvc?view=rev&rev=562689
Log:
DOXIA-59: Doxia creates files with inconsistent new lines
o using EOL constant instead of '\n'
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java?view=diff&rev=562689&r1=562688&r2=562689
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
Sat Aug 4 03:55:34 2007
@@ -458,11 +458,11 @@
this.boxed = boxed;
if ( boxed )
{
- write( "\n" + BOXED_VERBATIM_START_MARKUP + "\n" );
+ write( EOL + BOXED_VERBATIM_START_MARKUP + EOL );
}
else
{
- write( "\n" + NON_BOXED_VERBATIM_START_MARKUP + "\n" );
+ write( EOL + NON_BOXED_VERBATIM_START_MARKUP + EOL );
}
}
@@ -471,11 +471,11 @@
{
if ( boxed )
{
- write( "\n" + BOXED_VERBATIM_END_MARKUP + "\n" );
+ write( EOL + BOXED_VERBATIM_END_MARKUP + EOL );
}
else
{
- write( "\n" + NON_BOXED_VERBATIM_END_MARKUP + "\n" );
+ write( EOL + NON_BOXED_VERBATIM_END_MARKUP + EOL );
}
boxed = false;
verbatimFlag = false;
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java?view=diff&rev=562689&r1=562688&r2=562689
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java
Sat Aug 4 03:55:34 2007
@@ -158,7 +158,8 @@
/** [EMAIL PROTECTED] */
protected String getVerbatimBlock( String text )
{
- return "\n" + AptMarkup.BOXED_VERBATIM_START_MARKUP + "\n" + text +
"\n" + AptMarkup.BOXED_VERBATIM_START_MARKUP + "\n";
+ return Markup.EOL + AptMarkup.BOXED_VERBATIM_START_MARKUP + Markup.EOL
+ text + Markup.EOL
+ + AptMarkup.BOXED_VERBATIM_START_MARKUP + Markup.EOL;
}
/** [EMAIL PROTECTED] */