[maven-project-info-reports-plugin] branch master updated: [MPIR-427] Explicitly start and end tables with Doxia Sinks in report renderers

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 88f2f76  [MPIR-427] Explicitly start and end tables with Doxia Sinks in report renderers
88f2f76 is described below

commit 88f2f7690059d71bc4def3a3e4db0bad0cae3e80
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jan 6 20:49:52 2023 +0100

    [MPIR-427] Explicitly start and end tables with Doxia Sinks in report renderers
---
 .../maven/report/projectinfo/DependencyConvergenceReport.java    | 9 +++++++++
 .../projectinfo/dependencies/renderer/DependenciesRenderer.java  | 7 ++++++-
 2 files changed, 15 insertions(+), 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
index a04f8d6..cefe5cf 100644
--- 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 @@ public class DependencyConvergenceReport
     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 @@ public class DependencyConvergenceReport
         sink.tableCell();
 
         sink.table();
+        sink.tableRows( null, false );
 
         for ( String version : artifactMap.keySet() )
         {
@@ -328,11 +330,14 @@ public class DependencyConvergenceReport
 
             sink.tableRow_();
         }
+        sink.tableRows_();
         sink.table_();
+
         sink.tableCell_();
 
         sink.tableRow_();
 
+        sink.tableRows_();
         sink.table_();
     }
 
@@ -518,6 +523,7 @@ public class DependencyConvergenceReport
     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 @@ public class DependencyConvergenceReport
 
         sink.tableRow_();
 
+        sink.tableRows_();
         sink.table_();
     }
 
@@ -557,6 +564,7 @@ public class DependencyConvergenceReport
 
         // Create report
         sink.table();
+        sink.tableRows( null, false );
         sink.tableCaption();
         sink.bold();
         sink.text( getI18nString( locale, "stats.caption" ) );
@@ -665,6 +673,7 @@ public class DependencyConvergenceReport
         sink.tableCell_();
         sink.tableRow_();
 
+        sink.tableRows_();
         sink.table_();
     }
 
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
index 43eb156..02f848a 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
@@ -857,7 +857,7 @@ public class DependenciesRenderer
 
         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 @@ public class DependenciesRenderer
                 List<License> licenses = artifactProject.getLicenses();
 
                 sink.table();
+                sink.tableRows( null, false );
 
                 sink.tableRow();
                 sink.tableHeaderCell();
@@ -1007,10 +1008,12 @@ public class DependenciesRenderer
                 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 @@ public class DependenciesRenderer
         else
         {
             sink.table();
+            sink.tableRows( null, false );
 
             sink.tableRow();
             sink.tableHeaderCell();
@@ -1056,6 +1060,7 @@ public class DependenciesRenderer
             sink.tableCell_();
             sink.tableRow_();
 
+            sink.tableRows_();
             sink.table_();
         }