From baf06a9fb7f1e0922083c1f490ab6fc0df962127 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sat, 5 Dec 2015 15:15:07 -0800 Subject: [PATCH] Refactor. --- .../beust/kobalt/internal/KobaltPluginXml.kt | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt b/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt index 54eef53e..67f0c9f5 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt @@ -123,23 +123,26 @@ class PluginInfo(val xml: KobaltPluginXml, val classLoader: ClassLoader?) { // xml.pluginActors?.className?.forEach { with(factory.instanceOf(forName(it))) { - 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) - + 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 -> {} + } } } }