[maven-checkstyle-plugin] branch MCHECKSTYLE-436 updated: next

[michaelo]

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

michaelo pushed a commit to branch MCHECKSTYLE-436
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git


The following commit(s) were added to refs/heads/MCHECKSTYLE-436 by this push:
     new b5f7f5b  next
b5f7f5b is described below

commit b5f7f5b214d454b1e0006a62353b31221ca6aaef
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Tue May 16 12:47:56 2023 +0200

    next
---
 .../checkstyle/CheckstyleReportRenderer.java       | 74 ++++++----------------
 1 file changed, 20 insertions(+), 54 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportRenderer.java
 
b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportRenderer.java
index fa60b35..b0d8b80 100644
--- 
a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportRenderer.java
+++ 
b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportRenderer.java
@@ -182,24 +182,12 @@ public class CheckstyleReportRenderer extends 
AbstractMavenReportRenderer {
 
         startTable();
 
-        sink.tableRow();
-        sink.tableHeaderCell();
-        sink.text(bundle.getString("report.checkstyle.rule.category"));
-        sink.tableHeaderCell_();
-
-        sink.tableHeaderCell();
-        sink.text(bundle.getString("report.checkstyle.rule"));
-        sink.tableHeaderCell_();
-
-        sink.tableHeaderCell();
-        sink.text(bundle.getString("report.checkstyle.violations"));
-        sink.tableHeaderCell_();
-
-        sink.tableHeaderCell();
-        sink.text(bundle.getString("report.checkstyle.column.severity"));
-        sink.tableHeaderCell_();
-
-        sink.tableRow_();
+        tableHeader(new String[] {
+            bundle.getString("report.checkstyle.rule.category"),
+            bundle.getString("report.checkstyle.rule"),
+            bundle.getString("report.checkstyle.violations"),
+            bundle.getString("report.checkstyle.column.severity")
+        });
 
         // Top level should be the checker.
         if ("checker".equalsIgnoreCase(checkstyleConfig.getName())) {
@@ -210,11 +198,7 @@ public class CheckstyleReportRenderer extends 
AbstractMavenReportRenderer {
                 category = ref.category;
             }
         } else {
-            sink.tableRow();
-            sink.tableCell();
-            sink.text(bundle.getString("report.checkstyle.norule"));
-            sink.tableCell_();
-            sink.tableRow_();
+            tableRow(new String[] 
{bundle.getString("report.checkstyle.norule")});
         }
 
         endTable();
@@ -384,20 +368,12 @@ public class CheckstyleReportRenderer extends 
AbstractMavenReportRenderer {
         sink.tableHeaderCell_();
         sink.tableRow_();
 
-        sink.tableRow();
-        sink.tableCell();
-        sink.text(String.valueOf(results.getFileCount()));
-        sink.tableCell_();
-        sink.tableCell();
-        
sink.text(String.valueOf(results.getSeverityCount(SeverityLevel.INFO)));
-        sink.tableCell_();
-        sink.tableCell();
-        
sink.text(String.valueOf(results.getSeverityCount(SeverityLevel.WARNING)));
-        sink.tableCell_();
-        sink.tableCell();
-        
sink.text(String.valueOf(results.getSeverityCount(SeverityLevel.ERROR)));
-        sink.tableCell_();
-        sink.tableRow_();
+        tableRow(new String[] {
+            String.valueOf(results.getFileCount()),
+            String.valueOf(results.getSeverityCount(SeverityLevel.INFO)),
+            String.valueOf(results.getSeverityCount(SeverityLevel.WARNING)),
+            String.valueOf(results.getSeverityCount(SeverityLevel.ERROR))
+        });
 
         endTable();
 
@@ -482,23 +458,13 @@ public class CheckstyleReportRenderer extends 
AbstractMavenReportRenderer {
 
             startTable();
 
-            sink.tableRow();
-            sink.tableHeaderCell();
-            sink.text(bundle.getString("report.checkstyle.column.severity"));
-            sink.tableHeaderCell_();
-            sink.tableHeaderCell();
-            sink.text(bundle.getString("report.checkstyle.rule.category"));
-            sink.tableHeaderCell_();
-            sink.tableHeaderCell();
-            sink.text(bundle.getString("report.checkstyle.rule"));
-            sink.tableHeaderCell_();
-            sink.tableHeaderCell();
-            sink.text(bundle.getString("report.checkstyle.column.message"));
-            sink.tableHeaderCell_();
-            sink.tableHeaderCell();
-            sink.text(bundle.getString("report.checkstyle.column.line"));
-            sink.tableHeaderCell_();
-            sink.tableRow_();
+            tableHeader(new String[] {
+                bundle.getString("report.checkstyle.column.severity"),
+                bundle.getString("report.checkstyle.rule.category"),
+                bundle.getString("report.checkstyle.rule"),
+                bundle.getString("report.checkstyle.column.message"),
+                bundle.getString("report.checkstyle.column.line")
+            });
 
             doFileEvents(violations, file);