From 26d8da1114b8e31373aa81d2ceccd3b4e8a4a392 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 29 Oct 2015 03:39:11 -0700 Subject: [PATCH] Better toString(). --- src/main/kotlin/com/beust/kobalt/api/PluginTask.kt | 4 ++-- src/main/kotlin/com/beust/kobalt/api/Task.kt | 4 ++-- .../com/beust/kobalt/internal/DynamicGraph.kt | 4 +++- src/main/kotlin/com/beust/kobalt/maven/Pom.kt | 5 +++-- src/main/kotlin/com/beust/kobalt/misc/ToString.kt | 13 +++++-------- .../com/beust/kobalt/plugin/java/JavaProject.kt | 6 ++---- .../com/beust/kobalt/plugin/kotlin/KotlinProject.kt | 7 ++----- .../kobalt/plugin/packaging/PackagingPlugin.kt | 3 +-- 8 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/api/PluginTask.kt b/src/main/kotlin/com/beust/kobalt/api/PluginTask.kt index 89fb6dc6..592a18f7 100644 --- a/src/main/kotlin/com/beust/kobalt/api/PluginTask.kt +++ b/src/main/kotlin/com/beust/kobalt/api/PluginTask.kt @@ -1,7 +1,7 @@ package com.beust.kobalt.api import com.beust.kobalt.internal.TaskResult2 -import com.beust.kobalt.misc.ToString +import com.beust.kobalt.misc.toString import java.util.concurrent.Callable abstract public class PluginTask : Callable> { @@ -11,6 +11,6 @@ abstract public class PluginTask : Callable> { abstract val project: Project override public fun toString() : String { - return ToString("PluginTask", "id", project.name + ":" + name).s + return toString("PluginTask", "id", project.name + ":" + name) } } diff --git a/src/main/kotlin/com/beust/kobalt/api/Task.kt b/src/main/kotlin/com/beust/kobalt/api/Task.kt index 696596a6..c1586211 100644 --- a/src/main/kotlin/com/beust/kobalt/api/Task.kt +++ b/src/main/kotlin/com/beust/kobalt/api/Task.kt @@ -1,9 +1,9 @@ package com.beust.kobalt.api -import com.beust.kobalt.misc.ToString +import com.beust.kobalt.misc.toString data public class Task(val pluginName: String, val taskName: String) { override public fun toString() : String { - return ToString("Task", pluginName, taskName).s + return toString("Task", pluginName, taskName) } } \ No newline at end of file diff --git a/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt b/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt index 4a2a4435..7875ffc4 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt @@ -1,11 +1,13 @@ package com.beust.kobalt.internal +import com.beust.kobalt.misc.NamedThreadFactory +import com.beust.kobalt.misc.log import com.beust.kobalt.misc.* import com.google.common.collect.HashMultimap import java.util.concurrent.* open class TaskResult2(success: Boolean, val value: T) : TaskResult(success) { - override fun toString() = ToString("TaskResult", "success", success, "value", value).s + override fun toString() = toString("TaskResult", "success", success, "value", value) } public interface IWorker : Callable> { diff --git a/src/main/kotlin/com/beust/kobalt/maven/Pom.kt b/src/main/kotlin/com/beust/kobalt/maven/Pom.kt index 2654c55c..06c56858 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/Pom.kt +++ b/src/main/kotlin/com/beust/kobalt/maven/Pom.kt @@ -1,8 +1,9 @@ package com.beust.kobalt.maven -import com.beust.kobalt.misc.ToString +import com.beust.kobalt.misc.toString import com.beust.kobalt.misc.log import com.google.inject.assistedinject.Assisted +import org.jetbrains.kotlin.codegen.intrinsics.ToString import org.w3c.dom.Element import org.w3c.dom.NodeList import org.xml.sax.InputSource @@ -103,5 +104,5 @@ public class Pom @javax.inject.Inject constructor(@Assisted val id: String, } } - override public fun toString() = ToString("Pom", id, "id").s + override public fun toString() = toString("Pom", id, "id") } diff --git a/src/main/kotlin/com/beust/kobalt/misc/ToString.kt b/src/main/kotlin/com/beust/kobalt/misc/ToString.kt index f581922c..8e39bb2c 100644 --- a/src/main/kotlin/com/beust/kobalt/misc/ToString.kt +++ b/src/main/kotlin/com/beust/kobalt/misc/ToString.kt @@ -1,14 +1,11 @@ package com.beust.kobalt.misc -public class ToString(val name: String, vararg o: T) { +fun toString(name: String, vararg o: T) : String { val sb = StringBuffer() - init { - for (i in 0..o.size - 1 step 2) { - if (i > 0) sb.append(", ") - sb.append(o.get(i).toString() + ":" + o.get(i + 1)) - } + for (i in 0..o.size - 1 step 2) { + if (i > 0) sb.append(", ") + sb.append(o.get(i).toString() + ":" + o.get(i + 1)) } - - val s : String get() = "{${name} ${sb}}" + return "{$name $sb}" } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProject.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProject.kt index 2427ae19..6f1c1df2 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProject.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProject.kt @@ -3,9 +3,7 @@ package com.beust.kobalt.plugin.java import com.beust.kobalt.api.Dependencies import com.beust.kobalt.api.Project import com.beust.kobalt.api.annotation.Directive -import com.beust.kobalt.misc.KFiles -import com.beust.kobalt.misc.ToString -import java.io.File +import com.beust.kobalt.misc.toString public class JavaProject( @Directive @@ -29,6 +27,6 @@ public class JavaProject( : Project(name, version, directory, buildDirectory, group, artifactId, packaging, dependencies, ".java", JavaCompilerInfo()) { - override public fun toString() = ToString("JavaProject", "name", name!!).s + override public fun toString() = toString("JavaProject", "name", name!!) } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProject.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProject.kt index 5bf9cbb3..1bdaf15a 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProject.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProject.kt @@ -1,12 +1,9 @@ package com.beust.kobalt.plugin.kotlin import com.beust.kobalt.api.Dependencies -import com.beust.kobalt.api.ICompilerInfo import com.beust.kobalt.api.Project import com.beust.kobalt.api.annotation.Directive -import com.beust.kobalt.misc.KFiles -import com.beust.kobalt.misc.ToString -import java.io.File +import com.beust.kobalt.misc.toString public class KotlinProject( @Directive @@ -30,5 +27,5 @@ public class KotlinProject( : Project(name, version, directory, buildDirectory, group, artifactId, packaging, dependencies, ".kt", KotlinCompilerInfo()) { - override public fun toString() = ToString("KotlinProject", "name", name!!).s + override public fun toString() = toString("KotlinProject", "name", name!!) } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt index 636a2654..b6838ae2 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt @@ -358,11 +358,10 @@ class IncludedFile(val fromOriginal: From, val toOriginal: To, val specs: List) : this(From(""), To(""), specs) public val from: String get() = fromOriginal.path.replace("\\", "/") public val to: String get() = toOriginal.path.replace("\\", "/") - override public fun toString() = ToString("IncludedFile", + override public fun toString() = toString("IncludedFile", "files", specs.map { it.toString() }.joinToString(", "), "from", from, "to", to) - .s } interface AttributeHolder {