maven-doxia-commits mailing list archives

Author: hboutemy
Date: Sun Nov  9 14:16:42 2008
New Revision: 712574

URL: http://svn.apache.org/viewvc?rev=712574&view=rev
Log:
DOXIA-185: fixed AbstractTextSinkFactory implementors which marked createSink( Writer, String
) as public instead of protected

Modified:
    maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/AbstractModuleTest.java
    maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java

Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/AbstractModuleTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/AbstractModuleTest.java?rev=712574&r1=712573&r2=712574&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/AbstractModuleTest.java
(original)
+++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/AbstractModuleTest.java
Sun Nov  9 14:16:42 2008
@@ -46,14 +46,12 @@
      * <ul>
      * <li><code>line.separator</code> to <code>\n</code> (Unix)
to prevent
      * failure on windows.</li>
-     * <li><code>file.encoding</code> to <code>UTF-8</code>.</li>
      * </ul>
      */
     static
     {
         // Safety
         System.setProperty( "line.separator", "\n" );
-        System.setProperty( "file.encoding", "UTF-8" );
     }
 
     // ----------------------------------------------------------------------

Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java?rev=712574&r1=712573&r2=712574&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java
(original)
+++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java
Sun Nov  9 14:16:42 2008
@@ -24,6 +24,7 @@
 
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.sink.TextSink;
+import org.codehaus.plexus.util.IOUtil;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -118,15 +119,8 @@
         }
         finally
         {
-            if ( writer  != null )
-            {
-                writer.close();
-            }
-
-            if ( reader != null )
-            {
-                reader.close();
-            }
+            IOUtil.close( reader );
+            IOUtil.close( writer );
         }
     }
 

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.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/AptSinkFactory.java?rev=712574&r1=712573&r2=712574&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.java
Sun Nov  9 14:16:42 2008
@@ -36,7 +36,7 @@
     extends AbstractTextSinkFactory
 {
     /** {@inheritDoc} */
-    public Sink createSink( Writer writer, String encoding )
+    protected Sink createSink( Writer writer, String encoding )
     {
         // encoding can safely be ignored since it isn't written into the generated APT source
         return new AptSink( writer );

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.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/ConfluenceSinkFactory.java?rev=712574&r1=712573&r2=712574&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java
Sun Nov  9 14:16:42 2008
@@ -36,7 +36,7 @@
     extends AbstractTextSinkFactory
 {
     /** {@inheritDoc} */
-    public Sink createSink( Writer writer, String encoding )
+    protected Sink createSink( Writer writer, String encoding )
     {
         // encoding can safely be ignored since it isn't written into the generated Confluence
source
         return new ConfluenceSink( writer );

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.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/DocbookSinkFactory.java?rev=712574&r1=712573&r2=712574&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java
Sun Nov  9 14:16:42 2008
@@ -36,7 +36,7 @@
     extends AbstractTextSinkFactory
 {
     /** {@inheritDoc} */
-    public Sink createSink( Writer writer, String encoding )
+    protected Sink createSink( Writer writer, String encoding )
     {
         return new DocBookSink( writer, encoding );
     }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.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/FoSinkFactory.java?rev=712574&r1=712573&r2=712574&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java
Sun Nov  9 14:16:42 2008
@@ -36,7 +36,7 @@
     extends AbstractTextSinkFactory
 {
     /** {@inheritDoc} */
-    public Sink createSink( Writer writer, String encoding )
+    protected Sink createSink( Writer writer, String encoding )
     {
         return new FoSink( writer, encoding );
     }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.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/ITextSinkFactory.java?rev=712574&r1=712573&r2=712574&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java
Sun Nov  9 14:16:42 2008
@@ -38,7 +38,7 @@
     extends AbstractTextSinkFactory
 {
     /** {@inheritDoc} */
-    public Sink createSink( Writer writer, String encoding )
+    protected Sink createSink( Writer writer, String encoding )
     {
         return new ITextSink( writer, encoding );
     }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.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/LatexSinkFactory.java?rev=712574&r1=712573&r2=712574&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java
Sun Nov  9 14:16:42 2008
@@ -36,7 +36,7 @@
     extends AbstractTextSinkFactory
 {
     /** {@inheritDoc} */
-    public Sink createSink( Writer writer, String encoding )
+    protected Sink createSink( Writer writer, String encoding )
     {
         // TODO: can encoding safely be ignored? Shouldn't it be written into the generated
Latex source
         // as inputenc package parameter?

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.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/TWikiSinkFactory.java?rev=712574&r1=712573&r2=712574&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java
Sun Nov  9 14:16:42 2008
@@ -36,7 +36,7 @@
     extends AbstractTextSinkFactory
 {
     /** {@inheritDoc} */
-    public Sink createSink( Writer writer, String encoding )
+    protected Sink createSink( Writer writer, String encoding )
     {
         // encoding can safely be ignored since it isn't written into the generated TWiki
source
         return new TWikiSink( writer );

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.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/XdocSinkFactory.java?rev=712574&r1=712573&r2=712574&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java
Sun Nov  9 14:16:42 2008
@@ -36,7 +36,7 @@
     extends AbstractTextSinkFactory
 {
     /** {@inheritDoc} */
-    public Sink createSink( Writer writer, String encoding )
+    protected Sink createSink( Writer writer, String encoding )
     {
         return new XdocSink( writer, encoding );
     }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.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/XhtmlSinkFactory.java?rev=712574&r1=712573&r2=712574&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
Sun Nov  9 14:16:42 2008
@@ -36,7 +36,7 @@
     extends AbstractTextSinkFactory
 {
     /** {@inheritDoc} */
-    public Sink createSink( Writer writer, String encoding )
+    protected Sink createSink( Writer writer, String encoding )
     {
         return new XhtmlSink( writer, encoding );
     }