From 8a204e97bd2694aee69cafebab9925d824e6886e Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@gmail.com>
Date: Wed, 27 Feb 2013 16:00:40 +0100
Subject: Moved Languages in ModuleContainer

---
 .../src/main/java/org/sonar/batch/bootstrap/ModuleContainer.java      | 3 +++
 .../main/java/org/sonar/batch/bootstrap/ProjectLessTaskContainer.java | 3 +--
 .../src/main/java/org/sonar/batch/bootstrap/ProjectTaskContainer.java | 4 +---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sonar-batch')

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ModuleContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ModuleContainer.java
index 530a4ce0527..4a36fc61206 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ModuleContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ModuleContainer.java
@@ -17,11 +17,13 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
+
 package org.sonar.batch.bootstrap;
 
 import org.sonar.api.batch.BatchExtensionDictionnary;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.database.model.Snapshot;
+import org.sonar.api.resources.Languages;
 import org.sonar.api.resources.Project;
 import org.sonar.api.scan.filesystem.FileExclusions;
 import org.sonar.api.scan.filesystem.PathResolver;
@@ -88,6 +90,7 @@ public abstract class ModuleContainer extends Container {
 
     container.addSingleton(RulesDao.class);
     container.addSingleton(LastSnapshots.class);
+    container.addSingleton(Languages.class);
 
     // file system
     container.addSingleton(PathResolver.class);
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectLessTaskContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectLessTaskContainer.java
index 2fa80eac3a3..1df65ec74cb 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectLessTaskContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectLessTaskContainer.java
@@ -17,13 +17,13 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
+
 package org.sonar.batch.bootstrap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.api.config.EmailSettings;
-import org.sonar.api.resources.Languages;
 import org.sonar.api.resources.ResourceTypes;
 import org.sonar.api.task.Task;
 import org.sonar.api.task.TaskDefinition;
@@ -106,7 +106,6 @@ public class ProjectLessTaskContainer extends Container {
     container.addSingleton(PastSnapshotFinderByPreviousVersion.class);
     container.addSingleton(PastMeasuresLoader.class);
     container.addSingleton(PastSnapshotFinder.class);
-    container.addSingleton(Languages.class);
     container.addSingleton(DefaultModelFinder.class);
     container.addSingleton(MetricProvider.class);
     container.addSingleton(DefaultResourceCreationLock.class);
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectTaskContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectTaskContainer.java
index 1dccf54a284..a5ea55a2da9 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectTaskContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectTaskContainer.java
@@ -17,6 +17,7 @@
  * License along with Sonar; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  */
+
 package org.sonar.batch.bootstrap;
 
 import org.slf4j.Logger;
@@ -69,9 +70,6 @@ public class ProjectTaskContainer extends Container {
     installer.installTaskExtensions(container, true);
   }
 
-  /**
-   * Used by views plugin to emulate a project
-   */
   private void registerCoreComponentsRequiringProject() {
     container.addSingleton(ProjectExclusions.class);
     container.addSingleton(ProjectReactorReady.class);
-- 
cgit v1.2.3