From 47805b9e9169305a00af74769c0332cf0790f4ed Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 1 Aug 2020 10:25:09 +0600 Subject: [PATCH] renames of markup creator --- ...ractMarkupCreator.kt => AbstractMarkupBuilderFactory.kt} | 4 ++-- .../core/{MarkupCreator.kt => MarkupBuilderFactory.kt} | 4 ++-- .../{HtmlMarkupCreator.kt => HtmlMarkupBuilderFactory.kt} | 6 +++--- .../{HtmlMarkupCreator.kt => HtmlMarkupBuilderFactory.kt} | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) rename postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/{AbstractMarkupCreator.kt => AbstractMarkupBuilderFactory.kt} (90%) rename postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/{MarkupCreator.kt => MarkupBuilderFactory.kt} (86%) rename postssystem.markups.html/src/jsMain/kotlin/com/insanusmokrassar/postssystem/markups/html/{HtmlMarkupCreator.kt => HtmlMarkupBuilderFactory.kt} (72%) rename postssystem.markups.html/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/markups/html/{HtmlMarkupCreator.kt => HtmlMarkupBuilderFactory.kt} (72%) diff --git a/postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/AbstractMarkupCreator.kt b/postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/AbstractMarkupBuilderFactory.kt similarity index 90% rename from postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/AbstractMarkupCreator.kt rename to postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/AbstractMarkupBuilderFactory.kt index e6d29301..6fbed2b2 100644 --- a/postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/AbstractMarkupCreator.kt +++ b/postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/AbstractMarkupBuilderFactory.kt @@ -6,12 +6,12 @@ import com.insanusmokrassar.postssystem.core.post.PostId import com.insanusmokrassar.postssystem.core.post.RegisteredPost import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo -abstract class AbstractMarkupCreator( +abstract class AbstractMarkupBuilderFactory( @Suppress("MemberVisibilityCanBePrivate") protected val postsRepo: ReadPostsRepo, @Suppress("MemberVisibilityCanBePrivate") protected val postsContentRepo: ReadContentRepo -) : MarkupCreator { +) : MarkupBuilderFactory { override suspend fun drawOn(target: MarkupTarget, forPost: PostId) { val post = postsRepo.getPostById(forPost) ?: return val contents = post.content.mapNotNull { diff --git a/postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/MarkupCreator.kt b/postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/MarkupBuilderFactory.kt similarity index 86% rename from postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/MarkupCreator.kt rename to postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/MarkupBuilderFactory.kt index 2535ea0d..4034b9f1 100644 --- a/postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/MarkupCreator.kt +++ b/postssystem.markups.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/markups/core/MarkupBuilderFactory.kt @@ -12,10 +12,10 @@ import com.insanusmokrassar.postssystem.core.post.PostId * * Web * * etc. * - * [MarkupTarget] here is just a platform, which can be used by [MarkupCreator] to create markup inside. + * [MarkupTarget] here is just a platform, which can be used by [MarkupBuilderFactory] to create markup inside. * * For example, it could be some creator like "TelegramForHTMLMarkupBuilder" */ -interface MarkupCreator { +interface MarkupBuilderFactory { suspend fun drawOn(target: MarkupTarget, forPost: PostId) } diff --git a/postssystem.markups.html/src/jsMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupCreator.kt b/postssystem.markups.html/src/jsMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupBuilderFactory.kt similarity index 72% rename from postssystem.markups.html/src/jsMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupCreator.kt rename to postssystem.markups.html/src/jsMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupBuilderFactory.kt index 57a7bac7..9f591ded 100644 --- a/postssystem.markups.html/src/jsMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupCreator.kt +++ b/postssystem.markups.html/src/jsMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupBuilderFactory.kt @@ -2,10 +2,10 @@ package com.insanusmokrassar.postssystem.markups.html import com.insanusmokrassar.postssystem.core.content.api.ReadContentRepo import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo -import com.insanusmokrassar.postssystem.markups.core.AbstractMarkupCreator +import com.insanusmokrassar.postssystem.markups.core.AbstractMarkupBuilderFactory import kotlinx.html.FlowContent -abstract class HtmlMarkupCreator( +abstract class HtmlMarkupBuilderFactory( postsRepo: ReadPostsRepo, postsContentRepo: ReadContentRepo -) : AbstractMarkupCreator(postsRepo, postsContentRepo) +) : AbstractMarkupBuilderFactory(postsRepo, postsContentRepo) diff --git a/postssystem.markups.html/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupCreator.kt b/postssystem.markups.html/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupBuilderFactory.kt similarity index 72% rename from postssystem.markups.html/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupCreator.kt rename to postssystem.markups.html/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupBuilderFactory.kt index 57a7bac7..9f591ded 100644 --- a/postssystem.markups.html/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupCreator.kt +++ b/postssystem.markups.html/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/markups/html/HtmlMarkupBuilderFactory.kt @@ -2,10 +2,10 @@ package com.insanusmokrassar.postssystem.markups.html import com.insanusmokrassar.postssystem.core.content.api.ReadContentRepo import com.insanusmokrassar.postssystem.core.post.repo.ReadPostsRepo -import com.insanusmokrassar.postssystem.markups.core.AbstractMarkupCreator +import com.insanusmokrassar.postssystem.markups.core.AbstractMarkupBuilderFactory import kotlinx.html.FlowContent -abstract class HtmlMarkupCreator( +abstract class HtmlMarkupBuilderFactory( postsRepo: ReadPostsRepo, postsContentRepo: ReadContentRepo -) : AbstractMarkupCreator(postsRepo, postsContentRepo) +) : AbstractMarkupBuilderFactory(postsRepo, postsContentRepo)