Author: vsiveton
Date: Tue Oct 28 03:48:40 2008
New Revision: 708521
URL: http://svn.apache.org/viewvc?rev=708521&view=rev
Log:
o make all sink's constructors protected so the API will be correctly used
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/AbstractITextBookRenderer.java
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-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/AbstractITextBookRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/AbstractITextBookRenderer.java?rev=708521&r1=708520&r2=708521&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/AbstractITextBookRenderer.java
(original)
+++
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/AbstractITextBookRenderer.java
Tue Oct 28 03:48:40 2008
@@ -38,6 +38,7 @@
import org.apache.maven.doxia.book.model.Section;
import org.apache.maven.doxia.sink.PipelineSink;
import org.apache.maven.doxia.module.itext.ITextSink;
+import org.apache.maven.doxia.module.itext.ITextSinkFactory;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
import org.apache.maven.doxia.sink.Sink;
@@ -248,7 +249,7 @@
//
//
----------------------------------------------------------------------
- Sink itextSink = new ITextSink( writer );
+ Sink itextSink = new ITextSinkFactory().createSink( writer );
List pipeline = new ArrayList();
// pipeline.add( DebugSink.newInstance() );
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?rev=708521&r1=708520&r2=708521&view=diff
==============================================================================
---
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
Tue Oct 28 03:48:40 2008
@@ -109,7 +109,7 @@
* @param writer not null writer to write the result. <b>Should</b> be an
UTF-8 Writer.
* You could use <code>newWriter</code> methods from [EMAIL PROTECTED]
org.codehaus.plexus.util.WriterFactory}.
*/
- public AptSink( Writer writer )
+ protected AptSink( Writer writer )
{
this.buffer = new StringBuffer();
this.tableCaptionBuffer = new StringBuffer();
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java?rev=708521&r1=708520&r2=708521&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
Tue Oct 28 03:48:40 2008
@@ -71,7 +71,7 @@
* @param writer not null writer to write the result. <b>Should</b> be an
UTF-8 Writer.
* You could use <code>newWriter</code> methods from [EMAIL PROTECTED]
org.codehaus.plexus.util.WriterFactory}.
*/
- public ConfluenceSink( Writer writer )
+ protected ConfluenceSink( Writer writer )
{
this.out = new PrintWriter( writer );
this.writer = new StringWriter();
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java?rev=708521&r1=708520&r2=708521&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
Tue Oct 28 03:48:40 2008
@@ -145,7 +145,7 @@
* @param writer not null writer to write the result. <b>Should</b> be an
UTF-8 Writer.
* You could use <code>newXmlWriter</code> methods from [EMAIL PROTECTED]
org.codehaus.plexus.util.WriterFactory}.
*/
- public DocBookSink( Writer writer )
+ protected DocBookSink( Writer writer )
{
this.out = new PrintWriter( writer );
setItalicElement( "<emphasis>" );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.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/FoSink.java?rev=708521&r1=708520&r2=708521&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
Tue Oct 28 03:48:40 2008
@@ -85,7 +85,7 @@
* @param writer not null writer to write the result. <b>Should</b> be an
UTF-8 Writer.
* You could use <code>newXmlWriter</code> methods from [EMAIL PROTECTED]
org.codehaus.plexus.util.WriterFactory}.
*/
- public FoSink( Writer writer )
+ protected FoSink( Writer writer )
{
this.out = writer;
this.config = new FoConfiguration();
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java?rev=708521&r1=708520&r2=708521&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
Tue Oct 28 03:48:40 2008
@@ -107,7 +107,7 @@
/**
* @param writer
*/
- public ITextSink( Writer writer )
+ protected ITextSink( Writer writer )
{
this.writer = writer;
@@ -122,7 +122,7 @@
/**
* @param xmlWriter
*/
- public ITextSink( PrettyPrintXMLWriter xmlWriter )
+ protected ITextSink( PrettyPrintXMLWriter xmlWriter )
{
this.xmlWriter = xmlWriter;
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java?rev=708521&r1=708520&r2=708521&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
Tue Oct 28 03:48:40 2008
@@ -90,7 +90,7 @@
* @param out not null writer to write the result. <b>Should</b> be an
UTF-8 Writer.
* You could use <code>newWriter</code> methods from [EMAIL PROTECTED]
org.codehaus.plexus.util.WriterFactory}.
*/
- public LatexSink( Writer out )
+ protected LatexSink( Writer out )
{
this.out = new LineBreaker( out );
this.sinkCommands = defaultSinkCommands();
@@ -105,7 +105,7 @@
* @param sinkCommands A String representation of commands that go before
\documentclass.
* @param preamble A String representation of commands that go between
\documentclass and \begin{document}.
*/
- public LatexSink( Writer out, String sinkCommands, String preamble )
+ protected LatexSink( Writer out, String sinkCommands, String preamble )
{
this( out, sinkCommands, preamble, false );
}
@@ -120,7 +120,7 @@
* @param fragmentDocument If this receives events that that are only part
of a document.
* Typically, headers are omitted if this is true.
*/
- public LatexSink( Writer out, String sinkCommands, String preamble,
boolean fragmentDocument )
+ protected LatexSink( Writer out, String sinkCommands, String preamble,
boolean fragmentDocument )
{
this.out = new LineBreaker( out );
this.sinkCommands = sinkCommands;
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java?rev=708521&r1=708520&r2=708521&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
Tue Oct 28 03:48:40 2008
@@ -39,7 +39,7 @@
/**
* <a href="http://en.wikipedia.org/wiki/Rich_Text_Format";>RTF</a> Sink
implementation.
- *
+ *
* @version $Id$
* @since 1.0
*/
@@ -204,7 +204,7 @@
/**
* @throws IOException if any
*/
- public RtfSink()
+ protected RtfSink()
throws IOException
{
this( System.out );
@@ -214,7 +214,7 @@
* @param output not null
* @throws IOException if any
*/
- public RtfSink( OutputStream output )
+ protected RtfSink( OutputStream output )
throws IOException
{
this( output, null );
@@ -225,7 +225,7 @@
* @param encoding a valid charset
* @throws IOException if any
*/
- public RtfSink( OutputStream output, String encoding )
+ protected RtfSink( OutputStream output, String encoding )
throws IOException
{
fontTable = new Hashtable();
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java?rev=708521&r1=708520&r2=708521&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
Tue Oct 28 03:48:40 2008
@@ -75,7 +75,7 @@
* @param writer not null writer to write the result. <b>Should</b> be an
UTF-8 Writer.
* You could use <code>newWriter</code> methods from [EMAIL PROTECTED]
org.codehaus.plexus.util.WriterFactory}.
*/
- public TWikiSink( Writer writer )
+ protected TWikiSink( Writer writer )
{
this.out = new PrintWriter( writer );
this.writer = new StringWriter();
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java?rev=708521&r1=708520&r2=708521&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
Tue Oct 28 03:48:40 2008
@@ -61,7 +61,7 @@
* @param writer not null writer to write the result. <b>Should</b> be an
UTF-8 Writer.
* You could use <code>newXmlWriter</code> methods from [EMAIL PROTECTED]
org.codehaus.plexus.util.WriterFactory}.
*/
- public XdocSink( Writer writer )
+ protected XdocSink( Writer writer )
{
super( writer );
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.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/XhtmlSink.java?rev=708521&r1=708520&r2=708521&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Tue Oct 28 03:48:40 2008
@@ -72,7 +72,7 @@
* @param writer not null writer to write the result. <b>Should</b> be an
UTF-8 Writer.
* You could use <code>newXmlWriter</code> methods from [EMAIL PROTECTED]
org.codehaus.plexus.util.WriterFactory}.
*/
- public XhtmlSink( Writer writer )
+ protected XhtmlSink( Writer writer )
{
this( writer, null );
}
@@ -81,7 +81,7 @@
* @param writer
* @param renderingContext
*/
- public XhtmlSink( Writer writer, RenderingContext renderingContext )
+ protected XhtmlSink( Writer writer, RenderingContext renderingContext )
{
super( writer );
@@ -94,7 +94,7 @@
* @param directives
* @todo directives Map is not used
*/
- public XhtmlSink( Writer writer, RenderingContext renderingContext, Map
directives )
+ protected XhtmlSink( Writer writer, RenderingContext renderingContext, Map
directives )
{
this( writer, renderingContext );
}
