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

2015-03-16 14:56:06 +03:00
parent a0783757e8
commit 06916d98c6
1019 changed files with 2468 additions and 2469 deletions
@@ -3,6 +3,6 @@ class JavaUsage {
        System.out.println(Foo.CONST);
        Foo.s();
        Foo.Baz.f();
-        Foo foo = new Foo(); // not usage of default object
+        Foo foo = new Foo(); // not usage of companion object
    }
 }
@@ -1,5 +1,5 @@
 class Foo {
-    default object Baz {
+    companion object Baz {
        fun f() {
        }

@@ -2,7 +2,7 @@ class JavaUsage {
    public static void main(String[] args) {
        System.out.println(Foo.CONST);
        Foo.s();
-        Foo.Default.f();
-        Foo foo = new Foo(); // not usage of default object
+        Foo.Companion.f();
+        Foo foo = new Foo(); // not usage of companion object
    }
 }
@@ -1,5 +1,5 @@
 class Foo {
-    default object {
+    companion object {
        fun f() {
        }

@@ -3,6 +3,6 @@ fun main(args: Array<String>) {
    Foo.f()
    val x = Foo

-    Foo.Default.f()
-    val xx = Foo.Default
+    Foo.Companion.f()
+    val xx = Foo.Companion
 }
@@ -1,7 +1,7 @@
 {
  "type": "KOTLIN_CLASS",
-  "classId": "/Foo.Default",
-  "oldName": "Default",
+  "classId": "/Foo.Companion",
+  "oldName": "Companion",
  "newName": "Baz",
  "mainFile": "toBeRenamed.kt"
 }