Fix quality flaws

3 files changed, 22 insertions, 22 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/checks/CheckFactory.java b/sonar-plugin-api/src/main/java/org/sonar/api/checks/CheckFactory.java
index b6c039e15c8..f4f9f81d514 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/checks/CheckFactory.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/checks/CheckFactory.java
@@ -29,10 +29,10 @@ import java.util.Map;
 /**
  * @since 2.3
  */
-public abstract class CheckFactory<CHECK> {
+public abstract class CheckFactory<C> {
   
-  private Map<ActiveRule, CHECK> checkByActiveRule = Maps.newIdentityHashMap();
-  private Map<CHECK, ActiveRule> activeRuleByCheck = Maps.newIdentityHashMap();
+  private Map<ActiveRule, C> checkByActiveRule = Maps.newIdentityHashMap();
+  private Map<C, ActiveRule> activeRuleByCheck = Maps.newIdentityHashMap();
   private RulesProfile profile;
   private String repositoryKey;
 
@@ -45,27 +45,27 @@ public abstract class CheckFactory<CHECK> {
     checkByActiveRule.clear();
     activeRuleByCheck.clear();
     for (ActiveRule activeRule : profile.getActiveRulesByRepository(repositoryKey)) {
-      CHECK check = createCheck(activeRule);
+      C check = createCheck(activeRule);
       checkByActiveRule.put(activeRule, check);
       activeRuleByCheck.put(check, activeRule);
     }
   }
 
-  abstract CHECK createCheck(ActiveRule activeRule);
+  abstract C createCheck(ActiveRule activeRule);
 
   public final String getRepositoryKey() {
     return repositoryKey;
   }
 
-  public final Collection<CHECK> getChecks() {
+  public final Collection<C> getChecks() {
     return checkByActiveRule.values();
   }
 
-  public final CHECK getCheck(ActiveRule activeRule) {
+  public final C getCheck(ActiveRule activeRule) {
     return checkByActiveRule.get(activeRule);
   }
 
-  public final ActiveRule getActiveRule(CHECK check) {
+  public final ActiveRule getActiveRule(C check) {
     return activeRuleByCheck.get(check);
   }
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/PropertiesBuilder.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/PropertiesBuilder.java
index d95034ed39c..1adff64c5cb 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/PropertiesBuilder.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/PropertiesBuilder.java
@@ -27,30 +27,30 @@ import java.util.TreeMap;
 /**
  * @since 1.10
  */
-public class PropertiesBuilder<KEY, VALUE> {
+public class PropertiesBuilder<K, V> {
   private Metric metric;
-  private Map<KEY, VALUE> props;
+  private Map<K, V> props;
 
-  public PropertiesBuilder(Metric metric, Map<KEY, VALUE> map) {
-    this.props = new TreeMap<KEY, VALUE>(map);
+  public PropertiesBuilder(Metric metric, Map<K, V> map) {
+    this.props = new TreeMap<K, V>(map);
     this.metric = metric;
   }
 
   public PropertiesBuilder(Metric metric) {
-    this.props = new TreeMap<KEY, VALUE>();
+    this.props = new TreeMap<K, V>();
     this.metric = metric;
   }
 
   public PropertiesBuilder() {
-    this.props = new TreeMap<KEY, VALUE>();
+    this.props = new TreeMap<K, V>();
   }
 
-  public PropertiesBuilder<KEY, VALUE> clear() {
+  public PropertiesBuilder<K, V> clear() {
     this.props.clear();
     return this;
   }
 
-  public Map<KEY, VALUE> getProps() {
+  public Map<K, V> getProps() {
     return props;
   }
 
@@ -58,17 +58,17 @@ public class PropertiesBuilder<KEY, VALUE> {
     return metric;
   }
 
-  public PropertiesBuilder<KEY, VALUE> setMetric(Metric metric) {
+  public PropertiesBuilder<K, V> setMetric(Metric metric) {
     this.metric = metric;
     return this;
   }
 
-  public PropertiesBuilder<KEY, VALUE> add(KEY key, VALUE value) {
+  public PropertiesBuilder<K, V> add(K key, V value) {
     props.put(key, value);
     return this;
   }
 
-  public PropertiesBuilder<KEY, VALUE> addAll(Map<KEY, VALUE> map) {
+  public PropertiesBuilder<K, V> addAll(Map<K, V> map) {
     props.putAll(map);
     return this;
   }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java
index 4b413525d63..411d9dbdce7 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java
@@ -326,11 +326,11 @@ public final class KeyValueFormat {
    * @deprecated since 2.7
    */
   @Deprecated
-  public static <KEY, VALUE> Map<KEY, VALUE> parse(String data, Transformer<KEY, VALUE> transformer) {
+  public static <K, V> Map<K, V> parse(String data, Transformer<K, V> transformer) {
     Map<String, String> rawData = parse(data);
-    Map<KEY, VALUE> map = new HashMap<KEY, VALUE>();
+    Map<K, V> map = new HashMap<K, V>();
     for (Map.Entry<String, String> entry : rawData.entrySet()) {
-      KeyValue<KEY, VALUE> keyVal = transformer.transform(entry.getKey(), entry.getValue());
+      KeyValue<K, V> keyVal = transformer.transform(entry.getKey(), entry.getValue());
       if (keyVal != null) {
         map.put(keyVal.getKey(), keyVal.getValue());
       }