azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

default -> companion: replace all mentions of default and default object

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-03-16 14:56:06 +03:00
parent a0783757e8
commit 06916d98c6
1019 changed files with 2468 additions and 2469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/testData/KotlinApi.kt
+1 -1
View File
@@ -6,7 +6,7 @@ public open class KotlinClass(public var field: Int) {
public open fun foo(mutableCollection: MutableCollection<String>, nullableCollection: Collection<Int>?): MutableList<Any> = arrayListOf()
default object {
companion object {
public fun staticFun(p: Int): Int = p
public var staticVar: Int = 1
public var staticProperty: Int
j2k/testData/fileOrElement/annotations/annotationInterface3.kt
+2 -2
View File
@@ -6,7 +6,7 @@ annotation class Anon(public val value: String) {
B
}
default object {
companion object {
public val field: E = E.A
}
@@ -14,7 +14,7 @@ annotation class Anon(public val value: String) {
Anon("a")
trait I {
default object {
companion object {
public val e: Anon.E = Anon.field
}
}
j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
var str: String
{
str = "Ola"
j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// ERROR: Property must be initialized or be abstract
class Library {
default object {
companion object {
val ourOut: java.io.PrintStream
}
}
j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Library {
default object {
companion object {
fun call() {
}
j2k/testData/fileOrElement/class/ClassShadowing.kt
+2 -2
View File
@@ -1,7 +1,7 @@
package test
public class Short {
default object {
companion object {
public fun valueOf(value: String): Short {
return Short()
}
@@ -9,7 +9,7 @@ public class Short {
}
class Test {
default object {
companion object {
public fun test() {
test.Short.valueOf("1")
test.Short.valueOf("1")
j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt
+1 -1
View File
@@ -3,7 +3,7 @@ class S {
return true
}
default object {
companion object {
var myI = 10
}
}
j2k/testData/fileOrElement/class/oneStaticMethod.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class S {
default object {
companion object {
fun staticF(): Boolean {
return true
}
j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt
+1 -1
View File
@@ -3,7 +3,7 @@ class S {
return true
}
default object {
companion object {
fun sI(): Int {
return 1
}
j2k/testData/fileOrElement/class/twoStaticMethod.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class S {
default object {
companion object {
fun sB(): Boolean {
return true
}
j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt
+1 -1
View File
@@ -1,5 +1,5 @@
public class A {
default object {
companion object {
public fun main(args: Array<String>) {
System.out.println(Void.TYPE)
System.out.println(Integer.TYPE)
j2k/testData/fileOrElement/comments/comments2.kt
+1 -1
View File
@@ -21,7 +21,7 @@ class A {
protected /*it's protected*/ fun foo(c: Char) {
}
default object {
companion object {
public /*it's public*//*and static*//*and final*/ val C: Int = 1
}
j2k/testData/fileOrElement/constructors/allCallsPrimary.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package pack
class C(arg1: Int, arg2: Int = 0, arg3: Int = 0)
public class User {
default object {
companion object {
public fun main() {
val c1 = C(100, 100, 100)
val c2 = C(100, 100)
j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt
+1 -1
View File
@@ -19,7 +19,7 @@ class C(val myArg1: Int) {
}
public class User {
default object {
companion object {
public fun main() {
val c1 = C(100, 100, 100)
val c2 = C(100, 100)
j2k/testData/fileOrElement/constructors/chain.kt
+1 -1
View File
@@ -10,7 +10,7 @@ class C(arg1: Int, arg2: Int, arg3: Int) {
}
public class User {
default object {
companion object {
public fun main() {
val c1 = C(1, 2, 3)
val c2 = C(5, 6)
j2k/testData/fileOrElement/constructors/customerBuilder.kt
+1 -1
View File
@@ -34,7 +34,7 @@ class CustomerBuilder {
}
public class User {
default object {
companion object {
public fun main() {
val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build()
System.out.println(customer.firstName)
j2k/testData/fileOrElement/constructors/genericIdentifier.kt
+1 -1
View File
@@ -21,7 +21,7 @@ public class Identifier<T> {
}
public class User {
default object {
companion object {
public fun main() {
val i1 = Identifier("name", false, true)
val i2 = Identifier("name", false)
j2k/testData/fileOrElement/constructors/identifier.kt
+1 -1
View File
@@ -21,7 +21,7 @@ public class Identifier {
}
public class User {
default object {
companion object {
public fun main() {
val i1 = Identifier("name", false, true)
val i2 = Identifier("name", false)
j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt
+1 -1
View File
@@ -8,7 +8,7 @@ class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) {
System.out.println(foo(1) + this.foo(2) + other.foo(3) + staticFoo(4) + C.staticFoo(5))
}
default object {
companion object {
private fun staticFoo(p: Int): Int {
return p
}
j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt
+1 -1
View File
@@ -1,7 +1,7 @@
class A(nested: A.Nested = A.Nested(A.Nested.FIELD)) {
class Nested(p: Int) {
default object {
companion object {
public val FIELD: Int = 0
}
j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt
+1 -1
View File
@@ -4,7 +4,7 @@ import A.Nested
class A(nested: Nested = Nested(Nested.FIELD)) {
class Nested(p: Int) {
default object {
companion object {
public val FIELD: Int = 0
}
j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt
+1 -1
View File
@@ -6,7 +6,7 @@ import pack.A.Nested
class A(nested: Nested = Nested(Nested.FIELD)) {
class Nested(p: Int) {
default object {
companion object {
public val FIELD: Int = 0
}
j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt
+1 -1
View File
@@ -6,7 +6,7 @@ import pack.A.*
class A(nested: Nested = Nested(Nested.FIELD)) {
class Nested(p: Int) {
default object {
companion object {
public val FIELD: Int = 0
}
j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt
+1 -1
View File
@@ -1,7 +1,7 @@
open class Base(nested: Base.Nested) {
class Nested(p: Int) {
default object {
companion object {
public val FIELD: Int = 0
}
j2k/testData/fileOrElement/constructors/noPrimary.kt
+1 -1
View File
@@ -12,7 +12,7 @@ class C {
}
public class User {
default object {
companion object {
public fun main() {
val c1 = C(1, 2, 3)
val c2 = C(5, 6)
j2k/testData/fileOrElement/constructors/parameterModification.kt
+1 -1
View File
@@ -18,7 +18,7 @@ class C(arg1: Int, arg2: Int = 0, arg3: Int = 0) {
}
public class User {
default object {
companion object {
public fun main() {
val c1 = C(100, 100, 100)
val c2 = C(100, 100)
j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt
+1 -1
View File
@@ -48,7 +48,7 @@ class Outer {
}
}
default object {
companion object {
fun foo() {
val nested1 = Nested1(1)
j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class C() {
System.out.println(staticField1 + C.staticField2)
}
default object {
companion object {
private val staticField1 = 0
private val staticField2 = 0
}
j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt
+2 -2
View File
@@ -16,7 +16,7 @@ public class Test {
myName = foo(name)
}
default object {
companion object {
fun foo(n: String): String {
return ""
@@ -25,7 +25,7 @@ public class Test {
}
public class User {
default object {
companion object {
public fun main() {
val t = Test("name")
}
j2k/testData/fileOrElement/field/conversion.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class A {
i = 10
}
default object {
companion object {
fun getByte(): Byte {
return 0
j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt
+1 -1
View File
@@ -17,7 +17,7 @@ class F {
fun f4() {
}
default object {
companion object {
//c1
j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class F {
default object {
companion object {
//c1
j2k/testData/fileOrElement/function/main.kt
+1 -1
View File
@@ -1,4 +1,4 @@
default object {
companion object {
public fun main(args: Array<String>) {
}
}
j2k/testData/fileOrElement/function/main2.kt
+1 -1
View File
@@ -1,5 +1,5 @@
public class A {
default object {
companion object {
public fun main(args: Array<String>) {
}
}
j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// !forceNotNullTypes: false
public class A {
default object {
companion object {
public fun main(args: Array<String>) {
}
}
j2k/testData/fileOrElement/issues/arrayLength.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
public fun foo(args: Array<String>): Int {
return args.size()
}
j2k/testData/fileOrElement/issues/doNotQualifyStatic.kt
+1 -1
View File
@@ -6,7 +6,7 @@ class Outer {
}
}
default object {
companion object {
public var o: Any? = Object()
}
}
j2k/testData/fileOrElement/issues/kt-1074.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package demo
class Test {
default object {
companion object {
fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) {
if (fromIndex < 0)
throw IndexOutOfBoundsException("fromIndex = " + fromIndex)
j2k/testData/fileOrElement/issues/kt-638.kt
+1 -1
View File
@@ -21,7 +21,7 @@ public class Identifier<T> {
}
public class User {
default object {
companion object {
public fun main(args: Array<String>) {
val i1 = Identifier("name", false, true)
val i2 = Identifier("name", false)
j2k/testData/fileOrElement/issues/kt-807.kt
+1 -1
View File
@@ -5,7 +5,7 @@
import java.io.*
class FileRead {
default object {
companion object {
public fun main(args: Array<String>) {
try {
val fstream = FileInputStream()
j2k/testData/fileOrElement/issues/kt-809-string.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class Container {
}
class One {
default object {
companion object {
var myContainer = Container()
}
}
j2k/testData/fileOrElement/issues/kt-809.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class Container {
}
class One {
default object {
companion object {
var myContainer = Container()
}
}
j2k/testData/fileOrElement/issues/kt-820-field.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class Container {
}
class One {
default object {
companion object {
var myContainer = Container()
}
}
j2k/testData/fileOrElement/issues/kt-820-string.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
public fun toFileSystemSafeName(name: String): String {
val size = name.length()
return name
j2k/testData/fileOrElement/issues/kt-820.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class Container {
}
class One {
default object {
companion object {
var myContainer = Container()
}
}
j2k/testData/fileOrElement/issues/kt-824-isDir.kt
+1 -1
View File
@@ -6,7 +6,7 @@ import java.io.File
* User: ignatov
*/
public class Test {
default object {
companion object {
public fun isDir(parent: File?): Boolean {
if (parent == null || !parent.exists()) {
return false
j2k/testData/fileOrElement/issues/kt-824.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class Container {
}
class One {
default object {
companion object {
var myContainer = Container()
}
}
j2k/testData/fileOrElement/issues/kt-837.kt
+1 -1
View File
@@ -8,7 +8,7 @@ public class Language(protected var code: String) : Serializable {
return other.toString() == this.toString()
}
default object {
companion object {
public var ENGLISH: Language = Language("en")
public var SWEDISH: Language = Language("sv")
private val serialVersionUID = -2442762969929206780
j2k/testData/fileOrElement/issues/kt-871.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package demo
class Program {
default object {
companion object {
public fun main(args: Array<String>) {
System.out.println("Halo!")
}
j2k/testData/fileOrElement/issues/kt-879.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class Test {
default object {
companion object {
public fun getInt(i: Int): Int {
when (i) {
0 -> return 0
j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java
+2 -2
View File
@@ -4,7 +4,7 @@ import kotlinApi.KotlinClass;
class C {
int foo() {
KotlinClass.staticVar = KotlinClass.staticVar * 2;
KotlinClass.Default.setStaticProperty(KotlinClass.Default.getStaticVar() + KotlinClass.Default.getStaticProperty());
return KotlinClass.Default.staticFun(1);
KotlinClass.Companion.setStaticProperty(KotlinClass.Companion.getStaticVar() + KotlinClass.Companion.getStaticProperty());
return KotlinClass.Companion.staticFun(1);
}
}
j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java
+4 -4
View File
@@ -5,10 +5,10 @@ class A {
int foo(KotlinClass c) {
return c.getNullableProperty().length()
+ c.getProperty().length()
+ KotlinClass.Default.getNullableStaticVar()
+ KotlinClass.Default.getStaticVar()
+ KotlinClass.Default.nullableStaticFun(1)
+ KotlinClass.Default.staticFun(1)
+ KotlinClass.Companion.getNullableStaticVar()
+ KotlinClass.Companion.getStaticVar()
+ KotlinClass.Companion.nullableStaticFun(1)
+ KotlinClass.Companion.staticFun(1)
+ KotlinApiPackage.nullableGlobalFunction("").length()
+ KotlinApiPackage.globalFunction("").length();
}
j2k/testData/fileOrElement/methodCallExpression/vararg1.kt
+1 -1
View File
@@ -1,7 +1,7 @@
import java.lang.reflect.Constructor
class X {
default object {
companion object {
throws(javaClass<Exception>())
fun <T> foo(constructor: Constructor<T>, args1: Array<Any>, args2: Array<Any>) {
constructor.newInstance(*args1)
j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt
+1 -1
View File
@@ -2,7 +2,7 @@
class C {
private val string = getString()
default object {
companion object {
fun getString(): String? {
return x()
j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class A {
privateStatic2()
}
default object {
companion object {
private val s = "abc"
private fun privateStatic1() {
j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class A {
privateStatic2()
}
default object {
companion object {
public fun publicStatic() {
privateStatic1()
j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt
+1 -1
View File
@@ -9,7 +9,7 @@ class A {
privateStatic2()
}
default object {
companion object {
private fun privateStatic1() {
}
j2k/testData/fileOrElement/switch/comlicatedFallDown.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package demo
public class SwitchDemo {
default object {
companion object {
public fun print(o: Any) {
System.out.println(o)
}
j2k/testData/fileOrElement/switch/emptySwitch.kt
+1 -1
View File
@@ -1,5 +1,5 @@
public class NonDefault {
default object {
companion object {
public fun main(args: Array<String>) {
val value = 3
j2k/testData/fileOrElement/switch/fallDown.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package switch_demo
public class SwitchDemo {
default object {
companion object {
public fun main(args: Array<String>) {
val month = 8
val monthString: String
j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt
+1 -1
View File
@@ -1,5 +1,5 @@
public class C {
default object {
companion object {
public fun main(args: Array<String>) {
when (args.size()) {
1 -> {
j2k/testData/fileOrElement/switch/kt-539.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package switch_demo
public class SwitchDemo {
default object {
companion object {
public fun main(args: Array<String>) {
val month = 8
j2k/testData/fileOrElement/switch/nondefault.kt
+1 -1
View File
@@ -1,5 +1,5 @@
public class NonDefault {
default object {
companion object {
public fun main(args: Array<String>) {
val value = 3
j2k/testData/fileOrElement/trait/interfaceWithFields.kt
+1 -1
View File
@@ -1,5 +1,5 @@
trait INode {
default object {
companion object {
public val IN: String = "in"
public val AT: String = "@"
public val COMMA_WITH_SPACE: String = COMMA + SPACE
j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt
+1 -1
View File
@@ -1,5 +1,5 @@
public trait INode {
default object {
companion object {
public val IN: String = "in"
public val AT: String = "@"
public val COMMA_WITH_SPACE: String = COMMA + SPACE
j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt
+1 -1
View File
@@ -2,7 +2,7 @@
import java.util.*
class A {
default object {
companion object {
public fun foo(): Map<String, String> {
val props = Properties()
return HashMap(props as Map<Any, Any>)