diff --git a/core/runtime.jvm/src/kotlin/TypeAliases.kt b/core/runtime.jvm/src/kotlin/TypeAliases.kt new file mode 100644 index 00000000000..428d70d274c --- /dev/null +++ b/core/runtime.jvm/src/kotlin/TypeAliases.kt @@ -0,0 +1,34 @@ +/* + * Copyright 2010-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package kotlin + + +public typealias Error = java.lang.Error +public typealias Exception = java.lang.Exception +public typealias RuntimeException = java.lang.RuntimeException +public typealias IllegalArgumentException = java.lang.IllegalArgumentException +public typealias IllegalStateException = java.lang.IllegalStateException +public typealias IndexOutOfBoundsException = java.lang.IndexOutOfBoundsException +public typealias UnsupportedOperationException = java.lang.UnsupportedOperationException + +public typealias NumberFormatException = java.lang.NumberFormatException +public typealias NullPointerException = java.lang.NullPointerException +public typealias ClassCastException = java.lang.ClassCastException +public typealias AssertionError = java.lang.AssertionError + +// kotlin or kotlin.collections? +public typealias NoSuchElementException = java.util.NoSuchElementException diff --git a/js/js.libraries/src/core/exceptions.kt b/js/js.libraries/src/core/exceptions.kt new file mode 100644 index 00000000000..4e4f15ce346 --- /dev/null +++ b/js/js.libraries/src/core/exceptions.kt @@ -0,0 +1,53 @@ +/* + * Copyright 2010-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package kotlin + +@library +public open class Error(message: String? = null) : Throwable(message) {} + +@library +public open class Exception(message: String? = null) : Throwable(message) {} + +@library +public open class RuntimeException(message: String? = null) : Exception(message) {} + +@library +public open class IllegalArgumentException(message: String? = null) : RuntimeException(message) {} + +@library +public open class IllegalStateException(message: String? = null) : RuntimeException(message) {} + +@library +public open class IndexOutOfBoundsException(message: String? = null) : RuntimeException(message) {} + +@library +public open class UnsupportedOperationException(message: String? = null) : RuntimeException(message) {} + +@library +public open class NumberFormatException(message: String? = null) : RuntimeException(message) {} + +@library +public open class NullPointerException(message: String? = null) : RuntimeException(message) {} + +@library +public open class ClassCastException(message: String? = null) : RuntimeException(message) {} + +@library +public open class AssertionError(message: String? = null) : Error(message) {} + +@library +public open class NoSuchElementException(message: String? = null) : Exception() {} diff --git a/js/js.libraries/src/core/javalang.kt b/js/js.libraries/src/core/javalang.kt index babe73f5ba1..35705adb1d9 100644 --- a/js/js.libraries/src/core/javalang.kt +++ b/js/js.libraries/src/core/javalang.kt @@ -16,38 +16,6 @@ package java.lang -@library -open public class Error(message: String? = null) : Throwable(message) {} - -@library -open public class Exception(message: String? = null) : Throwable(message) {} - -@library -open public class RuntimeException(message: String? = null) : Exception(message) {} - -@library -public class IllegalArgumentException(message: String? = null) : RuntimeException(message) {} - -@library -public class IllegalStateException(message: String? = null) : RuntimeException(message) {} - -@library -public class IndexOutOfBoundsException(message: String? = null) : RuntimeException(message) {} - -@library -public class UnsupportedOperationException(message: String? = null) : RuntimeException(message) {} - -@library -public class NumberFormatException(message: String? = null) : RuntimeException(message) {} - -@library -public class NullPointerException(message: String? = null) : RuntimeException(message) {} - -@library -public class ClassCastException(message: String? = null) : RuntimeException(message) {} - -@library -public class AssertionError(message: String? = null) : Error(message) {} @library public interface Runnable { diff --git a/js/js.libraries/src/core/javautil.kt b/js/js.libraries/src/core/javautil.kt index c32deedf57f..2f1555f3d87 100644 --- a/js/js.libraries/src/core/javautil.kt +++ b/js/js.libraries/src/core/javautil.kt @@ -122,8 +122,6 @@ public open class LinkedHashMap( initialCapacity: Int = DEFAULT_INITIAL_CAPACITY, loadFactor: Float = DEFAULT_LOAD_FACTOR, accessOrder: Boolean = false ) : HashMap(initialCapacity, loadFactor) -@library -public open class NoSuchElementException(message: String? = null) : Exception() {} @native public class Date() { diff --git a/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt b/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt index 1664fb8b07b..7f30b156c70 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractIterator.kt @@ -1,6 +1,5 @@ package kotlin.collections -import java.util.NoSuchElementException private enum class State { Ready, diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt index 00e6bf085da..1e44fddf12d 100644 --- a/libraries/stdlib/src/kotlin/text/Strings.kt +++ b/libraries/stdlib/src/kotlin/text/Strings.kt @@ -20,9 +20,6 @@ package kotlin.text -import java.util.NoSuchElementException -import kotlin.text.MatchResult -import kotlin.text.Regex /** * Returns a sub sequence of this char sequence having leading and trailing characters matching the [predicate] trimmed. diff --git a/libraries/stdlib/src/kotlin/util/Preconditions.kt b/libraries/stdlib/src/kotlin/util/Preconditions.kt index 9861d396fb6..26914150ade 100644 --- a/libraries/stdlib/src/kotlin/util/Preconditions.kt +++ b/libraries/stdlib/src/kotlin/util/Preconditions.kt @@ -2,9 +2,6 @@ @file:kotlin.jvm.JvmName("PreconditionsKt") package kotlin -import java.lang.IllegalArgumentException -import java.lang.IllegalStateException - /** * Throws an [IllegalArgumentException] if the [value] is false. */