Author: ltheussl
Date: Wed Jul 30 05:03:54 2008
New Revision: 680993
URL: http://svn.apache.org/viewvc?rev=680993&view=rev
Log:
[DOXIA-248] Move Parser.JUSTIFY_* constants to Sink interface
Submitted by: Benjamin Bentmann
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/Parser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.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-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.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-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/parser/TableBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/Parser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/Parser.java?rev=680993&r1=680992&r2=680993&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/Parser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/Parser.java
Wed Jul 30 05:03:54 2008
@@ -48,15 +48,6 @@
/** XML parser type */
int XML_TYPE = 2;
- /** Used for table cells: justify center. */
- int JUSTIFY_CENTER = 0;
-
- /** Used for table cells: justify left. */
- int JUSTIFY_LEFT = 1;
-
- /** Used for table cells: justify right. */
- int JUSTIFY_RIGHT = 2;
-
/**
* Parses the given source model and emits Doxia events into the given
sink.
*
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java?rev=680993&r1=680992&r2=680993&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
Wed Jul 30 05:03:54 2008
@@ -343,15 +343,15 @@
String align = parser.getAttributeValue( null,
Attribute.ALIGN.toString() );
- int[] justif = { JUSTIFY_LEFT };
+ int[] justif = { Sink.JUSTIFY_LEFT };
if ( "center".equals( align ) )
{
- justif[0] = JUSTIFY_CENTER;
+ justif[0] = Sink.JUSTIFY_CENTER;
}
else if ( "right".equals( align ) )
{
- justif[0] = JUSTIFY_RIGHT;
+ justif[0] = Sink.JUSTIFY_RIGHT;
}
sink.tableRows( justif, grid );
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java?rev=680993&r1=680992&r2=680993&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
Wed Jul 30 05:03:54 2008
@@ -27,7 +27,6 @@
import javax.swing.text.html.HTML.Tag;
import org.apache.maven.doxia.markup.HtmlMarkup;
-import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.util.DoxiaUtils;
import org.apache.maven.doxia.util.HtmlTools;
@@ -1167,13 +1166,13 @@
{
switch ( cellJustif[Math.min( cellCount, cellJustif.length - 1 )] )
{
- case Parser.JUSTIFY_LEFT:
+ case Sink.JUSTIFY_LEFT:
justif = "left";
break;
- case Parser.JUSTIFY_RIGHT:
+ case Sink.JUSTIFY_RIGHT:
justif = "right";
break;
- case Parser.JUSTIFY_CENTER:
+ case Sink.JUSTIFY_CENTER:
default:
justif = "center";
break;
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java?rev=680993&r1=680992&r2=680993&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
Wed Jul 30 05:03:54 2008
@@ -20,7 +20,6 @@
*/
import org.apache.maven.doxia.AbstractModuleTest;
-import org.apache.maven.doxia.parser.Parser;
import java.io.CharArrayWriter;
import java.io.IOException;
@@ -393,7 +392,7 @@
/**
* Checks that the sequence <code>[table(),
- * tableRows( Parser.JUSTIFY_CENTER, false ), tableRow(), tableCell(),
+ * tableRows( Sink.JUSTIFY_CENTER, false ), tableRow(), tableCell(),
* text( cell ), tableCell_(), tableRow_(), tableRows_(), tableCaption(),
* text( caption ), tableCaption_(), table_()]</code>,
* invoked on the current sink, produces the same result as
@@ -403,7 +402,7 @@
{
String cell = "cell";
String caption = "Table_caption";
- int[] justify = { Parser.JUSTIFY_CENTER };
+ int[] justify = { Sink.JUSTIFY_CENTER };
sink.table();
sink.tableRows( justify, false );
sink.tableRow();
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java?rev=680993&r1=680992&r2=680993&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkTestDocument.java
Wed Jul 30 05:03:54 2008
@@ -20,8 +20,6 @@
*/
-import org.apache.maven.doxia.parser.Parser;
-
/**
* Static methods to generate standard Doxia sink events.
*/
@@ -305,7 +303,7 @@
{
int[] justify =
{
- Parser.JUSTIFY_CENTER, Parser.JUSTIFY_LEFT, Parser.JUSTIFY_RIGHT
+ Sink.JUSTIFY_CENTER, Sink.JUSTIFY_LEFT, Sink.JUSTIFY_RIGHT
};
sink.table();
@@ -361,7 +359,7 @@
{
int[] justify =
{
- Parser.JUSTIFY_CENTER, Parser.JUSTIFY_CENTER
+ Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER
};
sink.table();
@@ -401,7 +399,7 @@
{
int[] justify =
{
- Parser.JUSTIFY_CENTER, Parser.JUSTIFY_CENTER
+ Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER
};
sink.table();
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.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/AptParser.java?rev=680993&r1=680992&r2=680993&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
Wed Jul 30 05:03:54 2008
@@ -2444,13 +2444,13 @@
switch ( jline.charAt( i ) )
{
case STAR:
- justification[columns++] = JUSTIFY_CENTER;
+ justification[columns++] = Sink.JUSTIFY_CENTER;
break;
case PLUS:
- justification[columns++] = JUSTIFY_LEFT;
+ justification[columns++] = Sink.JUSTIFY_LEFT;
break;
case COLON:
- justification[columns++] = JUSTIFY_RIGHT;
+ justification[columns++] = Sink.JUSTIFY_RIGHT;
break;
default:
break;
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.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/parser/table/TableBlock.java?rev=680993&r1=680992&r2=680993&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java
Wed Jul 30 05:03:54 2008
@@ -19,7 +19,6 @@
* under the License.
*/
-import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.module.confluence.parser.AbstractFatherBlock;
import org.apache.maven.doxia.sink.Sink;
@@ -56,7 +55,7 @@
int[] justification = new int[b.getBlocks().size()];
for ( int i = 0; i < justification.length; i++ )
{
- justification[i] = Parser.JUSTIFY_CENTER;
+ justification[i] = Sink.JUSTIFY_CENTER;
}
return justification;
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=680993&r1=680992&r2=680993&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
Wed Jul 30 05:03:54 2008
@@ -29,9 +29,9 @@
import javax.swing.text.html.HTML.Attribute;
import javax.swing.text.html.HTML.Tag;
-import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.AbstractXmlSink;
import org.apache.maven.doxia.sink.SinkEventAttributes;
+import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.util.DoxiaUtils;
import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.doxia.util.LineBreaker;
@@ -1326,13 +1326,13 @@
String justif;
switch ( justification[i] )
{
- case Parser.JUSTIFY_LEFT:
+ case Sink.JUSTIFY_LEFT:
justif = "left";
break;
- case Parser.JUSTIFY_RIGHT:
+ case Sink.JUSTIFY_RIGHT:
justif = "right";
break;
- case Parser.JUSTIFY_CENTER:
+ case Sink.JUSTIFY_CENTER:
default:
justif = "center";
break;
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java?rev=680993&r1=680992&r2=680993&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
Wed Jul 30 05:03:54 2008
@@ -32,7 +32,6 @@
import org.apache.maven.doxia.module.fml.model.Part;
import org.apache.maven.doxia.parser.AbstractXmlParser;
import org.apache.maven.doxia.parser.ParseException;
-import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.util.DoxiaUtils;
import org.apache.maven.doxia.util.HtmlTools;
@@ -462,7 +461,7 @@
*/
private void writeTopLink( Sink sink )
{
- int[] justify = { Parser.JUSTIFY_RIGHT };
+ int[] justify = { Sink.JUSTIFY_RIGHT };
sink.table();
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=680993&r1=680992&r2=680993&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
Wed Jul 30 05:03:54 2008
@@ -30,7 +30,6 @@
import org.apache.maven.doxia.sink.AbstractXmlSink;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributes;
-import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.util.DoxiaUtils;
import org.apache.maven.doxia.util.HtmlTools;
@@ -727,13 +726,13 @@
{
switch ( cellJustif[Math.min( cellCount, cellJustif.length - 1 )]
)
{
- case Parser.JUSTIFY_LEFT:
+ case Sink.JUSTIFY_LEFT:
justif = "left";
break;
- case Parser.JUSTIFY_RIGHT:
+ case Sink.JUSTIFY_RIGHT:
justif = "right";
break;
- case Parser.JUSTIFY_CENTER:
+ case Sink.JUSTIFY_CENTER:
default:
justif = "center";
break;
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=680993&r1=680992&r2=680993&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
Wed Jul 30 05:03:54 2008
@@ -19,8 +19,8 @@
* under the License.
*/
-import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.AbstractTextSink;
+import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.util.DoxiaUtils;
import org.apache.maven.doxia.util.LineBreaker;
@@ -662,13 +662,13 @@
}
switch ( justification[i] )
{
- case Parser.JUSTIFY_CENTER:
+ case Sink.JUSTIFY_CENTER:
justif.append( 'c' );
break;
- case Parser.JUSTIFY_LEFT:
+ case Sink.JUSTIFY_LEFT:
justif.append( 'l' );
break;
- case Parser.JUSTIFY_RIGHT:
+ case Sink.JUSTIFY_RIGHT:
justif.append( 'r' );
break;
}
@@ -773,13 +773,13 @@
char justif;
switch ( cellJustif[cellCount] )
{
- case Parser.JUSTIFY_LEFT:
+ case Sink.JUSTIFY_LEFT:
justif = 'l';
break;
- case Parser.JUSTIFY_RIGHT:
+ case Sink.JUSTIFY_RIGHT:
justif = 'r';
break;
- case Parser.JUSTIFY_CENTER:
+ case Sink.JUSTIFY_CENTER:
default:
justif = 'c';
break;
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=680993&r1=680992&r2=680993&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
Wed Jul 30 05:03:54 2008
@@ -33,7 +33,6 @@
import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkAdapter;
import org.apache.maven.doxia.sink.SinkEventAttributes;
@@ -372,7 +371,7 @@
public void title()
{
Paragraph p = new Paragraph( STYLE_BOLD, fontSize + 6 );
- p.justification = Parser.JUSTIFY_CENTER;
+ p.justification = Sink.JUSTIFY_CENTER;
beginParagraph( p );
emptyHeader = false;
}
@@ -385,7 +384,7 @@
public void author()
{
Paragraph p = new Paragraph( STYLE_ROMAN, fontSize + 2 );
- p.justification = Parser.JUSTIFY_CENTER;
+ p.justification = Sink.JUSTIFY_CENTER;
beginParagraph( p );
emptyHeader = false;
}
@@ -398,7 +397,7 @@
public void date()
{
Paragraph p = new Paragraph( STYLE_ROMAN, fontSize );
- p.justification = Parser.JUSTIFY_CENTER;
+ p.justification = Sink.JUSTIFY_CENTER;
beginParagraph( p );
emptyHeader = false;
}
@@ -818,14 +817,14 @@
{
switch ( justification )
{
- case Parser.JUSTIFY_LEFT:
+ case Sink.JUSTIFY_LEFT:
default:
writer.println( "\\ql" );
break;
- case Parser.JUSTIFY_CENTER:
+ case Sink.JUSTIFY_CENTER:
writer.println( "\\qc" );
break;
- case Parser.JUSTIFY_RIGHT:
+ case Sink.JUSTIFY_RIGHT:
writer.println( "\\qr" );
break;
}
@@ -884,7 +883,7 @@
public void tableCaption()
{
Paragraph p = new Paragraph();
- p.justification = Parser.JUSTIFY_CENTER;
+ p.justification = Sink.JUSTIFY_CENTER;
p.spaceBefore /= 2;
beginParagraph( p );
}
@@ -983,7 +982,7 @@
}
Paragraph p = new Paragraph();
- p.justification = Parser.JUSTIFY_CENTER;
+ p.justification = Sink.JUSTIFY_CENTER;
beginParagraph( p );
try
@@ -1189,7 +1188,7 @@
public void figureCaption()
{
Paragraph p = new Paragraph();
- p.justification = Parser.JUSTIFY_CENTER;
+ p.justification = Sink.JUSTIFY_CENTER;
p.spaceBefore /= 2;
beginParagraph( p );
}
@@ -1568,7 +1567,7 @@
int style = 0;
- int justification = Parser.JUSTIFY_LEFT;
+ int justification = Sink.JUSTIFY_LEFT;
int leftIndent = indentation.get();
@@ -1605,13 +1604,13 @@
}
switch ( justification )
{
- case Parser.JUSTIFY_LEFT:
+ case Sink.JUSTIFY_LEFT:
default:
break;
- case Parser.JUSTIFY_CENTER:
+ case Sink.JUSTIFY_CENTER:
writer.print( "\\qc" );
break;
- case Parser.JUSTIFY_RIGHT:
+ case Sink.JUSTIFY_RIGHT:
writer.print( "\\qr" );
break;
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlock.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/parser/TableBlock.java?rev=680993&r1=680992&r2=680993&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlock.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlock.java
Wed Jul 30 05:03:54 2008
@@ -19,7 +19,6 @@
* under the License.
*/
-import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
/**
@@ -59,7 +58,7 @@
getBlocks().length];
for ( int i = 0; i < justification.length; i++ )
{
- justification[i] = Parser.JUSTIFY_CENTER;
+ justification[i] = Sink.JUSTIFY_CENTER;
}
return justification;
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.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/XmlWriterXdocSink.java?rev=680993&r1=680992&r2=680993&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
Wed Jul 30 05:03:54 2008
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.doxia.parser.Parser;
+import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkAdapter;
import org.apache.maven.doxia.util.HtmlTools;
import org.codehaus.plexus.util.StringUtils;
@@ -465,13 +465,13 @@
{
switch ( cellJustif[cellCount] )
{
- case Parser.JUSTIFY_LEFT:
+ case Sink.JUSTIFY_LEFT:
justif = "left";
break;
- case Parser.JUSTIFY_RIGHT:
+ case Sink.JUSTIFY_RIGHT:
justif = "right";
break;
- case Parser.JUSTIFY_CENTER:
+ case Sink.JUSTIFY_CENTER:
default:
justif = "center";
break;
Modified:
maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java?rev=680993&r1=680992&r2=680993&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
Wed Jul 30 05:03:54 2008
@@ -122,6 +122,24 @@
int SECTION_LEVEL_5 = 5;
/**
+ * Center alignment for table cells.
+ * @see #tableRows(int[], boolean)
+ */
+ int JUSTIFY_CENTER = 0;
+
+ /**
+ * Left alignment for table cells.
+ * @see #tableRows(int[], boolean)
+ */
+ int JUSTIFY_LEFT = 1;
+
+ /**
+ * Right alignment for table cells.
+ * @see #tableRows(int[], boolean)
+ */
+ int JUSTIFY_RIGHT = 2;
+
+ /**
* Starts the head element.
*
* @see #head(SinkEventAttributes).
@@ -848,7 +866,10 @@
* has less elements than there are columns in the table then the value of
* the last array element will be taken as default for the remaining table
cells.
* @param grid true to provide a grid, false otherwise.
- * @see #table(SinkEventAttributes).
+ * @see #table(SinkEventAttributes)
+ * @see #JUSTIFY_CENTER
+ * @see #JUSTIFY_LEFT
+ * @see #JUSTIFY_RIGHT
*/
void tableRows( int[] justification, boolean grid );
