[MPIR-427] Explicitly start and end tables with Doxia Sinks in report…

… renderers
apache · Jan 6, 2023 · 88f2f76 · 88f2f76
1 parent 7f80826
commit 88f2f76
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
@@ -300,6 +300,7 @@ private void generateConvergence( Locale locale, Sink sink, DependencyAnalyzeRes
     private void generateDependencyDetails( Locale locale, Sink sink, List<ReverseDependencyLink> depList )
     {
         sink.table();
+        sink.tableRows( null, false );
 
         Map<String, List<ReverseDependencyLink>> artifactMap = getSortedUniqueArtifactMap( depList );
 
@@ -314,6 +315,7 @@ private void generateDependencyDetails( Locale locale, Sink sink, List<ReverseDe
         sink.tableCell();
 
         sink.table();
+        sink.tableRows( null, false );
 
         for ( String version : artifactMap.keySet() )
         {
@@ -328,11 +330,14 @@ private void generateDependencyDetails( Locale locale, Sink sink, List<ReverseDe
 
             sink.tableRow_();
         }
+        sink.tableRows_();
         sink.table_();
+
         sink.tableCell_();
 
         sink.tableRow_();
 
+        sink.tableRows_();
         sink.table_();
     }
 
@@ -518,6 +523,7 @@ private Map<String, List<ReverseDependencyLink>> getSortedUniqueArtifactMap( Lis
     private void generateLegend( Locale locale, Sink sink )
     {
         sink.table();
+        sink.tableRows( null, false );
         sink.tableCaption();
         sink.bold();
         sink.text( getI18nString( locale, "legend" ) );
@@ -535,6 +541,7 @@ private void generateLegend( Locale locale, Sink sink )
 
         sink.tableRow_();
 
+        sink.tableRows_();
         sink.table_();
     }
 
@@ -557,6 +564,7 @@ private void generateStats( Locale locale, Sink sink, DependencyAnalyzeResult re
 
         // Create report
         sink.table();
+        sink.tableRows( null, false );
         sink.tableCaption();
         sink.bold();
         sink.text( getI18nString( locale, "stats.caption" ) );
@@ -665,6 +673,7 @@ private void generateStats( Locale locale, Sink sink, DependencyAnalyzeResult re
         sink.tableCell_();
         sink.tableRow_();
 
+        sink.tableRows_();
         sink.table_();
     }
 

diff --git a/.../java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java b/.../java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
@@ -857,7 +857,7 @@ private void printDependencyListing( DependencyNode node )
 
         String javascript = String.format( "<img id=\"%s\" src=\"%s\" alt=\"%s\""
                 + " onclick=\"toggleDependencyDetails( '%s', '%s' );\""
-                + " style=\"cursor: pointer; vertical-align: text-bottom;\"></img>",
+                + " style=\"cursor: pointer; vertical-align: text-bottom;\" />",
                 imgId, IMG_INFO_URL, getI18nString( "graph.icon.information" ), dependencyDetailId, imgId );
 
         sink.rawText( javascript );
@@ -911,6 +911,7 @@ private void printDescriptionsAndURLs( DependencyNode node, String uid )
                 List<License> licenses = artifactProject.getLicenses();
 
                 sink.table();
+                sink.tableRows( null, false );
 
                 sink.tableRow();
                 sink.tableHeaderCell();
@@ -1007,10 +1008,12 @@ private void printDescriptionsAndURLs( DependencyNode node, String uid )
                 sink.tableCell_();
                 sink.tableRow_();
 
+                sink.tableRows_();
                 sink.table_();
             }
             catch ( ProjectBuildingException e )
             {
+                sink.text( getI18nString( "index", "nodescription" ) );
                 if ( log.isDebugEnabled() )
                 {
                     log.debug( "Unable to create Maven project from repository for artifact '"
@@ -1026,6 +1029,7 @@ private void printDescriptionsAndURLs( DependencyNode node, String uid )
         else
         {
             sink.table();
+            sink.tableRows( null, false );
 
             sink.tableRow();
             sink.tableHeaderCell();
@@ -1056,6 +1060,7 @@ private void printDescriptionsAndURLs( DependencyNode node, String uid )
             sink.tableCell_();
             sink.tableRow_();
 
+            sink.tableRows_();
             sink.table_();
         }