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

replace 'trait' keyword with 'interface' in user-visible messages and code generation tools

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-05-11 19:37:38 +02:00
parent 25959fefdc
commit 9975bb8935
704 changed files with 1684 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public trait LoadIterable</*0*/ T> {
public interface LoadIterable</*0*/ T> {
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public trait LoadIterableWithConflict</*0*/ T> {
public interface LoadIterableWithConflict</*0*/ T> {
org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public trait LoadIterableWithNullability</*0*/ T> {
public interface LoadIterableWithNullability</*0*/ T> {
org.jetbrains.annotations.NotNull() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
org.jetbrains.annotations.NotNull() org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() org.jetbrains.annotations.NotNull() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
+2 -2
View File
@@ -1,8 +1,8 @@
package test
public trait LoadIterableWithPropagation {
public interface LoadIterableWithPropagation {
public trait LoadIterable</*0*/ T> {
public interface LoadIterable</*0*/ T> {
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit