Fix some quality flaws

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputDir.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputDir.java
index ac48ea2b3b055c334400b7b9817abfc9686fa4f2..8979e1f3468646c9969639ca4edc78deac6af73e 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputDir.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputDir.java
@@ -83,7 +83,7 @@ public class DefaultInputDir implements InputDir {
     if (this == o) {
       return true;
     }
-    if (!(this.getClass() == o.getClass())) {
+    if (o == null || this.getClass() != o.getClass()) {
       return false;
     }
 

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/internal/DefaultHighlighting.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/internal/DefaultHighlighting.java
index ca1a0b4a355cb77fc66c726d5edc0ba208cfd584..60e0db9a2d3ab3c845dc7ac2ab6cf2ad6defad80 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/internal/DefaultHighlighting.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/highlighting/internal/DefaultHighlighting.java
@@ -20,7 +20,6 @@
 package org.sonar.api.batch.sensor.highlighting.internal;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
@@ -31,6 +30,7 @@ import org.sonar.api.batch.sensor.internal.SensorStorage;
 
 import javax.annotation.Nullable;
 
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.Set;
 
@@ -45,10 +45,9 @@ public class DefaultHighlighting extends DefaultStorable implements NewHighlight
 
   public DefaultHighlighting(@Nullable SensorStorage storage) {
     super(storage);
-    syntaxHighlightingRuleSet = Sets.newTreeSet(new Ordering<SyntaxHighlightingRule>() {
+    syntaxHighlightingRuleSet = Sets.newTreeSet(new Comparator<SyntaxHighlightingRule>() {
       @Override
-      public int compare(@Nullable SyntaxHighlightingRule left,
-        @Nullable SyntaxHighlightingRule right) {
+      public int compare(SyntaxHighlightingRule left, SyntaxHighlightingRule right) {
         int result = left.getStartPosition() - right.getStartPosition();
         if (result == 0) {
           result = right.getEndPosition() - left.getEndPosition();