Fix violations

2 files changed, 15 insertions, 17 deletions

diff --git a/sonar-squid/src/main/java/org/sonar/squid/Squid.java b/sonar-squid/src/main/java/org/sonar/squid/Squid.java
index 1702f6f23dd..b2153e25ef0 100644
--- a/sonar-squid/src/main/java/org/sonar/squid/Squid.java
+++ b/sonar-squid/src/main/java/org/sonar/squid/Squid.java
@@ -20,28 +20,20 @@
 
 package org.sonar.squid;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import org.picocontainer.MutablePicoContainer;
 import org.picocontainer.containers.TransientPicoContainer;
 import org.sonar.graph.DirectedGraph;
 import org.sonar.graph.DirectedGraphAccessor;
-import org.sonar.squid.api.CodeScanner;
-import org.sonar.squid.api.CodeVisitor;
-import org.sonar.squid.api.Query;
-import org.sonar.squid.api.SourceCode;
-import org.sonar.squid.api.SourceCodeEdge;
-import org.sonar.squid.api.SourceCodeSearchEngine;
-import org.sonar.squid.api.SourceCodeTreeDecorator;
-import org.sonar.squid.api.SourceProject;
-import org.sonar.squid.api.SquidConfiguration;
+import org.sonar.squid.api.*;
 import org.sonar.squid.indexer.SquidIndex;
 import org.sonar.squid.measures.Metric;
 import org.sonar.squid.measures.MetricDef;
 
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 public class Squid implements DirectedGraphAccessor<SourceCode, SourceCodeEdge>, SourceCodeSearchEngine {
 
   private MutablePicoContainer pico;
@@ -79,7 +71,7 @@ public class Squid implements DirectedGraphAccessor<SourceCode, SourceCodeEdge>,
     SCANNER scanner = pico.getComponent(scannerClass);
     for (Object clazz : scanner.getVisitorClasses()) {
       addToPicocontainer((Class) clazz);
-      scanner.accept(pico.<CodeVisitor>getComponent((Class) clazz));
+      scanner.accept(pico.<CodeVisitor> getComponent((Class) clazz));
     }
     for (CodeVisitor externalVisitor : externalCodeVisitors) {
       scanner.accept(externalVisitor);
@@ -87,6 +79,9 @@ public class Squid implements DirectedGraphAccessor<SourceCode, SourceCodeEdge>,
     return scanner;
   }
 
+  /**
+   * @deprecated use {@link #decorateSourceCodeTreeWith(MetricDef...)} instead
+   */
   @Deprecated
   public SourceProject aggregate() {
     return decorateSourceCodeTreeWith(Metric.values());
diff --git a/sonar-squid/src/main/java/org/sonar/squid/indexer/QueryByMeasure.java b/sonar-squid/src/main/java/org/sonar/squid/indexer/QueryByMeasure.java
index 4afdc7196e6..cdc74381c2a 100644
--- a/sonar-squid/src/main/java/org/sonar/squid/indexer/QueryByMeasure.java
+++ b/sonar-squid/src/main/java/org/sonar/squid/indexer/QueryByMeasure.java
@@ -34,10 +34,13 @@ public class QueryByMeasure implements Query {
   public enum Operator {
     GREATER_THAN, EQUALS, GREATER_THAN_EQUALS, LESS_THAN, LESS_THAN_EQUALS
   }
-  
+
+  /**
+   * @deprecated use {@link #QueryByMeasure(MetricDef, Operator, double)} instead
+   */
   @Deprecated
   public QueryByMeasure(Metric metric, Operator operator, double value) {
-    this((MetricDef)metric, operator, value);
+    this((MetricDef) metric, operator, value);
   }
 
   public QueryByMeasure(MetricDef metric, Operator operator, double value) {