diff options
author | simonbrandhof <simon.brandhof@gmail.com> | 2011-05-26 08:33:18 +0200 |
---|---|---|
committer | simonbrandhof <simon.brandhof@gmail.com> | 2011-05-26 08:33:18 +0200 |
commit | 235d3e745d68bf549ce0c5353d76f936572f7c93 (patch) | |
tree | 0fffba766cbfb8f18d325685881a323e3cf5516d /sonar-batch/src/main | |
parent | 27b6358cba309925505e09f4d44d3157435bf096 (diff) | |
download | sonarqube-235d3e745d68bf549ce0c5353d76f936572f7c93.tar.gz sonarqube-235d3e745d68bf549ce0c5353d76f936572f7c93.zip |
SONAR-2469 fix typo in name of InstantiationStrategy class
Diffstat (limited to 'sonar-batch/src/main')
3 files changed, 8 insertions, 8 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionInstaller.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionInstaller.java index d111f444ec4..f176e1a81fc 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionInstaller.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionInstaller.java @@ -23,7 +23,7 @@ import org.sonar.api.BatchComponent; import org.sonar.api.ExtensionProvider; import org.sonar.api.Plugin; import org.sonar.api.batch.CoverageExtension; -import org.sonar.api.batch.InstanciationStrategy; +import org.sonar.api.batch.InstantiationStrategy; import org.sonar.batch.bootstrapper.EnvironmentInformation; import java.util.List; @@ -64,9 +64,9 @@ public final class BatchExtensionInstaller implements BatchComponent { void installExtension(Module module, Object extension) { if (ExtensionUtils.isBatchExtension(extension) && ExtensionUtils.isSupportedEnvironment(extension, environment) && - ExtensionUtils.isInstantiationStrategy(extension, InstanciationStrategy.PER_BATCH)) { + ExtensionUtils.isInstantiationStrategy(extension, InstantiationStrategy.PER_BATCH)) { if (ExtensionUtils.isType(extension, CoverageExtension.class)) { - throw new IllegalArgumentException("Instantiation strategy " + InstanciationStrategy.PER_BATCH + " is not supported on CoverageExtension components: " + extension); + throw new IllegalArgumentException("Instantiation strategy " + InstantiationStrategy.PER_BATCH + " is not supported on CoverageExtension components: " + extension); } module.addComponent(extension); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java index 01a7c809eca..a7907b6b08e 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionUtils.java @@ -22,7 +22,7 @@ package org.sonar.batch.bootstrap; import org.apache.commons.lang.StringUtils; import org.sonar.api.BatchExtension; import org.sonar.api.Extension; -import org.sonar.api.batch.InstanciationStrategy; +import org.sonar.api.batch.InstantiationStrategy; import org.sonar.api.batch.SupportedEnvironment; import org.sonar.api.utils.AnnotationUtils; import org.sonar.batch.bootstrapper.EnvironmentInformation; @@ -35,11 +35,11 @@ public final class ExtensionUtils { static boolean isInstantiationStrategy(Object extension, String strategy) { Class clazz = (extension instanceof Class ? (Class) extension : extension.getClass()); - InstanciationStrategy extStrategy = AnnotationUtils.getClassAnnotation(clazz, InstanciationStrategy.class); + InstantiationStrategy extStrategy = AnnotationUtils.getClassAnnotation(clazz, InstantiationStrategy.class); if (extStrategy != null) { return strategy.equals(extStrategy.value()); } - return InstanciationStrategy.PER_PROJECT.equals(strategy); + return InstantiationStrategy.PER_PROJECT.equals(strategy); } static boolean isBatchExtension(Object extension) { diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExtensionInstaller.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExtensionInstaller.java index 4d3faea35c0..bfb924cf7b4 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExtensionInstaller.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectExtensionInstaller.java @@ -26,7 +26,7 @@ import org.sonar.api.ExtensionProvider; import org.sonar.api.Plugin; import org.sonar.api.batch.AbstractCoverageExtension; import org.sonar.api.batch.CoverageExtension; -import org.sonar.api.batch.InstanciationStrategy; +import org.sonar.api.batch.InstantiationStrategy; import org.sonar.api.resources.Java; import org.sonar.api.resources.Project; import org.sonar.batch.bootstrapper.EnvironmentInformation; @@ -71,7 +71,7 @@ public final class ProjectExtensionInstaller implements BatchComponent { private Object installExtension(Module module, Object extension, Project project, String pluginKey) { if (ExtensionUtils.isBatchExtension(extension) && ExtensionUtils.isSupportedEnvironment(extension, environment) && - ExtensionUtils.isInstantiationStrategy(extension, InstanciationStrategy.PER_PROJECT) && + ExtensionUtils.isInstantiationStrategy(extension, InstantiationStrategy.PER_PROJECT) && !isDeactivatedCoverageExtension(extension, project, pluginKey)) { module.addComponent(extension); |