Fix some violations

6 files changed, 18 insertions, 10 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CloseReviewsDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CloseReviewsDecorator.java
index e7c897d9fb3..bde5e90cc58 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CloseReviewsDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/CloseReviewsDecorator.java
@@ -90,7 +90,10 @@ public class CloseReviewsDecorator implements Decorator {
   protected int closeReviewsOnResolvedViolations(Resource resource, int resourceId, int snapshotId) {
     String conditions = " WHERE resource_id=" + resourceId + " AND "
       + "( "
-      + "  (manual_violation=:automaticViolation AND status!='CLOSED' AND rule_failure_permanent_id NOT IN " + "(SELECT permanent_id FROM rule_failures WHERE snapshot_id=" + snapshotId + " AND permanent_id IS NOT NULL))"
+      + "  ( "
+      + "    manual_violation=:automaticViolation AND status!='CLOSED' AND "
+      + "    rule_failure_permanent_id NOT IN (SELECT permanent_id FROM rule_failures WHERE snapshot_id=" + snapshotId + " AND permanent_id IS NOT NULL)"
+      + "  )"
       + "  OR "
       + "  (manual_violation=:manualViolation AND status='RESOLVED')"
       + ")";
diff --git a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeRuleMeasures.java b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeRuleMeasures.java
index 790a4f96a37..168d97fea21 100644
--- a/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeRuleMeasures.java
+++ b/plugins/sonar-dbcleaner-plugin/src/main/java/org/sonar/plugins/dbcleaner/purges/PurgeRuleMeasures.java
@@ -47,8 +47,9 @@ public final class PurgeRuleMeasures extends Purge {
   }
 
   private void purge(Integer sid) {
-    Query query = getSession().createQuery("SELECT m.id FROM " + MeasureModel.class.getSimpleName() + " m, " + Snapshot.class.getSimpleName() + " s WHERE s.id = m.snapshotId and " +
-        "(s.rootId=:rootSid OR s.id=:rootSid) and m.ruleId is not null");
+    Query query = getSession().createQuery(
+      "SELECT m.id FROM " + MeasureModel.class.getSimpleName() + " m, " + Snapshot.class.getSimpleName() + " s " +
+        " WHERE s.id = m.snapshotId AND (s.rootId=:rootSid OR s.id=:rootSid) and m.ruleId is not null");
     query.setParameter("rootSid", sid);
     List<Integer> measureIds = query.getResultList();
     PurgeUtils.deleteMeasuresById(getSession(), measureIds);
diff --git a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/batch/MavenDependenciesSensor.java b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/batch/MavenDependenciesSensor.java
index 198340252c4..be23b8433f9 100644
--- a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/batch/MavenDependenciesSensor.java
+++ b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/batch/MavenDependenciesSensor.java
@@ -54,7 +54,8 @@ public class MavenDependenciesSensor implements Sensor {
   private DependencyTreeBuilder treeBuilder;
   private SonarIndex index;
 
-  public MavenDependenciesSensor(ArtifactRepository localRepository, ArtifactFactory artifactFactory, ArtifactMetadataSource artifactMetadataSource, ArtifactCollector artifactCollector, DependencyTreeBuilder treeBuilder, SonarIndex index) {
+  public MavenDependenciesSensor(ArtifactRepository localRepository, ArtifactFactory artifactFactory, ArtifactMetadataSource artifactMetadataSource,
+                                 ArtifactCollector artifactCollector, DependencyTreeBuilder treeBuilder, SonarIndex index) {
     this.localRepository = localRepository;
     this.artifactFactory = artifactFactory;
     this.artifactMetadataSource = artifactMetadataSource;
diff --git a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/GwtDesignPage.java b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/GwtDesignPage.java
index 22dd200c31a..360fb5174f8 100644
--- a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/GwtDesignPage.java
+++ b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/GwtDesignPage.java
@@ -21,13 +21,16 @@ package org.sonar.plugins.design.ui.page;
 
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.resources.Java;
-import org.sonar.api.resources.Resource;
+import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.web.*;
 import org.sonar.plugins.design.ui.page.client.DesignPage;
 
 @ResourceLanguage(Java.KEY)
-@ResourceQualifier({Resource.QUALIFIER_PROJECT, Resource.QUALIFIER_MODULE, Resource.QUALIFIER_PACKAGE, Resource.QUALIFIER_DIRECTORY})
-@DefaultTab(metrics={CoreMetrics.DEPENDENCY_MATRIX_KEY, CoreMetrics.PACKAGE_FEEDBACK_EDGES_KEY, CoreMetrics.PACKAGE_CYCLES_KEY, CoreMetrics.PACKAGE_TANGLE_INDEX_KEY, CoreMetrics.PACKAGE_TANGLES_KEY, CoreMetrics.FILE_CYCLES_KEY, CoreMetrics.FILE_TANGLE_INDEX_KEY, CoreMetrics.FILE_TANGLES_KEY, CoreMetrics.FILE_FEEDBACK_EDGES_KEY})
+@ResourceQualifier({Qualifiers.PROJECT, Qualifiers.MODULE, Qualifiers.PACKAGE, Qualifiers.DIRECTORY})
+@DefaultTab(metrics = {
+  CoreMetrics.DEPENDENCY_MATRIX_KEY, CoreMetrics.PACKAGE_FEEDBACK_EDGES_KEY, CoreMetrics.PACKAGE_CYCLES_KEY, CoreMetrics.PACKAGE_TANGLE_INDEX_KEY,
+  CoreMetrics.PACKAGE_TANGLES_KEY, CoreMetrics.FILE_CYCLES_KEY, CoreMetrics.FILE_TANGLE_INDEX_KEY, CoreMetrics.FILE_TANGLES_KEY,
+  CoreMetrics.FILE_FEEDBACK_EDGES_KEY})
 @NavigationSection({NavigationSection.RESOURCE, NavigationSection.RESOURCE_TAB})
 @UserRole(UserRole.USER)
 public class GwtDesignPage extends GwtPage {
diff --git a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/client/DependencyInfo.java b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/client/DependencyInfo.java
index 412322fb779..6b68914f04e 100644
--- a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/client/DependencyInfo.java
+++ b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/client/DependencyInfo.java
@@ -58,7 +58,8 @@ public final class DependencyInfo extends Composite {
 
   public void showOrPopup(String dependencyId) {
     if (popupMode) {
-      Window.open(Links.urlForResourcePage(Configuration.getResourceId(), DesignPage.GWT_ID, "layout=false&depId=" + dependencyId), "dependency", Links.DEFAULT_POPUP_HTML_FEATURES);
+      Window.open(Links.urlForResourcePage(Configuration.getResourceId(), DesignPage.GWT_ID, "layout=false&depId=" + dependencyId),
+        "dependency", Links.DEFAULT_POPUP_HTML_FEATURES);
 
     } else {
       INSTANCE.show(dependencyId);
@@ -68,7 +69,7 @@ public final class DependencyInfo extends Composite {
   public void show(String dependencyId) {
     panel.clear();
     currentDependencyId = dependencyId;
-    if (dependencyId !=null) {
+    if (dependencyId != null) {
       panel.add(loading);
       loadDependency(dependencyId);
     }
diff --git a/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JacocoAntInitializer.java b/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JacocoAntInitializer.java
index 37d65067e3e..4f096542882 100644
--- a/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JacocoAntInitializer.java
+++ b/plugins/sonar-jacoco-plugin/src/main/java/org/sonar/plugins/jacoco/JacocoAntInitializer.java
@@ -25,7 +25,6 @@ import org.sonar.api.batch.Initializer;
 import org.sonar.api.batch.SupportedEnvironment;
 import org.sonar.api.resources.Project;
 
-import java.util.Hashtable;
 import java.util.Map;
 
 @SupportedEnvironment("ant")