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

Don't load Object as a supertype for Java classes

Browse Source 
#KT-4890 In Progress
 #KT-5002 Fixed
This commit is contained in:
Alexander Udalov
2014-07-21 17:28:06 +04:00
parent bea740b478
commit a79398fa00
34 changed files with 95 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritAmbguousSamAdaptersInKotlin.txt
+1 -1
View File
@@ -8,7 +8,7 @@ public final class Sub : test.Super {
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
}
public open class Super : java.lang.Object {
public open class Super {
public constructor Super()
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt
+1 -1
View File
@@ -6,7 +6,7 @@ public final class Sub : test.Super {
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
}
public open class Super : java.lang.Object {
public open class Super {
public constructor Super()
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt
+1 -1
View File
@@ -6,7 +6,7 @@ public final class Sub : test.Super {
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
}
public open class Super : java.lang.Object {
public open class Super {
public constructor Super()
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public open class Base : java.lang.Object {
public open class Base {
public constructor Base()
public/*package*/ open fun foo(): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public open class Base : java.lang.Object {
public open class Base {
public constructor Base()
protected/*protected and package*/ open fun foo(): kotlin.Unit
}