From 1a44599d7c4f6eea8a554e029be8968896cc2fb1 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 20 Sep 2012 20:27:23 +0400 Subject: [PATCH] @Nullable/@NotNull annotations for Input/Outoput Streams and Data Input/Output --- jdk-annotations/java/io/annotations.xml | 444 +++++++++++++++++------- libraries/stdlib/src/kotlin/io/JIO.kt | 4 +- 2 files changed, 321 insertions(+), 127 deletions(-) diff --git a/jdk-annotations/java/io/annotations.xml b/jdk-annotations/java/io/annotations.xml index b0e3383d32f..5e50633b65a 100644 --- a/jdk-annotations/java/io/annotations.xml +++ b/jdk-annotations/java/io/annotations.xml @@ -1,127 +1,321 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/io/JIO.kt b/libraries/stdlib/src/kotlin/io/JIO.kt index 8f3205f98fd..b800af03689 100644 --- a/libraries/stdlib/src/kotlin/io/JIO.kt +++ b/libraries/stdlib/src/kotlin/io/JIO.kt @@ -111,7 +111,7 @@ private val stdin : BufferedReader = BufferedReader(InputStreamReader(object : I System.`in`?.reset() } - public override fun read(b: ByteArray?): Int { + public override fun read(b: ByteArray): Int { return System.`in`?.read(b) ?: -1 } @@ -135,7 +135,7 @@ private val stdin : BufferedReader = BufferedReader(InputStreamReader(object : I return System.`in`?.markSupported() ?: false } - public override fun read(b: ByteArray?, off: Int, len: Int): Int { + public override fun read(b: ByteArray, off: Int, len: Int): Int { return System.`in`?.read(b, off, len) ?: -1 } }))