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

Deprecate throws annotation in favor of Throws

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-01 17:34:20 +03:00
parent 9254b1b461
commit 2b76941733
21 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+1 -1
View File
@@ -524,7 +524,7 @@ public class FunctionCodegen {
@NotNull
public static String[] getThrownExceptions(@NotNull FunctionDescriptor function, @NotNull final JetTypeMapper mapper) {
AnnotationDescriptor annotation = function.getAnnotations().findAnnotation(new FqName("kotlin.throws"));
AnnotationDescriptor annotation = function.getAnnotations().findAnnotation(new FqName("kotlin.Throws"));
if (annotation == null) return ArrayUtil.EMPTY_STRING_ARRAY;
Collection<ConstantValue<?>> values = annotation.getAllValueArguments().values();
compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt
Vendored
+3 -3
View File
@@ -4,12 +4,12 @@ class E1: Exception()
class E2: Exception()
class Test {
throws()
@Throws()
fun none() {}
throws(E1::class)
@Throws(E1::class)
fun one() {}
throws(E1::class, E2::class)
@Throws(E1::class, E2::class)
fun two() {}
}
compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt
Vendored
+4 -4
View File
@@ -3,8 +3,8 @@ package test
class E1: Exception()
class E2: Exception()
class None @throws() constructor() {}
class One @throws(E1::class) constructor()
class Two @throws(E1::class, E2::class) constructor()
class None @Throws() constructor() {}
class One @Throws(E1::class) constructor()
class Two @Throws(E1::class, E2::class) constructor()
class OneWithParam @throws(E1::class) constructor(a: Int)
class OneWithParam @Throws(E1::class) constructor(a: Int)
compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt
Vendored
+3 -3
View File
@@ -2,10 +2,10 @@ package test
class E1: Exception()
throws(E1::class) jvmOverloads
Throws(E1::class) jvmOverloads
fun one(a: Int = 1) {}
class One @throws(E1::class) constructor(a: Int = 1) {
throws(E1::class)
class One @Throws(E1::class) constructor(a: Int = 1) {
@Throws(E1::class)
fun one(a: Int = 1) {}
}
compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt
Vendored
+3 -3
View File
@@ -4,13 +4,13 @@ class E1: Exception()
class E2: Exception()
interface Trait {
throws()
@Throws()
fun none()
throws(E1::class)
@Throws(E1::class)
fun one()
throws(E1::class, E2::class)
@Throws(E1::class, E2::class)
fun two()
}
compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
class E1: Exception()
interface Base<T> {
throws(E1::class)
@Throws(E1::class)
fun one(t: T) {}
}
compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt
Vendored
+3 -3
View File
@@ -3,11 +3,11 @@ package test
class E1: Exception()
class E2: Exception()
throws()
@Throws()
fun none() {}
throws(E1::class)
@Throws(E1::class)
fun one() {}
throws(E1::class, E2::class)
@Throws(E1::class, E2::class)
fun two() {}
compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt
Vendored
+3 -3
View File
@@ -4,13 +4,13 @@ class E1: Exception()
class E2: Exception()
interface Trait {
throws()
@Throws()
fun none() {}
throws(E1::class)
@Throws(E1::class)
fun one() {}
throws(E1::class, E2::class)
@Throws(E1::class, E2::class)
fun two() {}
}
j2k/src/org/jetbrains/kotlin/j2k/Converter.kt
+1 -1
View File
@@ -587,7 +587,7 @@ class Converter private constructor(
val convertedType = typeConverter.convertType(types[index], Nullability.NotNull)
null to deferredElement<Expression> { ClassLiteralExpression(convertedType.assignPrototype(refElements[index])) }
}
val annotation = Annotation(Identifier("throws").assignNoPrototype(), arguments, withAt = false, newLineAfter = true)
val annotation = Annotation(Identifier("Throws").assignNoPrototype(), arguments, withAt = false, newLineAfter = true)
return Annotations(listOf(annotation.assignPrototype(throwsList))).assignPrototype(throwsList)
}
j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.kt
Vendored
+4 -4
View File
@@ -11,7 +11,7 @@ class Test : Base() {
return super.equals(o)
}
throws(CloneNotSupportedException::class)
Throws(CloneNotSupportedException::class)
override fun clone(): Any {
return super.clone()
}
@@ -20,7 +20,7 @@ class Test : Base() {
return super.toString()
}
throws(Throwable::class)
Throws(Throwable::class)
override fun finalize() {
super.finalize()
}
@@ -35,7 +35,7 @@ open class Base {
return super.equals(o)
}
throws(CloneNotSupportedException::class)
Throws(CloneNotSupportedException::class)
protected open fun clone(): Any {
return super.clone()
}
@@ -44,7 +44,7 @@ open class Base {
return super.toString()
}
throws(Throwable::class)
Throws(Throwable::class)
protected open fun finalize() {
super.finalize()
}
j2k/testData/fileOrElement/function/overrideObject.kt
Vendored
+2 -2
View File
@@ -12,14 +12,14 @@ class X {
return super.toString()
}
throws(CloneNotSupportedException::class)
Throws(CloneNotSupportedException::class)
protected fun clone(): Any {
return super.clone()
}
}
class Y : Thread() {
throws(CloneNotSupportedException::class)
Throws(CloneNotSupportedException::class)
override fun clone(): Any {
return super.clone()
}
j2k/testData/fileOrElement/function/overrideObject2.kt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ class X : Base() {
return super.toString()
}
throws(CloneNotSupportedException::class)
Throws(CloneNotSupportedException::class)
protected fun clone(): Any {
return super.clone()
}
j2k/testData/fileOrElement/function/throws.kt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
throws(IOException::class, SerializationException::class)
Throws(IOException::class, SerializationException::class)
fun foo()
j2k/testData/fileOrElement/methodCallExpression/vararg1.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import java.lang.reflect.Constructor
object X {
throws(Exception::class)
Throws(Exception::class)
fun <T> foo(constructor: Constructor<T>, args1: Array<Any>, args2: Array<Any>) {
constructor.newInstance(*args1)
constructor.newInstance(args1, args2)
j2k/testData/fileOrElement/tryWithResource/Multiline.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import java.io.*
public class C {
throws(IOException::class)
Throws(IOException::class)
fun foo() {
ByteArrayInputStream(ByteArray(10)).use { stream ->
// reading something
j2k/testData/fileOrElement/tryWithResource/MultipleResources.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import java.io.*
public class C {
throws(IOException::class)
Throws(IOException::class)
fun foo() {
ByteArrayInputStream(ByteArray(10)).use { input ->
ByteArrayOutputStream().use { output ->
j2k/testData/fileOrElement/tryWithResource/Simple.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import java.io.*
public class C {
throws(IOException::class)
Throws(IOException::class)
fun foo() {
ByteArrayInputStream(ByteArray(10)).use { stream -> println(stream.read()) }
}
j2k/testData/fileOrElement/tryWithResource/WithFinally.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
import java.io.*
public class C {
throws(IOException::class)
Throws(IOException::class)
fun foo() {
try {
ByteArrayInputStream(ByteArray(10)).use { stream ->
j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt
Vendored
+4 -4
View File
@@ -1,16 +1,16 @@
import java.io.*
interface I {
throws(IOException::class)
Throws(IOException::class)
public fun doIt(stream: InputStream): Int
}
public class C {
throws(IOException::class)
Throws(IOException::class)
fun foo() {
ByteArrayInputStream(ByteArray(10)).use { stream ->
bar(object : I {
throws(IOException::class)
Throws(IOException::class)
override fun doIt(stream: InputStream): Int {
return stream.available()
}
@@ -18,7 +18,7 @@ public class C {
}
}
throws(IOException::class)
Throws(IOException::class)
fun bar(i: I, stream: InputStream): Int {
return i.doIt(stream)
}
j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt
Vendored
+4 -4
View File
@@ -1,16 +1,16 @@
import java.io.*
interface I {
throws(IOException::class)
Throws(IOException::class)
public fun doIt(stream: InputStream): Int
}
public class C {
throws(IOException::class)
Throws(IOException::class)
fun foo(): Int {
ByteArrayInputStream(ByteArray(10)).use { stream ->
return bar(object : I {
throws(IOException::class)
Throws(IOException::class)
override fun doIt(stream: InputStream): Int {
return stream.available()
}
@@ -18,7 +18,7 @@ public class C {
}
}
throws(IOException::class)
Throws(IOException::class)
fun bar(i: I, stream: InputStream): Int {
return i.doIt(stream)
}
libraries/stdlib/src/kotlin/util/JLangJVM.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import kotlin.reflect.KClass
*
* @property exceptionClasses the list of checked exception classes that may be thrown by the function.
*/
public annotation(retention = AnnotationRetention.SOURCE) class throws(public vararg val exceptionClasses: KClass<out Throwable>)
public annotation(retention = AnnotationRetention.SOURCE) class Throws(public vararg val exceptionClasses: KClass<out Throwable>)
/**
* Returns the runtime Java class of this object.