You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by lt...@apache.org on 2009/04/28 17:27:01 UTC
svn commit: r769433 - in
/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book:
./ services/io/ services/renderer/ services/renderer/docbook/
services/renderer/latex/ services/renderer/xdoc/ services/renderer/xhtml/
Author: ltheussl
Date: Tue Apr 28 15:26:55 2009
New Revision: 769433
URL: http://svn.apache.org/viewvc?rev=769433&view=rev
Log:
Replace deprecated methods, code formatting
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/InvalidBookDescriptorException.java
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/io/DefaultBookIo.java
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSink.java
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/AbstractXdocBookSink.java
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/ChapterXdocBookSink.java
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/IndexXdocBookSink.java
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/SectionXdocBookSink.java
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xhtml/XhtmlBookSink.java
Modified: maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/InvalidBookDescriptorException.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/InvalidBookDescriptorException.java?rev=769433&r1=769432&r2=769433&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/InvalidBookDescriptorException.java (original)
+++ maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/InvalidBookDescriptorException.java Tue Apr 28 15:26:55 2009
@@ -30,6 +30,10 @@
public class InvalidBookDescriptorException
extends BookDoxiaException
{
+
+ /** serialVersionUID */
+ private static final long serialVersionUID = -5706648416915909753L;
+
/** ValidationResult. */
private ValidationResult validationResult;
Modified: maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/io/DefaultBookIo.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/io/DefaultBookIo.java?rev=769433&r1=769432&r2=769433&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/io/DefaultBookIo.java (original)
+++ maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/io/DefaultBookIo.java Tue Apr 28 15:26:55 2009
@@ -30,7 +30,6 @@
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import java.io.FileReader;
import java.io.IOException;
import java.io.File;
import java.io.Reader;
Modified: maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java?rev=769433&r1=769432&r2=769433&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java (original)
+++ maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java Tue Apr 28 15:26:55 2009
@@ -407,7 +407,8 @@
{
try
{
- Writer writer = WriterFactory.newXmlWriter( new File( context.getOutputDirectory() + "/" + section.getId() + ".xml" ) );
+ Writer writer = WriterFactory.newXmlWriter( new File( context.getOutputDirectory()
+ + "/" + section.getId() + ".xml" ) );
SectionXdocBookSink sink = new SectionXdocBookSink( writer, sectionIndex, i18n, context.getLocale() );
Modified: maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSink.java?rev=769433&r1=769432&r2=769433&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSink.java Tue Apr 28 15:26:55 2009
@@ -25,7 +25,6 @@
import javax.swing.text.html.HTML.Tag;
import org.apache.maven.doxia.module.docbook.DocBookSink;
-import org.apache.maven.doxia.module.docbook.DocbookMarkup;
/**
* An Docbook Sink that doesn't write out head or body elements for every section of a book, and has some convenience
@@ -60,7 +59,7 @@
/**
* {@inheritDoc}
*
- * Does nothing because we don't want the header from each document to crop up in the middle of a book.
+ * Does nothing because we don't want the header from each document to crop up in the middle of a book.
*/
public void head()
{
@@ -70,7 +69,7 @@
/**
* {@inheritDoc}
*
- * Does nothing because we don't want the header from each document to crop up in the middle of a book.
+ * Does nothing because we don't want the header from each document to crop up in the middle of a book.
*/
public void head_()
{
@@ -80,7 +79,7 @@
/**
* {@inheritDoc}
*
- * Marks the skip flag to true so that this element's text is not emitted by the base class.
+ * Marks the skip flag to true so that this element's text is not emitted by the base class.
*/
public void title()
{
@@ -90,7 +89,7 @@
/**
* {@inheritDoc}
*
- * Marks the skip flag to false so that rendering can resume.
+ * Marks the skip flag to false so that rendering can resume.
*/
public void title_()
{
@@ -100,7 +99,7 @@
/**
* {@inheritDoc}
*
- * Marks the skip flag to true so that this element's text is not emitted by the base class.
+ * Marks the skip flag to true so that this element's text is not emitted by the base class.
*/
public void author()
{
@@ -110,7 +109,7 @@
/**
* {@inheritDoc}
*
- * Marks the skip flag to false so that rendering can resume.
+ * Marks the skip flag to false so that rendering can resume.
*/
public void author_()
{
@@ -120,7 +119,7 @@
/**
* {@inheritDoc}
*
- * Does nothing because we don't want the header from each document to crop up in the middle of a book.
+ * Does nothing because we don't want the header from each document to crop up in the middle of a book.
*/
public void body()
{
@@ -130,7 +129,7 @@
/**
* {@inheritDoc}
*
- * Does nothing because we don't want the header from each document to crop up in the middle of a book.
+ * Does nothing because we don't want the header from each document to crop up in the middle of a book.
*/
public void body_()
{
Modified: maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java?rev=769433&r1=769432&r2=769433&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/latex/LatexBookSink.java Tue Apr 28 15:26:55 2009
@@ -33,7 +33,7 @@
extends LatexSink
{
/** text. */
- private String text;
+ private String txt;
/** title. */
private String title;
@@ -75,9 +75,9 @@
// ----------------------------------------------------------------------
/** {@inheritDoc} */
- public void text( String newText )
+ public void text( String text )
{
- this.text = newText;
+ this.txt = text;
super.text( text );
}
@@ -87,7 +87,7 @@
{
super.title_();
- this.title = text;
+ this.title = txt;
}
// ----------------------------------------------------------------------
Modified: maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/AbstractXdocBookSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/AbstractXdocBookSink.java?rev=769433&r1=769432&r2=769433&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/AbstractXdocBookSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/AbstractXdocBookSink.java Tue Apr 28 15:26:55 2009
@@ -70,24 +70,24 @@
{
writeStartTag( Tag.BODY );
- markup( "<section name=\"\">" );
+ write( "<section name=\"\">" );
navigationPanel();
horizontalRule();
- markup( "</section>" );
+ write( "</section>" );
}
/** {@inheritDoc} */
public void body_()
{
- markup( "<section name=\"\">" );
+ write( "<section name=\"\">" );
horizontalRule();
navigationPanel();
- markup( "</section>" );
+ write( "</section>" );
writeEndTag( Tag.BODY );
Modified: maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/ChapterXdocBookSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/ChapterXdocBookSink.java?rev=769433&r1=769432&r2=769433&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/ChapterXdocBookSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/ChapterXdocBookSink.java Tue Apr 28 15:26:55 2009
@@ -55,10 +55,10 @@
/** {@inheritDoc} */
protected void navigationPanel()
{
- markup( "<!--Navigation Panel-->" );
+ write( "<!--Navigation Panel-->" );
- markup( "<table width=\"100%\" align=\"center\">" );
- markup( "<tr>" );
+ write( "<table width=\"100%\" align=\"center\">" );
+ write( "<tr>" );
// -----------------------------------------------------------------------
// Prev
@@ -66,34 +66,34 @@
IndexEntry prevChapter = chapterIndex.getPrevEntry();
- markup( "<td><div align='left'>" );
+ write( "<td><div align='left'>" );
previous( prevChapter );
- markup( "</div></td>" );
+ write( "</div></td>" );
// -----------------------------------------------------------------------
// Parent
// -----------------------------------------------------------------------
- markup( "<td><div align='center'>" );
+ write( "<td><div align='center'>" );
up();
- markup( "</div></td>" );
+ write( "</div></td>" );
// -----------------------------------------------------------------------
// Next
// -----------------------------------------------------------------------
- markup( "<td><div align='right'>" );
+ write( "<td><div align='right'>" );
next();
- markup( "</div></td>" );
+ write( "</div></td>" );
- markup( "</tr>" );
- markup( "</table>" );
+ write( "</tr>" );
+ write( "</table>" );
- markup( "<!--End of Navigation Panel-->" );
+ write( "<!--End of Navigation Panel-->" );
}
/**
@@ -108,18 +108,18 @@
IndexEntry lastEntry = prevChapter.getLastEntry();
if ( lastEntry == null )
{
- markup( "<i>Start of book</i>" );
+ write( "<i>Start of book</i>" );
}
else
{
- markup( getString( "previous" ) + ": <a href='" + lastEntry.getId() + ".html'>" );
+ write( getString( "previous" ) + ": <a href='" + lastEntry.getId() + ".html'>" );
content( lastEntry.getTitle() );
- markup( "</a>" );
+ write( "</a>" );
}
}
else
{
- markup( getString( "previous" ) + ":<a href='index.html'>" + getString( "toc" ) + "</a>" );
+ write( getString( "previous" ) + ":<a href='index.html'>" + getString( "toc" ) + "</a>" );
}
}
@@ -128,7 +128,7 @@
*/
protected void up()
{
- markup( getString( "up" ) + ": <a href='index.html'>" + getString( "toc" ) + "</a>" );
+ write( getString( "up" ) + ": <a href='index.html'>" + getString( "toc" ) + "</a>" );
}
/**
@@ -139,13 +139,13 @@
IndexEntry firstEntry = chapterIndex.getFirstEntry();
if ( firstEntry == null )
{
- markup( "<i>End of book</i>" );
+ write( "<i>End of book</i>" );
}
else
{
- markup( getString( "next" ) + ": <a href='" + firstEntry.getId() + ".html'>" );
+ write( getString( "next" ) + ": <a href='" + firstEntry.getId() + ".html'>" );
content( firstEntry.getTitle() );
- markup( "</a>" );
+ write( "</a>" );
}
}
}
Modified: maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/IndexXdocBookSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/IndexXdocBookSink.java?rev=769433&r1=769432&r2=769433&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/IndexXdocBookSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/IndexXdocBookSink.java Tue Apr 28 15:26:55 2009
@@ -56,10 +56,10 @@
/** {@inheritDoc} */
protected void navigationPanel()
{
- markup( "<!--Navigation Panel-->" );
+ write( "<!--Navigation Panel-->" );
- markup( "<table width=\"100%\" align=\"center\">" );
- markup( "<tr>" );
+ write( "<table width=\"100%\" align=\"center\">" );
+ write( "<tr>" );
// -----------------------------------------------------------------------
// Next
@@ -67,18 +67,18 @@
if ( firstEntry != null )
{
- markup( "<td><div align='right'>" );
+ write( "<td><div align='right'>" );
- markup( getString( "next" ) + ": <a href='" + firstEntry.getId() + ".html'>" );
+ write( getString( "next" ) + ": <a href='" + firstEntry.getId() + ".html'>" );
content( firstEntry.getTitle() );
- markup( "</a>" );
+ write( "</a>" );
- markup( "</div></td>" );
+ write( "</div></td>" );
}
- markup( "</tr>" );
- markup( "</table>" );
+ write( "</tr>" );
+ write( "</table>" );
- markup( "<!--End of Navigation Panel-->" );
+ write( "<!--End of Navigation Panel-->" );
}
}
Modified: maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/SectionXdocBookSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/SectionXdocBookSink.java?rev=769433&r1=769432&r2=769433&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/SectionXdocBookSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/SectionXdocBookSink.java Tue Apr 28 15:26:55 2009
@@ -55,10 +55,10 @@
/** {@inheritDoc} */
protected void navigationPanel()
{
- markup( "<!--Navigation Panel-->" );
+ write( "<!--Navigation Panel-->" );
- markup( "<table width=\"100%\" align=\"center\">" );
- markup( "<tr>" );
+ write( "<table width=\"100%\" align=\"center\">" );
+ write( "<tr>" );
IndexEntry parent = indexEntry.getParent();
@@ -68,19 +68,19 @@
IndexEntry prevEntry = indexEntry.getPrevEntry();
- markup( "<td><div align='left'>" );
+ write( "<td><div align='left'>" );
previous( parent, prevEntry );
- markup( "</div></td>" );
+ write( "</div></td>" );
// -----------------------------------------------------------------------
// Parent
// -----------------------------------------------------------------------
- markup( "<td><div align='center'>" );
+ write( "<td><div align='center'>" );
up( parent );
- markup( "</div></td>" );
+ write( "</div></td>" );
// -----------------------------------------------------------------------
// Next
@@ -88,16 +88,16 @@
IndexEntry nextEntry = indexEntry.getNextEntry();
- markup( "<td><div align='right'>" );
+ write( "<td><div align='right'>" );
next( parent, nextEntry );
- markup( "</div></td>" );
+ write( "</div></td>" );
- markup( "</tr>" );
- markup( "</table>" );
+ write( "</tr>" );
+ write( "</table>" );
- markup( "<!--End of Navigation Panel-->" );
+ write( "<!--End of Navigation Panel-->" );
}
/**
@@ -110,15 +110,15 @@
{
if ( prevEntry != null )
{
- markup( getString( "previous" ) + ": <a href='" + prevEntry.getId() + ".html'>" );
+ write( getString( "previous" ) + ": <a href='" + prevEntry.getId() + ".html'>" );
content( prevEntry.getTitle() );
- markup( "</a>" );
+ write( "</a>" );
}
else
{
- markup( getString( "previous" ) + ": <a href='" + parent.getId() + ".html'>" );
+ write( getString( "previous" ) + ": <a href='" + parent.getId() + ".html'>" );
content( parent.getTitle() );
- markup( "</a>" );
+ write( "</a>" );
}
}
@@ -130,7 +130,7 @@
*/
protected void up( IndexEntry parent )
{
- markup( getString( "up" ) + ": <a href='" + parent.getId() + ".html'>" + parent.getTitle() + "</a>" );
+ write( getString( "up" ) + ": <a href='" + parent.getId() + ".html'>" + parent.getTitle() + "</a>" );
}
/**
@@ -143,9 +143,9 @@
{
if ( nextEntry != null )
{
- markup( getString( "next" ) + ": <a href='" + nextEntry.getId() + ".html'>" );
+ write( getString( "next" ) + ": <a href='" + nextEntry.getId() + ".html'>" );
content( nextEntry.getTitle() );
- markup( "</a>" );
+ write( "</a>" );
}
else
{
@@ -153,13 +153,13 @@
if ( nextChapter == null )
{
- markup( "<i>End of book</i>" );
+ write( "<i>End of book</i>" );
}
else
{
- markup( getString( "next" ) + ": <a href='" + nextChapter.getId() + ".html'>" );
+ write( getString( "next" ) + ": <a href='" + nextChapter.getId() + ".html'>" );
content( nextChapter.getTitle() );
- markup( "</a>" );
+ write( "</a>" );
}
}
}
Modified: maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xhtml/XhtmlBookSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xhtml/XhtmlBookSink.java?rev=769433&r1=769432&r2=769433&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xhtml/XhtmlBookSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xhtml/XhtmlBookSink.java Tue Apr 28 15:26:55 2009
@@ -57,7 +57,7 @@
/**
* {@inheritDoc}
*
- * Does nothing.
+ * Does nothing.
*/
public void head()
{
@@ -69,7 +69,7 @@
/**
* {@inheritDoc}
*
- * Does nothing.
+ * Does nothing.
*/
public void head_()
{
@@ -79,7 +79,7 @@
/**
* {@inheritDoc}
*
- * Does nothing.
+ * Does nothing.
*/
public void title()
{
@@ -89,7 +89,7 @@
/**
* {@inheritDoc}
*
- * Does nothing.
+ * Does nothing.
*/
public void title_()
{
@@ -99,7 +99,7 @@
/**
* {@inheritDoc}
*
- * Does nothing.
+ * Does nothing.
*/
public void author_()
{
@@ -109,7 +109,7 @@
/**
* {@inheritDoc}
*
- * Does nothing.
+ * Does nothing.
*/
public void date_()
{
@@ -119,7 +119,7 @@
/**
* {@inheritDoc}
*
- * Does nothing.
+ * Does nothing.
*/
public void body()
{
@@ -129,7 +129,7 @@
/**
* {@inheritDoc}
*
- * Does nothing.
+ * Does nothing.
*/
public void body_()
{