Author: hboutemy
Date: Sun Sep 20 07:50:29 2015
New Revision: 1704107
URL: http://svn.apache.org/viewvc?rev=1704107&view=rev
Log:
[DOXIA-531] improved MacroRequest API with parser and sourceContent parameters
requirements
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java?rev=1704107&r1=1704106&r2=1704107&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
Sun Sep 20 07:50:29 2015
@@ -262,11 +262,8 @@ public class XhtmlParser
parameters.put( key, value );
}
- parameters.put( "sourceContent", sourceContent );
- XhtmlParser xhtmlParser = new XhtmlParser();
- xhtmlParser.setSecondParsing( true );
- parameters.put( "parser", xhtmlParser );
- MacroRequest request = new MacroRequest( parameters, getBasedir() );
+ MacroRequest request = new MacroRequest( sourceContent, new
XhtmlParser(), parameters, getBasedir() );
+
try
{
executeMacro( macroName, request, sink );