Add toString() to Any, fix all tests

#KT-4517 Fixed
This commit is contained in:
Alexander Udalov
2014-02-06 23:43:12 +04:00
parent 6127d53eac
commit 3dcd85bdb4
55 changed files with 110 additions and 72 deletions
@@ -62,7 +62,7 @@ abstract class Tag(val name : String) : Element() {
}
fun toString(): String {
override fun toString(): String {
val builder = StringBuilder()
appendTo(builder)
return builder.toString()!!
@@ -6,7 +6,7 @@ import java.util.ArrayList
public class ChangeEvent(val source: Any, val name: String, val oldValue: Any?, val newValue: Any?) {
var propogationId: Any? = null
public fun toString() : String = "ChangeEvent($name, $oldValue, $newValue)"
override fun toString(): String = "ChangeEvent($name, $oldValue, $newValue)"
}
public trait ChangeListener {
@@ -15,7 +15,7 @@ class StringTemplate(val values : Array<Any?>) {
/**
* Converts the template into a String
*/
public fun toString() : String {
override fun toString() : String {
val out = StringBuilder()
forEach{ out.append(it) }
return out.toString()
@@ -93,7 +93,7 @@ public open class ToStringFormatter : Formatter {
var nullString : String = "null"
public open fun toString() : String = "ToStringFormatter"
override fun toString() : String = "ToStringFormatter"
public override fun format(out : Appendable, value : Any?) {
if (value == null) {
@@ -121,7 +121,7 @@ public val defaultLocale : Locale = Locale.getDefault()
*/
public open class LocaleFormatter(val locale : Locale = defaultLocale) : ToStringFormatter() {
public override fun toString() : String = "LocaleFormatter{$locale}"
override fun toString() : String = "LocaleFormatter{$locale}"
public var numberFormat : NumberFormat = NumberFormat.getInstance(locale)!!
@@ -151,7 +151,7 @@ public open class LocaleFormatter(val locale : Locale = defaultLocale) : ToStrin
*/
public class HtmlFormatter(locale : Locale = defaultLocale) : LocaleFormatter(locale) {
public override fun toString() : String = "HtmlFormatter{$locale}"
override fun toString() : String = "HtmlFormatter{$locale}"
public override fun format(out : Appendable, value : Any?) {
if (value is Node) {
+1 -1
View File
@@ -5,7 +5,7 @@ import kotlin.test.*
import org.junit.Test
class Item(val name: String, val rating: Int): Comparable<Item> {
fun toString() = "Item($name, $rating)"
override fun toString() = "Item($name, $rating)"
public override fun compareTo(other: Item): Int {
return compareBy(this, other, { rating }, { name })
+1 -1
View File
@@ -6,7 +6,7 @@ import org.junit.Test as test
class ListTest {
test fun toString() {
test fun _toString() {
val data = arrayList("foo", "bar")
assertEquals("[foo, bar]", data.toString())
}
@@ -22,7 +22,7 @@ class Customer() : ChangeSupport() {
$city = value
}
fun toString() = "Customer($name, $city)"
override fun toString() = "Customer($name, $city)"
}
class MyChangeListener() : ChangeListener {
+1 -1
View File
@@ -33,7 +33,7 @@ class Failure(val message : String) : ParseResult<Nothing> {
}
open class Token(val text : String) {
fun toString() = text
override fun toString() = text
}
object LPAR : Token("(")
object RPAR : Token(")")
@@ -934,7 +934,7 @@ abstract class KNamed(val name: String, model: KModel, declarationDescriptor: De
open fun equals(other: KPackage) = name == other.name
open fun toString() = name
override fun toString() = name
}
@@ -957,7 +957,7 @@ class KPackage(model: KModel, val descriptor: PackageFragmentDescriptor,
fun equals(other: KPackage) = name == other.name
fun toString() = "KPackage($name)"
override fun toString() = "KPackage($name)"
fun getClass(descriptor: ClassDescriptor): KClass {
val name = descriptor.getName().asString()
@@ -1089,7 +1089,7 @@ class KClass(
fun equals(other: KClass) = name == other.name
fun toString() = "$kind($name)"
override fun toString() = "$kind($name)"
fun isApi(): Boolean {
val visibility = descriptor.getVisibility()
@@ -1185,7 +1185,7 @@ class KFunction(val descriptor: CallableDescriptor, val owner: KClassOrPackage,
fun equals(other: KFunction) = name == other.name && this.parameterTypeText == other.parameterTypeText &&
this.extensionClass == other.extensionClass && this.owner == other.owner
fun toString() = "fun $name($parameterTypeText): $returnType"
override fun toString() = "fun $name($parameterTypeText): $returnType"
public val link: String = "$name($parameterTypeText)"
@@ -1212,13 +1212,13 @@ class KProperty(val owner: KClassOrPackage, val descriptor: PropertyDescriptor,
return visibility.isPublicAPI()
}
fun toString() = "property $name"
override fun toString() = "property $name"
}
class KParameter(val descriptor: ValueParameterDescriptor, val name: String,
var aType: KType): KAnnotated(aType.model, aType.declarationDescriptor) {
fun toString() = "$name: ${aType.name}"
override fun toString() = "$name: ${aType.name}"
fun isVarArg(): Boolean = descriptor.getVarargElementType() != null
@@ -1237,12 +1237,12 @@ class KTypeParameter(val name: String,
model: KModel,
var extends: List<KClass> = arrayList<KClass>()): KAnnotated(model, descriptor) {
fun toString() = "$name"
override fun toString() = "$name"
}
class KAnnotation(var klass: KClass): KAnnotated(klass.model, klass.descriptor) {
// TODO add some parameter values?
fun toString() = "@$klass.simpleName"
override fun toString() = "@$klass.simpleName"
}
@@ -6,7 +6,7 @@ import org.jetbrains.kotlin.doc.model.*
class SearchXmlTemplate(val model: KModel): KDocTemplate() {
class Search(val name: String, val href: String, val kind: String) {
fun toString() = "Search($name, $href, $kind)"
override fun toString() = "Search($name, $href, $kind)"
}
override fun render() {
@@ -2,7 +2,7 @@ package sample
/** A Comment */
public class Person(val name: String, val city: String) {
fun toString(): String = "Person($name, $city)"
override fun toString(): String = "Person($name, $city)"
public fun hello(): String = "Hello $name"
}