aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server/src/main/java/org/sonar/server/platform
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2014-04-25 14:13:43 +0200
committerJulien Lancelot <julien.lancelot@sonarsource.com>2014-04-25 16:03:35 +0200
commitc26e5ebef93099f1d845404d85e0bee7061e23a5 (patch)
tree932a2447131dcf4d54e00250300961879b9764b9 /sonar-server/src/main/java/org/sonar/server/platform
parent433fc34a5a8513fe80dc6cd8ad758afde5bfd0a7 (diff)
downloadsonarqube-c26e5ebef93099f1d845404d85e0bee7061e23a5.tar.gz
sonarqube-c26e5ebef93099f1d845404d85e0bee7061e23a5.zip
Rename addExtensions by addComponents
Diffstat (limited to 'sonar-server/src/main/java/org/sonar/server/platform')
-rw-r--r--sonar-server/src/main/java/org/sonar/server/platform/Platform.java4
-rw-r--r--sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java12
2 files changed, 8 insertions, 8 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
index ff19bc981f3..49bb4bdc734 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
@@ -148,8 +148,8 @@ public class Platform {
}
}
- public void addExtensions(Object... extensions){
- serverComponents.addExtensions(extensions);
+ public void addComponents(Object... components){
+ serverComponents.addComponents(components);
}
public ComponentContainer getContainer() {
diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
index 5d3c7fdcdc8..b053b7349df 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
@@ -131,7 +131,7 @@ import java.util.List;
class ServerComponents {
private final Object[] rootComponents;
- private Object[] extensions;
+ private Object[] level4AddedComponents;
ServerComponents(Object... rootComponents) {
this.rootComponents = rootComponents;
@@ -393,9 +393,9 @@ class ServerComponents {
pico.addSingleton(StringTypeValidation.class);
pico.addSingleton(StringListTypeValidation.class);
- if (extensions != null) {
- for (Object extension : extensions) {
- pico.addSingleton(extension);
+ if (level4AddedComponents != null) {
+ for (Object components : level4AddedComponents) {
+ pico.addSingleton(components);
}
}
@@ -406,8 +406,8 @@ class ServerComponents {
executeStartupTaks(pico);
}
- void addExtensions(Object... extensions){
- this.extensions = extensions;
+ void addComponents(Object... components){
+ this.level4AddedComponents = components;
}
private void executeStartupTaks(ComponentContainer pico) {