diff --git a/build.xml b/build.xml
index 5def30f07a5..cab8bd8cd2b 100644
--- a/build.xml
+++ b/build.xml
@@ -317,7 +317,6 @@
-
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/JavaToKotlinMethodMapGenerated.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/JavaToKotlinMethodMapGenerated.java
index 85d3ec76653..1567fba6e8c 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/JavaToKotlinMethodMapGenerated.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/JavaToKotlinMethodMapGenerated.java
@@ -29,224 +29,224 @@ class JavaToKotlinMethodMapGenerated {
ImmutableMultimap.Builder b = ImmutableMultimap.builder();
put(b, "java.lang.Object", "Any",
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
- pair("toString()", "fun toString(): jet.String")
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
+ pair("toString()", "fun toString(): kotlin.String")
);
put(b, "java.lang.String", "String",
- pair("compareTo(java.lang.String)", "fun compareTo(that: jet.String): jet.Int"),
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
- pair("toString()", "fun toString(): jet.String")
+ pair("compareTo(java.lang.String)", "fun compareTo(that: kotlin.String): kotlin.Int"),
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
+ pair("toString()", "fun toString(): kotlin.String")
);
put(b, "java.lang.CharSequence", "CharSequence",
- pair("toString()", "fun toString(): jet.String")
+ pair("toString()", "fun toString(): kotlin.String")
);
put(b, "java.lang.Throwable", "Throwable",
- pair("getCause()", "fun getCause(): jet.Throwable?"),
- pair("getMessage()", "fun getMessage(): jet.String?"),
- pair("printStackTrace()", "fun printStackTrace(): jet.Unit"),
- pair("toString()", "fun toString(): jet.String")
+ pair("getCause()", "fun getCause(): kotlin.Throwable?"),
+ pair("getMessage()", "fun getMessage(): kotlin.String?"),
+ pair("printStackTrace()", "fun printStackTrace(): kotlin.Unit"),
+ pair("toString()", "fun toString(): kotlin.String")
);
put(b, "java.lang.Comparable", "Comparable",
- pair("compareTo(T)", "fun compareTo(other: T): jet.Int")
+ pair("compareTo(T)", "fun compareTo(other: T): kotlin.Int")
);
put(b, "java.lang.Enum", "Enum",
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
- pair("name()", "fun name(): jet.String"),
- pair("ordinal()", "fun ordinal(): jet.Int"),
- pair("toString()", "fun toString(): jet.String")
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
+ pair("name()", "fun name(): kotlin.String"),
+ pair("ordinal()", "fun ordinal(): kotlin.Int"),
+ pair("toString()", "fun toString(): kotlin.String")
);
put(b, "java.lang.annotation.Annotation", "Annotation",
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
- pair("toString()", "fun toString(): jet.String")
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
+ pair("toString()", "fun toString(): kotlin.String")
);
put(b, "java.lang.Iterable", "Iterable",
- pair("iterator()", "fun iterator(): jet.Iterator")
+ pair("iterator()", "fun iterator(): kotlin.Iterator")
);
put(b, "java.lang.Iterable", "MutableIterable",
- pair("iterator()", "fun iterator(): jet.MutableIterator")
+ pair("iterator()", "fun iterator(): kotlin.MutableIterator")
);
put(b, "java.util.Iterator", "Iterator",
- pair("hasNext()", "fun hasNext(): jet.Boolean"),
+ pair("hasNext()", "fun hasNext(): kotlin.Boolean"),
pair("next()", "fun next(): T")
);
put(b, "java.util.Iterator", "MutableIterator",
- pair("hasNext()", "fun hasNext(): jet.Boolean"),
+ pair("hasNext()", "fun hasNext(): kotlin.Boolean"),
pair("next()", "fun next(): T"),
- pair("remove()", "fun remove(): jet.Unit")
+ pair("remove()", "fun remove(): kotlin.Unit")
);
put(b, "java.util.Collection", "Collection",
- pair("contains(java.lang.Object)", "fun contains(o: jet.Any?): jet.Boolean"),
- pair("containsAll(java.util.Collection)", "fun containsAll(c: jet.Collection): jet.Boolean"),
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
- pair("isEmpty()", "fun isEmpty(): jet.Boolean"),
- pair("iterator()", "fun iterator(): jet.Iterator"),
- pair("size()", "fun size(): jet.Int")
+ pair("contains(java.lang.Object)", "fun contains(o: kotlin.Any?): kotlin.Boolean"),
+ pair("containsAll(java.util.Collection)", "fun containsAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
+ pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
+ pair("iterator()", "fun iterator(): kotlin.Iterator"),
+ pair("size()", "fun size(): kotlin.Int")
);
put(b, "java.util.Collection", "MutableCollection",
- pair("add(E)", "fun add(e: E): jet.Boolean"),
- pair("addAll(java.util.Collection)", "fun addAll(c: jet.Collection): jet.Boolean"),
- pair("clear()", "fun clear(): jet.Unit"),
- pair("contains(java.lang.Object)", "fun contains(o: jet.Any?): jet.Boolean"),
- pair("containsAll(java.util.Collection)", "fun containsAll(c: jet.Collection): jet.Boolean"),
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
- pair("isEmpty()", "fun isEmpty(): jet.Boolean"),
- pair("iterator()", "fun iterator(): jet.MutableIterator"),
- pair("remove(java.lang.Object)", "fun remove(o: jet.Any?): jet.Boolean"),
- pair("removeAll(java.util.Collection)", "fun removeAll(c: jet.Collection): jet.Boolean"),
- pair("retainAll(java.util.Collection)", "fun retainAll(c: jet.Collection): jet.Boolean"),
- pair("size()", "fun size(): jet.Int")
+ pair("add(E)", "fun add(e: E): kotlin.Boolean"),
+ pair("addAll(java.util.Collection)", "fun addAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("clear()", "fun clear(): kotlin.Unit"),
+ pair("contains(java.lang.Object)", "fun contains(o: kotlin.Any?): kotlin.Boolean"),
+ pair("containsAll(java.util.Collection)", "fun containsAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
+ pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
+ pair("iterator()", "fun iterator(): kotlin.MutableIterator"),
+ pair("remove(java.lang.Object)", "fun remove(o: kotlin.Any?): kotlin.Boolean"),
+ pair("removeAll(java.util.Collection)", "fun removeAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("retainAll(java.util.Collection)", "fun retainAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("size()", "fun size(): kotlin.Int")
);
put(b, "java.util.List", "List",
- pair("contains(java.lang.Object)", "fun contains(o: jet.Any?): jet.Boolean"),
- pair("containsAll(java.util.Collection)", "fun containsAll(c: jet.Collection): jet.Boolean"),
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
- pair("get(int)", "fun get(index: jet.Int): E"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
- pair("indexOf(java.lang.Object)", "fun indexOf(o: jet.Any?): jet.Int"),
- pair("isEmpty()", "fun isEmpty(): jet.Boolean"),
- pair("iterator()", "fun iterator(): jet.Iterator"),
- pair("lastIndexOf(java.lang.Object)", "fun lastIndexOf(o: jet.Any?): jet.Int"),
- pair("listIterator()", "fun listIterator(): jet.ListIterator"),
- pair("listIterator(int)", "fun listIterator(index: jet.Int): jet.ListIterator"),
- pair("size()", "fun size(): jet.Int"),
- pair("subList(int, int)", "fun subList(fromIndex: jet.Int, toIndex: jet.Int): jet.List")
+ pair("contains(java.lang.Object)", "fun contains(o: kotlin.Any?): kotlin.Boolean"),
+ pair("containsAll(java.util.Collection)", "fun containsAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
+ pair("get(int)", "fun get(index: kotlin.Int): E"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
+ pair("indexOf(java.lang.Object)", "fun indexOf(o: kotlin.Any?): kotlin.Int"),
+ pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
+ pair("iterator()", "fun iterator(): kotlin.Iterator"),
+ pair("lastIndexOf(java.lang.Object)", "fun lastIndexOf(o: kotlin.Any?): kotlin.Int"),
+ pair("listIterator()", "fun listIterator(): kotlin.ListIterator"),
+ pair("listIterator(int)", "fun listIterator(index: kotlin.Int): kotlin.ListIterator"),
+ pair("size()", "fun size(): kotlin.Int"),
+ pair("subList(int, int)", "fun subList(fromIndex: kotlin.Int, toIndex: kotlin.Int): kotlin.List")
);
put(b, "java.util.List", "MutableList",
- pair("add(E)", "fun add(e: E): jet.Boolean"),
- pair("add(int, E)", "fun add(index: jet.Int, element: E): jet.Unit"),
- pair("addAll(int, java.util.Collection)", "fun addAll(index: jet.Int, c: jet.Collection): jet.Boolean"),
- pair("addAll(java.util.Collection)", "fun addAll(c: jet.Collection): jet.Boolean"),
- pair("clear()", "fun clear(): jet.Unit"),
- pair("contains(java.lang.Object)", "fun contains(o: jet.Any?): jet.Boolean"),
- pair("containsAll(java.util.Collection)", "fun containsAll(c: jet.Collection): jet.Boolean"),
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
- pair("get(int)", "fun get(index: jet.Int): E"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
- pair("indexOf(java.lang.Object)", "fun indexOf(o: jet.Any?): jet.Int"),
- pair("isEmpty()", "fun isEmpty(): jet.Boolean"),
- pair("iterator()", "fun iterator(): jet.MutableIterator"),
- pair("lastIndexOf(java.lang.Object)", "fun lastIndexOf(o: jet.Any?): jet.Int"),
- pair("listIterator()", "fun listIterator(): jet.MutableListIterator"),
- pair("listIterator(int)", "fun listIterator(index: jet.Int): jet.MutableListIterator"),
- pair("remove(int)", "fun remove(index: jet.Int): E"),
- pair("remove(java.lang.Object)", "fun remove(o: jet.Any?): jet.Boolean"),
- pair("removeAll(java.util.Collection)", "fun removeAll(c: jet.Collection): jet.Boolean"),
- pair("retainAll(java.util.Collection)", "fun retainAll(c: jet.Collection): jet.Boolean"),
- pair("set(int, E)", "fun set(index: jet.Int, element: E): E"),
- pair("size()", "fun size(): jet.Int"),
- pair("subList(int, int)", "fun subList(fromIndex: jet.Int, toIndex: jet.Int): jet.MutableList")
+ pair("add(E)", "fun add(e: E): kotlin.Boolean"),
+ pair("add(int, E)", "fun add(index: kotlin.Int, element: E): kotlin.Unit"),
+ pair("addAll(int, java.util.Collection)", "fun addAll(index: kotlin.Int, c: kotlin.Collection): kotlin.Boolean"),
+ pair("addAll(java.util.Collection)", "fun addAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("clear()", "fun clear(): kotlin.Unit"),
+ pair("contains(java.lang.Object)", "fun contains(o: kotlin.Any?): kotlin.Boolean"),
+ pair("containsAll(java.util.Collection)", "fun containsAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
+ pair("get(int)", "fun get(index: kotlin.Int): E"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
+ pair("indexOf(java.lang.Object)", "fun indexOf(o: kotlin.Any?): kotlin.Int"),
+ pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
+ pair("iterator()", "fun iterator(): kotlin.MutableIterator"),
+ pair("lastIndexOf(java.lang.Object)", "fun lastIndexOf(o: kotlin.Any?): kotlin.Int"),
+ pair("listIterator()", "fun listIterator(): kotlin.MutableListIterator"),
+ pair("listIterator(int)", "fun listIterator(index: kotlin.Int): kotlin.MutableListIterator"),
+ pair("remove(int)", "fun remove(index: kotlin.Int): E"),
+ pair("remove(java.lang.Object)", "fun remove(o: kotlin.Any?): kotlin.Boolean"),
+ pair("removeAll(java.util.Collection)", "fun removeAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("retainAll(java.util.Collection)", "fun retainAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("set(int, E)", "fun set(index: kotlin.Int, element: E): E"),
+ pair("size()", "fun size(): kotlin.Int"),
+ pair("subList(int, int)", "fun subList(fromIndex: kotlin.Int, toIndex: kotlin.Int): kotlin.MutableList")
);
put(b, "java.util.Set", "Set",
- pair("contains(java.lang.Object)", "fun contains(o: jet.Any?): jet.Boolean"),
- pair("containsAll(java.util.Collection)", "fun containsAll(c: jet.Collection): jet.Boolean"),
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
- pair("isEmpty()", "fun isEmpty(): jet.Boolean"),
- pair("iterator()", "fun iterator(): jet.Iterator"),
- pair("size()", "fun size(): jet.Int")
+ pair("contains(java.lang.Object)", "fun contains(o: kotlin.Any?): kotlin.Boolean"),
+ pair("containsAll(java.util.Collection)", "fun containsAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
+ pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
+ pair("iterator()", "fun iterator(): kotlin.Iterator"),
+ pair("size()", "fun size(): kotlin.Int")
);
put(b, "java.util.Set", "MutableSet",
- pair("add(E)", "fun add(e: E): jet.Boolean"),
- pair("addAll(java.util.Collection)", "fun addAll(c: jet.Collection): jet.Boolean"),
- pair("clear()", "fun clear(): jet.Unit"),
- pair("contains(java.lang.Object)", "fun contains(o: jet.Any?): jet.Boolean"),
- pair("containsAll(java.util.Collection)", "fun containsAll(c: jet.Collection): jet.Boolean"),
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
- pair("isEmpty()", "fun isEmpty(): jet.Boolean"),
- pair("iterator()", "fun iterator(): jet.MutableIterator"),
- pair("remove(java.lang.Object)", "fun remove(o: jet.Any?): jet.Boolean"),
- pair("removeAll(java.util.Collection)", "fun removeAll(c: jet.Collection): jet.Boolean"),
- pair("retainAll(java.util.Collection)", "fun retainAll(c: jet.Collection): jet.Boolean"),
- pair("size()", "fun size(): jet.Int")
+ pair("add(E)", "fun add(e: E): kotlin.Boolean"),
+ pair("addAll(java.util.Collection)", "fun addAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("clear()", "fun clear(): kotlin.Unit"),
+ pair("contains(java.lang.Object)", "fun contains(o: kotlin.Any?): kotlin.Boolean"),
+ pair("containsAll(java.util.Collection)", "fun containsAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
+ pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
+ pair("iterator()", "fun iterator(): kotlin.MutableIterator"),
+ pair("remove(java.lang.Object)", "fun remove(o: kotlin.Any?): kotlin.Boolean"),
+ pair("removeAll(java.util.Collection)", "fun removeAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("retainAll(java.util.Collection)", "fun retainAll(c: kotlin.Collection): kotlin.Boolean"),
+ pair("size()", "fun size(): kotlin.Int")
);
put(b, "java.util.Map", "Map",
- pair("containsKey(java.lang.Object)", "fun containsKey(key: jet.Any?): jet.Boolean"),
- pair("containsValue(java.lang.Object)", "fun containsValue(value: jet.Any?): jet.Boolean"),
- pair("entrySet()", "fun entrySet(): jet.Set>"),
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
- pair("get(java.lang.Object)", "fun get(key: jet.Any?): V?"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
- pair("isEmpty()", "fun isEmpty(): jet.Boolean"),
- pair("keySet()", "fun keySet(): jet.Set"),
- pair("size()", "fun size(): jet.Int"),
- pair("values()", "fun values(): jet.Collection")
+ pair("containsKey(java.lang.Object)", "fun containsKey(key: kotlin.Any?): kotlin.Boolean"),
+ pair("containsValue(java.lang.Object)", "fun containsValue(value: kotlin.Any?): kotlin.Boolean"),
+ pair("entrySet()", "fun entrySet(): kotlin.Set>"),
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
+ pair("get(java.lang.Object)", "fun get(key: kotlin.Any?): V?"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
+ pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
+ pair("keySet()", "fun keySet(): kotlin.Set"),
+ pair("size()", "fun size(): kotlin.Int"),
+ pair("values()", "fun values(): kotlin.Collection")
);
put(b, "java.util.Map", "MutableMap",
- pair("clear()", "fun clear(): jet.Unit"),
- pair("containsKey(java.lang.Object)", "fun containsKey(key: jet.Any?): jet.Boolean"),
- pair("containsValue(java.lang.Object)", "fun containsValue(value: jet.Any?): jet.Boolean"),
- pair("entrySet()", "fun entrySet(): jet.MutableSet>"),
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
- pair("get(java.lang.Object)", "fun get(key: jet.Any?): V?"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
- pair("isEmpty()", "fun isEmpty(): jet.Boolean"),
- pair("keySet()", "fun keySet(): jet.MutableSet"),
+ pair("clear()", "fun clear(): kotlin.Unit"),
+ pair("containsKey(java.lang.Object)", "fun containsKey(key: kotlin.Any?): kotlin.Boolean"),
+ pair("containsValue(java.lang.Object)", "fun containsValue(value: kotlin.Any?): kotlin.Boolean"),
+ pair("entrySet()", "fun entrySet(): kotlin.MutableSet>"),
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
+ pair("get(java.lang.Object)", "fun get(key: kotlin.Any?): V?"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
+ pair("isEmpty()", "fun isEmpty(): kotlin.Boolean"),
+ pair("keySet()", "fun keySet(): kotlin.MutableSet"),
pair("put(K, V)", "fun put(key: K, value: V): V?"),
- pair("putAll(java.util.Map)", "fun putAll(m: jet.Map): jet.Unit"),
- pair("remove(java.lang.Object)", "fun remove(key: jet.Any?): V?"),
- pair("size()", "fun size(): jet.Int"),
- pair("values()", "fun values(): jet.MutableCollection")
+ pair("putAll(java.util.Map)", "fun putAll(m: kotlin.Map): kotlin.Unit"),
+ pair("remove(java.lang.Object)", "fun remove(key: kotlin.Any?): V?"),
+ pair("size()", "fun size(): kotlin.Int"),
+ pair("values()", "fun values(): kotlin.MutableCollection")
);
put(b, "java.util.Map.Entry", "Map.Entry",
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("getKey()", "fun getKey(): K"),
pair("getValue()", "fun getValue(): V"),
- pair("hashCode()", "fun hashCode(): jet.Int")
+ pair("hashCode()", "fun hashCode(): kotlin.Int")
);
put(b, "java.util.Map.Entry", "MutableMap.MutableEntry",
- pair("equals(java.lang.Object)", "fun equals(other: jet.Any?): jet.Boolean"),
+ pair("equals(java.lang.Object)", "fun equals(other: kotlin.Any?): kotlin.Boolean"),
pair("getKey()", "fun getKey(): K"),
pair("getValue()", "fun getValue(): V"),
- pair("hashCode()", "fun hashCode(): jet.Int"),
+ pair("hashCode()", "fun hashCode(): kotlin.Int"),
pair("setValue(V)", "fun setValue(value: V): V")
);
put(b, "java.util.ListIterator", "ListIterator",
- pair("hasNext()", "fun hasNext(): jet.Boolean"),
- pair("hasPrevious()", "fun hasPrevious(): jet.Boolean"),
+ pair("hasNext()", "fun hasNext(): kotlin.Boolean"),
+ pair("hasPrevious()", "fun hasPrevious(): kotlin.Boolean"),
pair("next()", "fun next(): T"),
- pair("nextIndex()", "fun nextIndex(): jet.Int"),
+ pair("nextIndex()", "fun nextIndex(): kotlin.Int"),
pair("previous()", "fun previous(): T"),
- pair("previousIndex()", "fun previousIndex(): jet.Int")
+ pair("previousIndex()", "fun previousIndex(): kotlin.Int")
);
put(b, "java.util.ListIterator", "MutableListIterator",
- pair("add(E)", "fun add(e: T): jet.Unit"),
- pair("hasNext()", "fun hasNext(): jet.Boolean"),
- pair("hasPrevious()", "fun hasPrevious(): jet.Boolean"),
+ pair("add(E)", "fun add(e: T): kotlin.Unit"),
+ pair("hasNext()", "fun hasNext(): kotlin.Boolean"),
+ pair("hasPrevious()", "fun hasPrevious(): kotlin.Boolean"),
pair("next()", "fun next(): T"),
- pair("nextIndex()", "fun nextIndex(): jet.Int"),
+ pair("nextIndex()", "fun nextIndex(): kotlin.Int"),
pair("previous()", "fun previous(): T"),
- pair("previousIndex()", "fun previousIndex(): jet.Int"),
- pair("remove()", "fun remove(): jet.Unit"),
- pair("set(E)", "fun set(e: T): jet.Unit")
+ pair("previousIndex()", "fun previousIndex(): kotlin.Int"),
+ pair("remove()", "fun remove(): kotlin.Unit"),
+ pair("set(E)", "fun set(e: T): kotlin.Unit")
);
map = b.build();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
index 2091e0fd379..ecc6f3b748d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
@@ -33,7 +33,6 @@ import java.lang.reflect.Modifier;
import java.util.Collection;
import static org.jetbrains.jet.lang.diagnostics.Errors.*;
-import static org.jetbrains.jet.lang.diagnostics.Errors.DECLARATION_CANT_BE_INLINED;
import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.*;
import static org.jetbrains.jet.renderer.DescriptorRenderer.SHORT_NAMES_IN_TYPES;
@@ -214,7 +213,7 @@ public class DefaultErrorMessages {
NAME, ELEMENT_TEXT);
MAP.put(ASSIGN_OPERATOR_AMBIGUITY, "Assignment operators ambiguity: {0}", AMBIGUOUS_CALLS);
- MAP.put(EQUALS_MISSING, "No method 'equals(jet.Any?) : jet.Boolean' available");
+ MAP.put(EQUALS_MISSING, "No method 'equals(kotlin.Any?): kotlin.Boolean' available");
MAP.put(ASSIGNMENT_IN_EXPRESSION_CONTEXT, "Assignments are not expressions, and only expressions are allowed in this context");
MAP.put(PACKAGE_IS_NOT_AN_EXPRESSION, "'package' is not an expression, it can only be used on the left-hand side of a dot ('.')");
MAP.put(SUPER_IS_NOT_AN_EXPRESSION, "''{0}'' is not an expression, it can only be used on the left-hand side of a dot ('.')", TO_STRING);
@@ -244,8 +243,7 @@ public class DefaultErrorMessages {
MAP.put(HAS_NEXT_MISSING, "hasNext() cannot be called on iterator() of type ''{0}''", RENDER_TYPE);
MAP.put(HAS_NEXT_FUNCTION_AMBIGUITY, "hasNext() is ambiguous for iterator() of type ''{0}''", RENDER_TYPE);
MAP.put(HAS_NEXT_FUNCTION_NONE_APPLICABLE, "None of the hasNext() functions is applicable for iterator() of type ''{0}''", RENDER_TYPE);
- MAP.put(HAS_NEXT_FUNCTION_TYPE_MISMATCH, "The ''iterator().hasNext()'' function of the loop range must return jet.Boolean, but returns {0}",
- RENDER_TYPE);
+ MAP.put(HAS_NEXT_FUNCTION_TYPE_MISMATCH, "The ''iterator().hasNext()'' function of the loop range must return kotlin.Boolean, but returns {0}", RENDER_TYPE);
MAP.put(NEXT_MISSING, "next() cannot be called on iterator() of type ''{0}''", RENDER_TYPE);
MAP.put(NEXT_AMBIGUITY, "next() is ambiguous for iterator() of type ''{0}''", RENDER_TYPE);
@@ -260,7 +258,7 @@ public class DefaultErrorMessages {
MAP.put(DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH, "The ''{0}'' function of property delegate is expected to return ''{1}'', but returns ''{2}''",
TO_STRING, RENDER_TYPE, RENDER_TYPE);
- MAP.put(COMPARE_TO_TYPE_MISMATCH, "''compareTo()'' must return jet.Int, but returns {0}", RENDER_TYPE);
+ MAP.put(COMPARE_TO_TYPE_MISMATCH, "''compareTo()'' must return kotlin.Int, but returns {0}", RENDER_TYPE);
MAP.put(CALLEE_NOT_A_FUNCTION, "Expecting a function type, but found {0}", RENDER_TYPE);
MAP.put(RETURN_IN_FUNCTION_WITH_EXPRESSION_BODY,
@@ -359,9 +357,9 @@ public class DefaultErrorMessages {
MAP.put(TYPE_MISMATCH_IN_FOR_LOOP, "The loop iterates over values of type {0} but the parameter is declared to be {1}", RENDER_TYPE,
RENDER_TYPE);
- MAP.put(TYPE_MISMATCH_IN_CONDITION, "Condition must be of type jet.Boolean, but is of type {0}", RENDER_TYPE);
+ MAP.put(TYPE_MISMATCH_IN_CONDITION, "Condition must be of type kotlin.Boolean, but is of type {0}", RENDER_TYPE);
MAP.put(INCOMPATIBLE_TYPES, "Incompatible types: {0} and {1}", RENDER_TYPE, RENDER_TYPE);
- MAP.put(EXPECTED_CONDITION, "Expected condition of jet.Boolean type");
+ MAP.put(EXPECTED_CONDITION, "Expected condition of type kotlin.Boolean");
MAP.put(CANNOT_CHECK_FOR_ERASED, "Cannot check for instance of erased type: {0}", RENDER_TYPE);
MAP.put(UNCHECKED_CAST, "Unchecked cast: {0} to {1}", RENDER_TYPE, RENDER_TYPE);
diff --git a/compiler/testData/asJava/lightClasses/Declared.kt b/compiler/testData/asJava/lightClasses/Declared.kt
index 4b244304c5d..f8dbe82eafa 100644
--- a/compiler/testData/asJava/lightClasses/Declared.kt
+++ b/compiler/testData/asJava/lightClasses/Declared.kt
@@ -27,11 +27,11 @@ trait Trait
// Deprecation
deprecated("") class Deprecated
-jet.deprecated("") class DeprecatedFQN
-jet. deprecated /**/ ("") class DeprecatedFQNSpaces
+kotlin.deprecated("") class DeprecatedFQN
+kotlin. deprecated /**/ ("") class DeprecatedFQNSpaces
[deprecated("")] class DeprecatedWithBrackets
-[jet.deprecated("")] class DeprecatedWithBracketsFQN
-[jet
+[kotlin.deprecated("")] class DeprecatedWithBracketsFQN
+[kotlin
./**/deprecated ("")] class DeprecatedWithBracketsFQNSpaces
// Generic
diff --git a/compiler/tests/org/jetbrains/jet/ScriptTest.java b/compiler/tests/org/jetbrains/jet/ScriptTest.java
index b3c05f14371..44e01e45851 100644
--- a/compiler/tests/org/jetbrains/jet/ScriptTest.java
+++ b/compiler/tests/org/jetbrains/jet/ScriptTest.java
@@ -106,6 +106,6 @@ public class ScriptTest {
@NotNull
private static List numIntParam() {
- return Collections.singletonList(new AnalyzerScriptParameter(Name.identifier("num"), JetTypeName.parse("jet.Int")));
+ return Collections.singletonList(new AnalyzerScriptParameter(Name.identifier("num"), JetTypeName.parse("kotlin.Int")));
}
}
diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java
index 7e51aa6e629..715cd037346 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java
@@ -126,20 +126,20 @@ public class CodegenTestFiles {
String valueString = scriptParametersMatcher.group(3);
Object value;
- if (type.equals("jet.String")) {
+ if (type.equals("kotlin.String")) {
value = valueString;
}
- else if (type.equals("jet.Long")) {
+ else if (type.equals("kotlin.Long")) {
value = Long.parseLong(valueString);
}
- else if (type.equals("jet.Int")) {
+ else if (type.equals("kotlin.Int")) {
value = Integer.parseInt(valueString);
}
- else if (type.equals("jet.Array")) {
+ else if (type.equals("kotlin.Array")) {
value = valueString.split(" ");
}
else {
- throw new AssertionError("TODO");
+ throw new AssertionError("TODO: " + type);
}
scriptParameterTypes.add(new AnalyzerScriptParameter(Name.identifier(name), JetTypeName.parse(type)));
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java
index 293dd7ce491..9848761f04d 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java
@@ -34,7 +34,7 @@ public class ScriptGenTest extends CodegenTestCase {
protected Object scriptInstance;
public static final JetScriptDefinition FIB_SCRIPT_DEFINITION =
- new JetScriptDefinition(".lang.kt", new AnalyzerScriptParameter("num", "jet.Int"));
+ new JetScriptDefinition(".lang.kt", new AnalyzerScriptParameter("num", "kotlin.Int"));
@Override
protected void setUp() throws Exception {
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt b/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
index 424119ea2be..b02877b7476 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
+++ b/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
@@ -28,13 +28,13 @@ import java.io.File
fun assertExists(file: File): Unit =
if (!file.exists()) error("Output dir does not exist: ${file.getAbsolutePath()}")
-val BUILT_INS_DIR = File("core/builtins/src/jet/")
+val BUILT_INS_DIR = File("core/builtins/src/kotlin/")
val RUNTIME_JVM_DIR = File("core/runtime.jvm/src/kotlin/")
abstract class BuiltInsSourceGenerator(val out: PrintWriter) {
protected abstract fun generateBody(): Unit
- protected open fun getPackage(): String = "jet"
+ protected open fun getPackage(): String = "kotlin"
final fun generate() {
out.println(File("injector-generator/copyright.txt").readText())
diff --git a/idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java b/idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java
index ece84d3631b..f895c00df3f 100644
--- a/idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java
+++ b/idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java
@@ -154,9 +154,10 @@ public class KotlinRuntimeLibraryUtil {
ImmutableList candidateClassNames = ImmutableList.of(
kotlinPackageClassFqName,
- "jet.Unit",
+ "kotlin.Unit",
// For older versions
- "kotlin.namespace"
+ "kotlin.namespace",
+ "jet.Unit"
);
for (String className : candidateClassNames) {
diff --git a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java
index ab20baf94af..cd00ce1a366 100644
--- a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java
@@ -43,7 +43,7 @@ public final class JetCompilerMessagingTest extends IDECompilerMessagingTest {
doTest(new Function1() {
@Override
public Void invoke(MessageChecker checker) {
- checker.expect(warning().text("Unnecessary non-null assertion (!!) on a non-null receiver of type jet.String")
+ checker.expect(warning().text("Unnecessary non-null assertion (!!) on a non-null receiver of type kotlin.String")
.at("test.kt", 4, 4));
return null;
}
diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java
index b801a233d2c..69280a6163b 100644
--- a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java
@@ -52,11 +52,11 @@ public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegre
}
public void testClassWithJavaAnalog() throws IOException {
- doNavigationInSourcesTest("libraries/stdlib/src/kotlin/Iterators.kt", "Iterator", "jet.Iterator");
+ doNavigationInSourcesTest("libraries/stdlib/src/kotlin/Iterators.kt", "Iterator", "kotlin.Iterator");
}
public void testNavigationInKotlinBuiltIns() throws IOException {
- doNavigationInSourcesTest("libraries/stdlib/src/generated/_Arrays.kt", "Array", "jet.Array");
+ doNavigationInSourcesTest("libraries/stdlib/src/generated/_Arrays.kt", "Array", "kotlin.Array");
}
private void doNavigationInSourcesTest(@NotNull String path, @NotNull String element, @NotNull String expectedFqName) throws IOException {
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java
index 6472ec17a8f..c113e269947 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java
@@ -87,20 +87,20 @@ public final class StandardClasses {
@NotNull
public static StandardClasses bindImplementations(@NotNull JsScope kotlinObjectScope) {
StandardClasses standardClasses = new StandardClasses(kotlinObjectScope);
- declareJetObjects(standardClasses);
+ declareKotlinStandardClasses(standardClasses);
return standardClasses;
}
- private static void declareJetObjects(@NotNull StandardClasses standardClasses) {
- standardClasses.declare().forFQ("jet.Iterator").kotlinClass("Iterator").methods("next").properties("hasNext");
+ private static void declareKotlinStandardClasses(@NotNull StandardClasses standardClasses) {
+ standardClasses.declare().forFQ("kotlin.Iterator").kotlinClass("Iterator").methods("next").properties("hasNext");
- standardClasses.declare().forFQ("jet.IntRange").kotlinClass("NumberRange")
+ standardClasses.declare().forFQ("kotlin.IntRange").kotlinClass("NumberRange")
.methods("iterator", "contains").properties("start", "end", "increment");
- standardClasses.declare().forFQ("jet.IntProgression").kotlinClass("NumberProgression")
+ standardClasses.declare().forFQ("kotlin.IntProgression").kotlinClass("NumberProgression")
.methods("iterator", "contains").properties("start", "end", "increment");
- standardClasses.declare().forFQ("jet.Enum").kotlinClass("Enum");
+ standardClasses.declare().forFQ("kotlin.Enum").kotlinClass("Enum");
}
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java
index 8c08c31abc5..cb29cba3a65 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/StringOperationFIF.java
@@ -26,7 +26,7 @@ public final class StringOperationFIF extends CompositeFIF {
public static final FunctionIntrinsicFactory INSTANCE = new StringOperationFIF();
private StringOperationFIF() {
- add(pattern("jet", "String", "get"), new BuiltInFunctionIntrinsic("charAt"));
+ add(pattern("kotlin", "String", "get"), new BuiltInFunctionIntrinsic("charAt"));
add(pattern("js", "length").receiverExists(), LENGTH_PROPERTY_INTRINSIC);
add(pattern("js", "isEmpty").receiverExists(), IS_EMPTY_INTRINSIC);
}
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java
index 2b97feaf281..1deee00a1d5 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TopLevelFIF.java
@@ -46,7 +46,7 @@ import static org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionInt
import static org.jetbrains.k2js.translate.intrinsic.functions.patterns.PatternBuilder.pattern;
public final class TopLevelFIF extends CompositeFIF {
- public static final DescriptorPredicate EQUALS_IN_ANY = pattern("jet", "Any", "equals");
+ public static final DescriptorPredicate EQUALS_IN_ANY = pattern("kotlin", "Any", "equals");
@NotNull
public static final KotlinFunctionIntrinsic KOTLIN_EQUALS = new KotlinFunctionIntrinsic("equals");
@NotNull
@@ -141,16 +141,16 @@ public final class TopLevelFIF extends CompositeFIF {
private TopLevelFIF() {
add(EQUALS_IN_ANY, KOTLIN_EQUALS);
- add(pattern("jet", "toString").receiverExists(), TO_STRING);
- add(pattern("jet", "equals").receiverExists(), KOTLIN_EQUALS);
- add(pattern("jet", "identityEquals").receiverExists(), IDENTITY_EQUALS);
+ add(pattern("kotlin", "toString").receiverExists(), TO_STRING);
+ add(pattern("kotlin", "equals").receiverExists(), KOTLIN_EQUALS);
+ add(pattern("kotlin", "identityEquals").receiverExists(), IDENTITY_EQUALS);
add(pattern(NamePredicate.PRIMITIVE_NUMBERS, "equals"), KOTLIN_EQUALS);
add(pattern("String|Boolean|Char|Number.equals"), KOTLIN_EQUALS);
- add(pattern("jet", "arrayOfNulls"), new KotlinFunctionIntrinsic("nullArray"));
- add(pattern("jet", "PropertyMetadataImpl", ""), PROPERTY_METADATA_IMPL);
- add(pattern("jet", "iterator").receiverExists(), RETURN_RECEIVER_INTRINSIC);
+ add(pattern("kotlin", "arrayOfNulls"), new KotlinFunctionIntrinsic("nullArray"));
+ add(pattern("kotlin", "PropertyMetadataImpl", ""), PROPERTY_METADATA_IMPL);
+ add(pattern("kotlin", "iterator").receiverExists(), RETURN_RECEIVER_INTRINSIC);
- add(pattern("jet", "Map", "get").checkOverridden(), NATIVE_MAP_GET);
+ add(pattern("kotlin", "Map", "get").checkOverridden(), NATIVE_MAP_GET);
add(pattern("js", "set").receiverExists(), NATIVE_MAP_SET);
add(pattern("java.util", "HashMap", ""), new MapSelectImplementationIntrinsic(false));
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java
index 52dfbc6fc9d..e1b85c7fd0c 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java
@@ -30,7 +30,7 @@ import java.util.List;
public final class PatternBuilder {
@NotNull
- private static final NamePredicate JET = new NamePredicate("jet");
+ private static final NamePredicate KOTLIN_NAME_PREDICATE = new NamePredicate("kotlin");
@NotNull
private static final Name KOTLIN_NAME = Name.identifier(Namer.KOTLIN_LOWER_NAME);
@@ -74,7 +74,7 @@ public final class PatternBuilder {
assert !checkers.isEmpty();
final List checkersWithPrefixChecker = Lists.newArrayList();
if (!checkers.get(0).apply(KOTLIN_NAME)) {
- checkersWithPrefixChecker.add(JET);
+ checkersWithPrefixChecker.add(KOTLIN_NAME_PREDICATE);
}
checkersWithPrefixChecker.addAll(checkers);
diff --git a/libraries/docs/apidoc/pom.xml b/libraries/docs/apidoc/pom.xml
index cd4b57de572..759e4239a70 100644
--- a/libraries/docs/apidoc/pom.xml
+++ b/libraries/docs/apidoc/pom.xml
@@ -50,7 +50,6 @@
com
sun
java
- jet
js
junit
org
diff --git a/libraries/docs/jsdoc/pom.xml b/libraries/docs/jsdoc/pom.xml
index 623ffd41640..2a9b8116145 100644
--- a/libraries/docs/jsdoc/pom.xml
+++ b/libraries/docs/jsdoc/pom.xml
@@ -57,7 +57,6 @@
com
sun
java
- jet
junit
org
diff --git a/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java b/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java
index b3b41d1cb60..c1502a3c1e3 100644
--- a/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java
+++ b/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java
@@ -3,8 +3,8 @@ package test.kotlin.jtests;
import static kotlin.KotlinPackage.*;
import static kotlin.util.UtilPackage.*;
-import jet.Function1;
import junit.framework.TestCase;
+import kotlin.Function1;
import java.util.Collection;
import java.util.List;
diff --git a/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt b/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt
index c6c3033795a..3ecf515127d 100644
--- a/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt
+++ b/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt
@@ -3,7 +3,7 @@ package kotlin.jdbc
import java.sql.*
// Workaround for an import clash
-import jet.Array
+import kotlin.Array
/**
* Executes the specfied block with result set and then closes it
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
index 92767928096..58324742ff0 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
@@ -760,7 +760,7 @@ class TemplateLinkRenderer(val annotated: KAnnotated, val template: KDocTemplate
// TODO really dirty hack alert!!!
// until the resolver is working, lets try adding a few prefixes :)
for (prefix in arrayList("java.lang", "java.util", "java.util.concurrent", "java.util.regex", "java.io",
- "jet", "java.awt", "java.awt.event", "java.sql", "java.beans",
+ "java.awt", "java.awt.event", "java.sql", "java.beans",
"javax.swing", "javax.swing.event",
"org.w3c.dom",
"kotlin.template")) {
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
index ac55e9ff9e1..1b7468509aa 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
@@ -134,7 +134,7 @@ abstract class KDocTemplate() : TextTemplate() {
return if (c != null) {
val prefix = if (c.isAnnotation()) "@" else ""
val cname = c.name
- if ((cname.startsWith("jet.Function") || cname.startsWith("jet.ExtensionFunction")) && arguments.isNotEmpty()) {
+ if ((cname.startsWith("kotlin.Function") || cname.startsWith("kotlin.ExtensionFunction")) && arguments.isNotEmpty()) {
val rt = arguments.last()
// TODO use drop()
val rest = arguments.subList(0, arguments.size - 1).orEmpty()
diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt
index 053ae915980..69fe98e41f4 100644
--- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt
+++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt
@@ -42,7 +42,6 @@ class KDocTest {
val ignorePackages = config.ignorePackages
ignorePackages.add("org.jetbrains.kotlin")
ignorePackages.add("java")
- ignorePackages.add("jet")
ignorePackages.add("junit")
ignorePackages.add("sun")
ignorePackages.add("org")