This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-679
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit ea7bc882392bb06cbd8d6aaa79e00c679a09866d
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sun Dec 4 00:29:09 2022 +0100
[DOXIA-679] Introduce Sink#tableRows(void) method
This closes #127
---
.../apache/maven/doxia/sink/impl/RandomAccessSink.java | 7 +++++++
.../org/apache/maven/doxia/sink/impl/SinkAdapter.java | 9 ++++++++-
.../org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java | 6 ++++++
.../org/apache/maven/doxia/sink/impl/SinkAdapterTest.java | 4 +---
.../maven/doxia/sink/impl/SinkEventTestingSink.java | 6 ++++++
.../java/org/apache/maven/doxia/sink/impl/TextSink.java | 8 +++++++-
.../maven/doxia/sink/impl/WellformednessCheckingSink.java | 8 +++++++-
.../apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java | 15 ++++++---------
.../java/org/apache/maven/doxia/module/apt/AptSink.java | 6 ++++++
.../src/main/java/org/apache/maven/doxia/sink/Sink.java | 7 +++++++
10 files changed, 61 insertions(+), 15 deletions(-)
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java
index 87950fd2..4663af25 100644
---
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java
+++
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/RandomAccessSink.java
@@ -1196,6 +1196,13 @@ public class RandomAccessSink
currentSink.tableRow_();
}
+ /** {@inheritDoc} */
+ @Override
+ public void tableRows()
+ {
+ currentSink.tableRows();
+ }
+
/** {@inheritDoc} */
@Override
public void tableRows( int[] justification, boolean grid )
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkAdapter.java
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkAdapter.java
index 307735b7..f0cc09ae 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkAdapter.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkAdapter.java
@@ -299,7 +299,7 @@ public class SinkAdapter
/** {@inheritDoc} */
@Override
- public void tableRows( int[] justification, boolean grid )
+ public void tableRows()
{
// nop
}
@@ -1079,6 +1079,13 @@ public class SinkAdapter
table();
}
+ /** {@inheritDoc} */
+ @Override
+ public void tableRows( int[] justification, boolean grid )
+ {
+ tableRows();
+ }
+
/** {@inheritDoc} */
@Override
public void tableRow( SinkEventAttributes attributes )
diff --git
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
index 817156bc..e35cd901 100644
---
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
+++
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
@@ -1436,6 +1436,12 @@ public class Xhtml5BaseSink
}
}
+ @Override
+ public void tableRows()
+ {
+ tableRows( null, false );
+ }
+
/**
* The default class style is <code>bodyTable</code>.
*
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkAdapterTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkAdapterTest.java
index e29bcc82..d280bbcf 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkAdapterTest.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkAdapterTest.java
@@ -258,9 +258,7 @@ public class SinkAdapterTest
@Test
public void testTableRows()
{
- final int[] justification = null;
- final boolean grid = false;
- instance.tableRows( justification, grid );
+ instance.tableRows();
instance.tableRows_();
}
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventTestingSink.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventTestingSink.java
index 5b302b8f..a4a4e5c8 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventTestingSink.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventTestingSink.java
@@ -286,6 +286,12 @@ public class SinkEventTestingSink
addEvent( "table_" );
}
+ @Override
+ public void tableRows()
+ {
+ addEvent( "tableRows", new Object[] { null, false } );
+ }
+
@Override
public void tableRows( int[] justification, boolean grid )
{
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
index b5a34f76..d00b7b46 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TextSink.java
@@ -278,7 +278,7 @@ public class TextSink
}
@Override
- public void tableRows( int[] justification, boolean grid )
+ public void tableRows()
{
writeln( "begin:tableRows" );
}
@@ -897,6 +897,12 @@ public class TextSink
table();
}
+ @Override
+ public void tableRows( int[] justification, boolean grid )
+ {
+ tableRows();
+ }
+
@Override
public void tableRow( SinkEventAttributes attributes )
{
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/WellformednessCheckingSink.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/WellformednessCheckingSink.java
index 301b2968..ebd864a9 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/WellformednessCheckingSink.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/WellformednessCheckingSink.java
@@ -305,7 +305,7 @@ public class WellformednessCheckingSink
}
@Override
- public void tableRows( int[] justification, boolean grid )
+ public void tableRows()
{
startElement( "tableRows" );
}
@@ -940,6 +940,12 @@ public class WellformednessCheckingSink
table();
}
+ @Override
+ public void tableRows( int[] justification, boolean grid )
+ {
+ tableRows();
+ }
+
@Override
public void tableRow( SinkEventAttributes attributes )
{
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
index 61838c51..79bf6fe9 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
@@ -1057,15 +1057,12 @@ public class Xhtml5BaseSinkTest
@Test
public void testTableRows()
{
- final int[] justification = null;
- final boolean grid = false;
-
try
{
sink = new Xhtml5BaseSink( writer );
sink.table();
- sink.tableRows( justification, grid );
+ sink.tableRows();
sink.tableRows_();
sink.table_();
}
@@ -1088,7 +1085,7 @@ public class Xhtml5BaseSinkTest
sink = new Xhtml5BaseSink( writer );
sink.table();
- sink.tableRows( null, false );
+ sink.tableRows();
sink.tableRow( attributes );
sink.tableRow_();
sink.tableRow();
@@ -1121,7 +1118,7 @@ public class Xhtml5BaseSinkTest
sink = new Xhtml5BaseSink( writer );
sink.table();
- sink.tableRows( null, false );
+ sink.tableRows();
sink.tableRow();
sink.tableRow_();
sink.tableRow( attributes );
@@ -1225,7 +1222,7 @@ public class Xhtml5BaseSinkTest
sink = new Xhtml5BaseSink( writer );
sink.table();
- sink.tableRows( null, false );
+ sink.tableRows();
sink.tableCaption( attributes );
sink.text( "caption" );
sink.tableCaption_();
@@ -1626,8 +1623,8 @@ public class Xhtml5BaseSinkTest
try
{
sink = new Xhtml5BaseSink( writer );
- sink.table( null );
- sink.tableRows( null, true );
+ sink.table();
+ sink.tableRows();
sink.tableRow( null );
sink.tableCell();
sink.text( "\u2713", null );
diff --git
a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
index c263fb9a..6273e16b 100644
---
a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
+++
b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
@@ -703,6 +703,12 @@ public class AptSink
resetTableCaptionBuffer();
}
+ @Override
+ public void tableRows()
+ {
+ tableRows( null, false );
+ }
+
/** {@inheritDoc} */
public void tableRows( int[] justification, boolean grid )
{
diff --git a/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
b/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
index 6f90503c..6eb57d50 100644
--- a/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
+++ b/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
@@ -1027,6 +1027,13 @@ public interface Sink
*/
void table_();
+ /**
+ * Starts an element that contains rows of table data.
+ *
+ * @See {@link #tableRows(int[], boolean)}
+ */
+ void tableRows();
+
/**
* Starts an element that contains rows of table data.
*
