From 7ae01ebd5d669c2984821c18e68c305da288a62d Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Mon, 1 Sep 2014 18:16:10 +0200
Subject: [PATCH] Rename for consistency

---
 .../main/java/org/sonar/batch/scan/SensorContextAdaptor.java  | 4 ++--
 .../{CommonSensorContext.java => BaseSensorContext.java}      | 4 ++--
 .../main/java/org/sonar/batch/scan2/DefaultSensorContext.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename sonar-batch/src/main/java/org/sonar/batch/scan2/{CommonSensorContext.java => BaseSensorContext.java} (96%)

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/SensorContextAdaptor.java b/sonar-batch/src/main/java/org/sonar/batch/scan/SensorContextAdaptor.java
index 6a117d7ec6a..545c480381a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/SensorContextAdaptor.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/SensorContextAdaptor.java
@@ -46,7 +46,7 @@ import org.sonar.api.rule.RuleKey;
 import org.sonar.batch.duplication.BlockCache;
 import org.sonar.batch.duplication.DuplicationCache;
 import org.sonar.batch.index.ComponentDataCache;
-import org.sonar.batch.scan2.CommonSensorContext;
+import org.sonar.batch.scan2.BaseSensorContext;
 
 import java.io.Serializable;
 
@@ -55,7 +55,7 @@ import java.io.Serializable;
  * Will be dropped once old {@link Sensor} API is dropped.
  *
  */
-public class SensorContextAdaptor extends CommonSensorContext {
+public class SensorContextAdaptor extends BaseSensorContext {
 
   private final org.sonar.api.batch.SensorContext sensorContext;
   private final MetricFinder metricFinder;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan2/CommonSensorContext.java b/sonar-batch/src/main/java/org/sonar/batch/scan2/BaseSensorContext.java
similarity index 96%
rename from sonar-batch/src/main/java/org/sonar/batch/scan2/CommonSensorContext.java
rename to sonar-batch/src/main/java/org/sonar/batch/scan2/BaseSensorContext.java
index 6c3ed8949c4..1246d4ea630 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan2/CommonSensorContext.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan2/BaseSensorContext.java
@@ -53,7 +53,7 @@ import java.util.List;
  * @author julien
  *
  */
-public abstract class CommonSensorContext implements SensorContext {
+public abstract class BaseSensorContext implements SensorContext {
 
   private final Settings settings;
   private final FileSystem fs;
@@ -62,7 +62,7 @@ public abstract class CommonSensorContext implements SensorContext {
   private final BlockCache blockCache;
   private final DuplicationCache duplicationCache;
 
-  protected CommonSensorContext(Settings settings, FileSystem fs, ActiveRules activeRules, ComponentDataCache componentDataCache,
+  protected BaseSensorContext(Settings settings, FileSystem fs, ActiveRules activeRules, ComponentDataCache componentDataCache,
     BlockCache blockCache, DuplicationCache duplicationCache) {
     this.settings = settings;
     this.fs = fs;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultSensorContext.java b/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultSensorContext.java
index 6350622c72f..2df3de1b0e5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultSensorContext.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultSensorContext.java
@@ -42,7 +42,7 @@ import org.sonar.core.component.ComponentKeys;
 
 import java.io.Serializable;
 
-public class DefaultSensorContext extends CommonSensorContext {
+public class DefaultSensorContext extends BaseSensorContext {
 
   private final AnalyzerMeasureCache measureCache;
   private final AnalyzerIssueCache issueCache;
-- 
2.39.5