From 28654fbd5d119abae90049bb81c421dec4d9eacb Mon Sep 17 00:00:00 2001 From: Godin Date: Sun, 28 Nov 2010 20:43:34 +0000 Subject: [PATCH] Fix violations reported on Nemo --- .../sonar/plugins/squid/bridges/Lcom4BlocksBridge.java | 4 ++-- .../org/sonar/api/database/model/RuleFailureModel.java | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/bridges/Lcom4BlocksBridge.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/bridges/Lcom4BlocksBridge.java index 9d302106553..14a9b1b09b7 100644 --- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/bridges/Lcom4BlocksBridge.java +++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/bridges/Lcom4BlocksBridge.java @@ -45,7 +45,7 @@ public class Lcom4BlocksBridge extends Bridge { // it can be removed from memory. squidFile.removeMeasure(Metric.LCOM4_BLOCKS); - if (blocks != null && blocks.size() > 0) { + if (blocks != null && !blocks.isEmpty()) { Measure measure = new Measure(CoreMetrics.LCOM4_BLOCKS, serialize(blocks)); measure.setPersistenceMode(PersistenceMode.DATABASE); context.saveMeasure(sonarFile, measure); @@ -69,7 +69,7 @@ public class Lcom4BlocksBridge extends Bridge { for (int indexBlock = 0; indexBlock < blocks.size(); indexBlock++) { blocks.get(indexBlock); Set block = blocks.get(indexBlock); - if (block.size() > 0) { + if (!block.isEmpty()) { if (indexBlock > 0) { sb.append(','); } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/RuleFailureModel.java b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/RuleFailureModel.java index 144119c45d8..2d18f044bb6 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/RuleFailureModel.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/RuleFailureModel.java @@ -19,16 +19,19 @@ */ package org.sonar.api.database.model; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Table; + import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.sonar.api.database.BaseIdentifiable; -import org.sonar.api.rules.Rule; import org.sonar.api.rules.RulePriority; -import javax.persistence.*; - @Entity @Table(name = "rule_failures") public class RuleFailureModel extends BaseIdentifiable { -- 2.39.5