Fix code quality problems reported by Sonar.

3 files changed, 23 insertions, 19 deletions

diff --git a/org.jacoco.report/src/org/jacoco/report/csv/CSVGroupHandler.java b/org.jacoco.report/src/org/jacoco/report/csv/CSVGroupHandler.java
index b10caeb2..79e08de6 100644
--- a/org.jacoco.report/src/org/jacoco/report/csv/CSVGroupHandler.java
+++ b/org.jacoco.report/src/org/jacoco/report/csv/CSVGroupHandler.java
@@ -39,11 +39,11 @@ class CSVGroupHandler implements IReportGroupVisitor {
 

 	public void visitBundle(final IBundleCoverage bundle,

 			final ISourceFileLocator locator) throws IOException {

-		final String groupName = appendName(bundle.getName());

+		final String name = appendName(bundle.getName());

 		for (final IPackageCoverage p : bundle.getPackages()) {

 			final String packageName = p.getName();

 			for (final IClassCoverage c : p.getClasses()) {

-				writer.writeRow(groupName, packageName, c);

+				writer.writeRow(name, packageName, c);

 			}

 		}

 	}

diff --git a/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java b/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java
index 1f9c7d9a..82d41fe2 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java
@@ -137,21 +137,21 @@ public class HTMLFormatter implements IHTMLReportContext {
 	}

 

 	private Table createTable() {

-		final Table table = new Table();

-		table.add("Element", null, new LabelColumn(), false);

-		table.add("Missed Instructions", Styles.BAR, new BarColumn(INSTRUCTION,

+		final Table t = new Table();

+		t.add("Element", null, new LabelColumn(), false);

+		t.add("Missed Instructions", Styles.BAR, new BarColumn(INSTRUCTION,

 				locale), true);

-		table.add("Cov.", Styles.CTR2,

+		t.add("Cov.", Styles.CTR2,

 				new PercentageColumn(INSTRUCTION, locale), false);

-		table.add("Missed Branches", Styles.BAR, new BarColumn(BRANCH, locale),

+		t.add("Missed Branches", Styles.BAR, new BarColumn(BRANCH, locale),

 				false);

-		table.add("Cov.", Styles.CTR2, new PercentageColumn(BRANCH, locale),

+		t.add("Cov.", Styles.CTR2, new PercentageColumn(BRANCH, locale),

 				false);

-		addMissedTotalColumns(table, "Cxty", COMPLEXITY);

-		addMissedTotalColumns(table, "Lines", LINE);

-		addMissedTotalColumns(table, "Methods", METHOD);

-		addMissedTotalColumns(table, "Classes", CLASS);

-		return table;

+		addMissedTotalColumns(t, "Cxty", COMPLEXITY);

+		addMissedTotalColumns(t, "Lines", LINE);

+		addMissedTotalColumns(t, "Methods", METHOD);

+		addMissedTotalColumns(t, "Classes", CLASS);

+		return t;

 	}

 

 	private void addMissedTotalColumns(final Table table, final String label,

diff --git a/org.jacoco.report/src/org/jacoco/report/internal/html/HTMLElement.java b/org.jacoco.report/src/org/jacoco/report/internal/html/HTMLElement.java
index e94cc3f1..d53197c7 100644
--- a/org.jacoco.report/src/org/jacoco/report/internal/html/HTMLElement.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/HTMLElement.java
@@ -42,6 +42,10 @@ public class HTMLElement extends XMLElement {
 		return element;

 	}

 

+	private void classattr(final String classattr) throws IOException {

+		attr("class", classattr);

+	}

+

 	/**

 	 * Creates a 'meta' element.

 	 * 

@@ -138,7 +142,7 @@ public class HTMLElement extends XMLElement {
 	 */

 	public HTMLElement span(final String classattr) throws IOException {

 		final HTMLElement span = span();

-		span.attr("class", classattr);

+		span.classattr(classattr);

 		return span;

 	}

 

@@ -171,7 +175,7 @@ public class HTMLElement extends XMLElement {
 	 */

 	public HTMLElement div(final String classattr) throws IOException {

 		final HTMLElement div = element("div");

-		div.attr("class", classattr);

+		div.classattr(classattr);

 		return div;

 	}

 

@@ -197,7 +201,7 @@ public class HTMLElement extends XMLElement {
 	 */

 	public HTMLElement pre(final String classattr) throws IOException {

 		final HTMLElement pre = element("pre");

-		pre.attr("class", classattr);

+		pre.classattr(classattr);

 		return pre;

 	}

 

@@ -230,7 +234,7 @@ public class HTMLElement extends XMLElement {
 	public HTMLElement a(final String hrefattr, final String classattr)

 			throws IOException {

 		final HTMLElement a = a(hrefattr);

-		a.attr("class", classattr);

+		a.classattr(classattr);

 		return a;

 	}

 

@@ -269,7 +273,7 @@ public class HTMLElement extends XMLElement {
 	 */

 	public HTMLElement table(final String classattr) throws IOException {

 		final HTMLElement table = element("table");

-		table.attr("class", classattr);

+		table.classattr(classattr);

 		table.attr("cellspacing", "0");

 		return table;

 	}

@@ -340,7 +344,7 @@ public class HTMLElement extends XMLElement {
 	 */

 	public HTMLElement td(final String classattr) throws IOException {

 		final HTMLElement td = td();

-		td.attr("class", classattr);

+		td.classattr(classattr);

 		return td;

 	}