Skip to content

Commit 88f2f76

Browse files
committed
[MPIR-427] Explicitly start and end tables with Doxia Sinks in report renderers
1 parent 7f80826 commit 88f2f76

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java

+9
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ private void generateConvergence( Locale locale, Sink sink, DependencyAnalyzeRes
300300
private void generateDependencyDetails( Locale locale, Sink sink, List<ReverseDependencyLink> depList )
301301
{
302302
sink.table();
303+
sink.tableRows( null, false );
303304

304305
Map<String, List<ReverseDependencyLink>> artifactMap = getSortedUniqueArtifactMap( depList );
305306

@@ -314,6 +315,7 @@ private void generateDependencyDetails( Locale locale, Sink sink, List<ReverseDe
314315
sink.tableCell();
315316

316317
sink.table();
318+
sink.tableRows( null, false );
317319

318320
for ( String version : artifactMap.keySet() )
319321
{
@@ -328,11 +330,14 @@ private void generateDependencyDetails( Locale locale, Sink sink, List<ReverseDe
328330

329331
sink.tableRow_();
330332
}
333+
sink.tableRows_();
331334
sink.table_();
335+
332336
sink.tableCell_();
333337

334338
sink.tableRow_();
335339

340+
sink.tableRows_();
336341
sink.table_();
337342
}
338343

@@ -518,6 +523,7 @@ private Map<String, List<ReverseDependencyLink>> getSortedUniqueArtifactMap( Lis
518523
private void generateLegend( Locale locale, Sink sink )
519524
{
520525
sink.table();
526+
sink.tableRows( null, false );
521527
sink.tableCaption();
522528
sink.bold();
523529
sink.text( getI18nString( locale, "legend" ) );
@@ -535,6 +541,7 @@ private void generateLegend( Locale locale, Sink sink )
535541

536542
sink.tableRow_();
537543

544+
sink.tableRows_();
538545
sink.table_();
539546
}
540547

@@ -557,6 +564,7 @@ private void generateStats( Locale locale, Sink sink, DependencyAnalyzeResult re
557564

558565
// Create report
559566
sink.table();
567+
sink.tableRows( null, false );
560568
sink.tableCaption();
561569
sink.bold();
562570
sink.text( getI18nString( locale, "stats.caption" ) );
@@ -665,6 +673,7 @@ private void generateStats( Locale locale, Sink sink, DependencyAnalyzeResult re
665673
sink.tableCell_();
666674
sink.tableRow_();
667675

676+
sink.tableRows_();
668677
sink.table_();
669678
}
670679

src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ private void printDependencyListing( DependencyNode node )
857857

858858
String javascript = String.format( "<img id=\"%s\" src=\"%s\" alt=\"%s\""
859859
+ " onclick=\"toggleDependencyDetails( '%s', '%s' );\""
860-
+ " style=\"cursor: pointer; vertical-align: text-bottom;\"></img>",
860+
+ " style=\"cursor: pointer; vertical-align: text-bottom;\" />",
861861
imgId, IMG_INFO_URL, getI18nString( "graph.icon.information" ), dependencyDetailId, imgId );
862862

863863
sink.rawText( javascript );
@@ -911,6 +911,7 @@ private void printDescriptionsAndURLs( DependencyNode node, String uid )
911911
List<License> licenses = artifactProject.getLicenses();
912912

913913
sink.table();
914+
sink.tableRows( null, false );
914915

915916
sink.tableRow();
916917
sink.tableHeaderCell();
@@ -1007,10 +1008,12 @@ private void printDescriptionsAndURLs( DependencyNode node, String uid )
10071008
sink.tableCell_();
10081009
sink.tableRow_();
10091010

1011+
sink.tableRows_();
10101012
sink.table_();
10111013
}
10121014
catch ( ProjectBuildingException e )
10131015
{
1016+
sink.text( getI18nString( "index", "nodescription" ) );
10141017
if ( log.isDebugEnabled() )
10151018
{
10161019
log.debug( "Unable to create Maven project from repository for artifact '"
@@ -1026,6 +1029,7 @@ private void printDescriptionsAndURLs( DependencyNode node, String uid )
10261029
else
10271030
{
10281031
sink.table();
1032+
sink.tableRows( null, false );
10291033

10301034
sink.tableRow();
10311035
sink.tableHeaderCell();
@@ -1056,6 +1060,7 @@ private void printDescriptionsAndURLs( DependencyNode node, String uid )
10561060
sink.tableCell_();
10571061
sink.tableRow_();
10581062

1063+
sink.tableRows_();
10591064
sink.table_();
10601065
}
10611066

0 commit comments

Comments
 (0)