From 832df5ab2763f113a25acc37ff00a7cc5698e11a Mon Sep 17 00:00:00 2001 From: wang-xinhong Date: Tue, 24 Nov 2015 20:16:27 +0800 Subject: [PATCH 1/2] Update FileModelProxy.java Fix the multi set issue. --- .../violations/render/FileModelProxy.java | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/src/main/java/hudson/plugins/violations/render/FileModelProxy.java b/src/main/java/hudson/plugins/violations/render/FileModelProxy.java index ff8a9af..e141be5 100644 --- a/src/main/java/hudson/plugins/violations/render/FileModelProxy.java +++ b/src/main/java/hudson/plugins/violations/render/FileModelProxy.java @@ -432,27 +432,31 @@ public String getSummaryTable() { gst.append(" Description\n"); gst.append(" \n"); - Set violations = fileModel.get().getLineViolationMap().get(0); - - for (Violation v : violations) { - ++count; - gst.append(" \n"); - gst.append(" "); - gst.append(count); - gst.append("\n"); - gst.append(" "); - gst.append(v.getType()); - gst.append("\n"); - gst.append(" "); - gst.append(v.getSource()); - gst.append("\n"); - gst.append(" "); - gst.append(v.getMessage()); - gst.append("\n"); - gst.append(" "); - gst.append(v.getPopupMessage()); - gst.append("\n"); - gst.append(" \n"); + Map> violationsMap = fileModel.getLineViolationMap(); + + Iterator itForMap = violationsMap.keySet().iterator(); + while(itForMap.hasNext()) { + Set violations = violationsMap.get(itForMap.next()); + for (Violation v : violations) { + ++count; + gst.append(" \n"); + gst.append(" "); + gst.append(count); + gst.append("\n"); + gst.append(" "); + gst.append(v.getType()); + gst.append("\n"); + gst.append(" "); + gst.append(v.getSource()); + gst.append("\n"); + gst.append(" "); + gst.append(v.getMessage()); + gst.append("\n"); + gst.append(" "); + gst.append(v.getPopupMessage()); + gst.append("\n"); + gst.append(" \n"); + } } gst.append(" \n"); gst.append("


\n"); From 5203393c2c74fbf65100131a499c123fc16b4454 Mon Sep 17 00:00:00 2001 From: gnaws Date: Wed, 25 Nov 2015 00:49:12 +0800 Subject: [PATCH 2/2] updated, for multi-set of violations --- .../java/hudson/plugins/violations/render/FileModelProxy.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/hudson/plugins/violations/render/FileModelProxy.java b/src/main/java/hudson/plugins/violations/render/FileModelProxy.java index e141be5..a642c8d 100644 --- a/src/main/java/hudson/plugins/violations/render/FileModelProxy.java +++ b/src/main/java/hudson/plugins/violations/render/FileModelProxy.java @@ -19,6 +19,7 @@ import java.util.Set; import java.util.TreeSet; import java.util.logging.Logger; +import java.util.Iterator; import com.google.common.base.Supplier; @@ -432,7 +433,7 @@ public String getSummaryTable() { gst.append(" Description\n"); gst.append(" \n"); - Map> violationsMap = fileModel.getLineViolationMap(); + Map> violationsMap = fileModel.get().getLineViolationMap(); Iterator itForMap = violationsMap.keySet().iterator(); while(itForMap.hasNext()) {