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
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
+4 -4
View File
@@ -2,21 +2,21 @@ public final class ClassObjectField {
@org.jetbrains.annotations.Nullable
public static final java.lang.String x = "";
private static final java.lang.String y = "";
public static final ClassObjectField.Default Default;
public static final ClassObjectField.Companion Companion;
/**
* @deprecated
*/
@java.lang.Deprecated
public static final ClassObjectField.Default OBJECT$;
public static final ClassObjectField.Companion OBJECT$;
public ClassObjectField() { /* compiled code */ }
public static final class Default {
public static final class Companion {
@org.jetbrains.annotations.Nullable
public final java.lang.String getX() { /* compiled code */ }
private final java.lang.String getY() { /* compiled code */ }
private Default() { /* compiled code */ }
private Companion() { /* compiled code */ }
}
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// ClassObjectField
class ClassObjectField {
default object {
companion object {
val x: String? = ""
private val y: String? = ""
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java
+4 -4
View File
@@ -1,14 +1,14 @@
public interface TraitClassObjectField {
TraitClassObjectField.Default Default;
TraitClassObjectField.Companion Companion;
/**
* @deprecated
*/
@java.lang.Deprecated
TraitClassObjectField.Default OBJECT$;
TraitClassObjectField.Companion OBJECT$;
@org.jetbrains.annotations.Nullable
java.lang.String x = "";
static final class Default {
static final class Companion {
@org.jetbrains.annotations.Nullable
private final java.lang.String x = "";
private final java.lang.String y = "";
@@ -18,6 +18,6 @@ public interface TraitClassObjectField {
private final java.lang.String getY() { /* compiled code */ }
private Default() { /* compiled code */ }
private Companion() { /* compiled code */ }
}
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// TraitClassObjectField
trait TraitClassObjectField {
default object {
companion object {
val x: String? = ""
private val y: String? = ""
}