From 71394e6f69cf55e281555233da863f98d0aae2f5 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sat, 5 Dec 2015 16:57:31 -0800 Subject: [PATCH] Revert "Refactor." This reverts commit baf06a9fb7f1e0922083c1f490ab6fc0df962127. --- .../beust/kobalt/internal/KobaltPluginXml.kt | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt b/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt index fa0af81d..4bbd94e3 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt @@ -124,26 +124,23 @@ class PluginInfo(val xml: KobaltPluginXml, val classLoader: ClassLoader?) { // xml.pluginActors?.className?.forEach { with(factory.instanceOf(forName(it))) { - when(this) { - is IBuildConfigFieldContributor -> buildConfigFieldContributors.add(this) - is IBuildConfigFieldContributor -> buildConfigFieldContributors.add(this) - is IBuildDirectoryIncerceptor -> buildDirectoryInterceptors.add(this) - is IClasspathContributor -> classpathContributors.add(this) - is IClasspathInterceptor->classpathInterceptors.add(this) - is ICompilerContributor->compilerContributors.add(this) - is ICompilerFlagContributor->compilerFlagContributors.add(this) - is ICompilerInterceptor->compilerInterceptors.add(this) - is IDocContributor->docContributors.add(this) - is IInitContributor<*>->initContributors.add(this as IInitContributor) - is IPlugin->plugins.add(this) - is IProjectContributor->projectContributors.add(this) - is IRepoContributor->repoContributors.add(this) - is IRunnerContributor->runnerContributors.add(this) - is ISourceDirectoryContributor->sourceDirContributors.add(this) - is ISourceDirectoryIncerceptor->sourceDirectoriesInterceptors.add(this) - is ITestRunnerContributor->testRunnerContributors.add(this) - else -> {} - } + if (this is IBuildConfigFieldContributor) buildConfigFieldContributors.add(this) + if (this is IBuildDirectoryIncerceptor) buildDirectoryInterceptors.add(this) + if (this is IClasspathContributor) classpathContributors.add(this) + if (this is IClasspathInterceptor) classpathInterceptors.add(this) + if (this is ICompilerContributor) compilerContributors.add(this) + if (this is ICompilerFlagContributor) compilerFlagContributors.add(this) + if (this is ICompilerInterceptor) compilerInterceptors.add(this) + if (this is IDocContributor) docContributors.add(this) + if (this is IInitContributor<*>) initContributors.add(this as IInitContributor) + if (this is IPlugin) plugins.add(this) + if (this is IProjectContributor) projectContributors.add(this) + if (this is IRepoContributor) repoContributors.add(this) + if (this is IRunnerContributor) runnerContributors.add(this) + if (this is ISourceDirectoryContributor) sourceDirContributors.add(this) + if (this is ISourceDirectoryIncerceptor) sourceDirectoriesInterceptors.add(this) + if (this is ITestRunnerContributor) testRunnerContributors.add(this) + } } }