Fix some quality flaws

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java
index 39e49e546da966272a20b2745e8f3b3e5c6da1a7..7d6b9746ada9f9d0feecf8d660ab9b135338996b 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java
@@ -24,7 +24,7 @@ package org.sonar.api.resources;
  * 
  * @since 1.10
  */
-public abstract class Resource<PARENT extends Resource> {
+public abstract class Resource<P extends Resource> {
 
   /**
    * @deprecated since 2.6. Use Scopes.PROJECT.
@@ -176,7 +176,7 @@ public abstract class Resource<PARENT extends Resource> {
    * Return null if the parent is the project.
    * </p>
    */
-  public abstract PARENT getParent();
+  public abstract P getParent();
 
   /**
    * Check resource against an Ant pattern, like mypackag?/*Foo.java. It's used for example to match resource exclusions.

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 411d9dbdce71ad07bfb590aeb5641b478d930e72..158caf22e18cffdbd5fdb62613a1bd31c3f809f4 100644 (file)
--- 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
@@ -50,10 +50,10 @@ public final class KeyValueFormat {
     // only static methods
   }
 
-  public abstract static class Converter<TYPE> {
-    abstract String format(TYPE type);
+  public abstract static class Converter<T> {
+    abstract String format(T type);
 
-    abstract TYPE parse(String s);
+    abstract T parse(String s);
   }
 
   public static final class StringConverter extends Converter<String> {

diff --git a/sonar-testing-harness/src/main/java/org/sonar/test/channel/ChannelMatcher.java b/sonar-testing-harness/src/main/java/org/sonar/test/channel/ChannelMatcher.java
index 36582f5034c143d1c1abe53ed0f76f424b99d575..7cce5d431ca1d2e93b37e8493cbfa870713392e8 100644 (file)
--- a/sonar-testing-harness/src/main/java/org/sonar/test/channel/ChannelMatcher.java
+++ b/sonar-testing-harness/src/main/java/org/sonar/test/channel/ChannelMatcher.java
@@ -24,19 +24,19 @@ import org.hamcrest.Description;
 import org.sonar.channel.Channel;
 import org.sonar.channel.CodeReader;
 
-public class ChannelMatcher<OUTPUT> extends BaseMatcher<Channel<OUTPUT>> {
+public class ChannelMatcher<O> extends BaseMatcher<Channel<O>> {
 
   private final String sourceCode;
-  private final OUTPUT output;
+  private final O output;
   private final CodeReader reader;
 
-  public ChannelMatcher(String sourceCode, OUTPUT output) {
+  public ChannelMatcher(String sourceCode, O output) {
     this.sourceCode = sourceCode;
     this.output = output;
     this.reader = new CodeReader(sourceCode);
   }
 
-  public ChannelMatcher(CodeReader reader, OUTPUT output) {
+  public ChannelMatcher(CodeReader reader, O output) {
     this.output = output;
     this.sourceCode = new String(reader.peek(30));
     this.reader = reader;
@@ -46,7 +46,7 @@ public class ChannelMatcher<OUTPUT> extends BaseMatcher<Channel<OUTPUT>> {
     if ( !(arg0 instanceof Channel)) {
       return false;
     }
-    Channel<OUTPUT> channel = (Channel<OUTPUT>) arg0;
+    Channel<O> channel = (Channel<O>) arg0;
     return channel.consume(reader, output);
   }