erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 16:28:12 -07:00
Code Releases Activity

Rename to templateContributors.

Browse source
This commit is contained in:
Cedric Beust 2017-02-20 07:59:29 -08:00
parent d806649194
commit 1257b9b310
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt
View file

@ -72,7 +72,7 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
val plugins = arrayListOf<IPlugin>() val plugins = arrayListOf<IPlugin>()
val projectContributors = arrayListOf<IProjectContributor>() val projectContributors = arrayListOf<IProjectContributor>()
val classpathContributors = arrayListOf<IClasspathContributor>() val classpathContributors = arrayListOf<IClasspathContributor>()
val initContributors = arrayListOf<ITemplateContributor>() val templateContributors = arrayListOf<ITemplateContributor>()
val repoContributors = arrayListOf<IRepoContributor>() val repoContributors = arrayListOf<IRepoContributor>()
val compilerFlagContributors = arrayListOf<ICompilerFlagContributor>() val compilerFlagContributors = arrayListOf<ICompilerFlagContributor>()
val compilerInterceptors = arrayListOf<ICompilerInterceptor>() val compilerInterceptors = arrayListOf<ICompilerInterceptor>()
@ -193,7 +193,7 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
if (this is ICompilerFlagContributor) compilerFlagContributors.add(this) if (this is ICompilerFlagContributor) compilerFlagContributors.add(this)
if (this is ICompilerInterceptor) compilerInterceptors.add(this) if (this is ICompilerInterceptor) compilerInterceptors.add(this)
if (this is IDocContributor) docContributors.add(this) if (this is IDocContributor) docContributors.add(this)
if (this is ITemplateContributor) initContributors.add(this) if (this is ITemplateContributor) templateContributors.add(this)
if (this is IPlugin) plugins.add(this) if (this is IPlugin) plugins.add(this)
if (this is IProjectContributor) projectContributors.add(this) if (this is IProjectContributor) projectContributors.add(this)
if (this is IRepoContributor) repoContributors.add(this) if (this is IRepoContributor) repoContributors.add(this)
@ -222,7 +222,7 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
} }
fun cleanUp() { fun cleanUp() {
listOf(projectContributors, classpathContributors, initContributors, listOf(projectContributors, classpathContributors, templateContributors,
repoContributors, compilerFlagContributors, compilerInterceptors, repoContributors, compilerFlagContributors, compilerInterceptors,
sourceDirectoriesInterceptors, buildDirectoryInterceptors, sourceDirectoriesInterceptors, buildDirectoryInterceptors,
runnerContributors, testRunnerContributors, classpathInterceptors, runnerContributors, testRunnerContributors, classpathInterceptors,
@ -246,7 +246,7 @@ class PluginInfo(val xml: KobaltPluginXml, val pluginClassLoader: ClassLoader?,
plugins.addAll(pluginInfo.plugins) plugins.addAll(pluginInfo.plugins)
classpathContributors.addAll(pluginInfo.classpathContributors) classpathContributors.addAll(pluginInfo.classpathContributors)
projectContributors.addAll(pluginInfo.projectContributors) projectContributors.addAll(pluginInfo.projectContributors)
initContributors.addAll(pluginInfo.initContributors) templateContributors.addAll(pluginInfo.templateContributors)
repoContributors.addAll(pluginInfo.repoContributors) repoContributors.addAll(pluginInfo.repoContributors)
compilerFlagContributors.addAll(pluginInfo.compilerFlagContributors) compilerFlagContributors.addAll(pluginInfo.compilerFlagContributors)
compilerInterceptors.addAll(pluginInfo.compilerInterceptors) compilerInterceptors.addAll(pluginInfo.compilerInterceptors)

2
src/main/kotlin/com/beust/kobalt/app/ProjectGenerator.kt
View file

@ -17,7 +17,7 @@ class ProjectGenerator @Inject constructor(val pluginInfo: PluginInfo){
fun run(args: Args, classLoader: ClassLoader) { fun run(args: Args, classLoader: ClassLoader) {
File(args.buildFile).parentFile.mkdirs() File(args.buildFile).parentFile.mkdirs()
val map = hashMapOf<String, ITemplate>() val map = hashMapOf<String, ITemplate>()
pluginInfo.initContributors.forEach { pluginInfo.templateContributors.forEach {
it.templates.forEach { it.templates.forEach {
map.put(it.templateName, it) map.put(it.templateName, it)
} }

2
src/main/kotlin/com/beust/kobalt/app/Templates.kt
View file

@ -14,7 +14,7 @@ class Templates : ITemplateContributor {
fun getTemplates(pluginInfo: PluginInfo): ListMultimap<String, ITemplate> { fun getTemplates(pluginInfo: PluginInfo): ListMultimap<String, ITemplate> {
val map = ArrayListMultimap.create<String, ITemplate>() val map = ArrayListMultimap.create<String, ITemplate>()
pluginInfo.initContributors.forEach { pluginInfo.templateContributors.forEach {
it.templates.forEach { it.templates.forEach {
map.put(it.pluginName, it) map.put(it.pluginName, it)
} }