Fix some quality flaws

2 files changed, 15 insertions, 3 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingResult.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingResult.java
index dd69da8e23c..68e24d97bae 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingResult.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingResult.java
@@ -87,8 +87,7 @@ class IssueTrackingResult {
     }
     unmatchedByRuleAndKey.get(ruleKey).put(i.getKee(), i);
     Map<Integer, Multimap<String, IssueDto>> unmatchedForRule = unmatchedByRuleAndLineAndChecksum.get(ruleKey);
-    Integer line = i.getLine();
-    Integer lineNotNull = line != null ? line : 0;
+    Integer lineNotNull = lineNotNull(i);
     if (!unmatchedForRule.containsKey(lineNotNull)) {
       unmatchedForRule.put(lineNotNull, HashMultimap.<String, IssueDto>create());
     }
@@ -97,12 +96,18 @@ class IssueTrackingResult {
     unmatchedForRuleAndLine.put(checksumNotNull, i);
   }
 
+  private Integer lineNotNull(IssueDto i) {
+    Integer line = i.getLine();
+    Integer lineNotNull = line != null ? line : 0;
+    return lineNotNull;
+  }
+
   void setMatch(DefaultIssue issue, IssueDto matching) {
     matched.put(issue, matching);
     RuleKey ruleKey = RuleKey.of(matching.getRuleRepo(), matching.getRule());
     unmatchedByRuleAndKey.get(ruleKey).remove(matching.getKee());
     unmatchedByKey.remove(matching.getKee());
-    Integer lineNotNull = matching.getLine() != null ? matching.getLine() : 0;
+    Integer lineNotNull = lineNotNull(matching);
     String checksumNotNull = StringUtils.defaultString(matching.getChecksum(), "");
     unmatchedByRuleAndLineAndChecksum.get(ruleKey).get(lineNotNull).get(checksumNotNull).remove(matching);
   }
diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooScmProvider.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooScmProvider.java
index 5807d820043..1dbcb2c04fd 100644
--- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooScmProvider.java
+++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooScmProvider.java
@@ -22,6 +22,8 @@ package org.sonar.xoo.scm;
 import org.sonar.api.batch.scm.BlameCommand;
 import org.sonar.api.batch.scm.ScmProvider;
 
+import java.io.File;
+
 public class XooScmProvider extends ScmProvider {
 
   private final XooBlameCommand blame;
@@ -31,6 +33,11 @@ public class XooScmProvider extends ScmProvider {
   }
 
   @Override
+  public boolean supports(File baseDir) {
+    return new File(baseDir, ".xoo").exists();
+  }
+
+  @Override
   public String key() {
     return "xoo";
   }