Rename "import jet" to "import kotlin" in Java sources

compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java

@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.codegen.context;
 
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.asm4.Type;
@@ -459,4 +459,4 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
     public CodegenContext findChildContext(@NotNull DeclarationDescriptor child) {
         return childContexts == null ? null : childContexts.get(child);
     }
-}
+}

compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java

@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiErrorElement;
 import com.intellij.psi.PsiModifierListOwner;
 import com.intellij.psi.util.PsiFormatUtil;
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.analyzer.AnalyzeExhaust;
@@ -243,4 +243,4 @@ public final class AnalyzerWithCompilerReport {
             return true;
         }
     }
-}
+}

compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java

@@ -25,7 +25,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.OutputFileCollection;
@@ -210,4 +210,4 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
             return MainCallParameters.mainWithoutArguments();
         }
     }
-}
+}

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java

@@ -21,7 +21,7 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.psi.PsiFile;
-import jet.Function0;
+import kotlin.Function0;
 import kotlin.modules.AllModules;
 import kotlin.modules.Module;
 import org.jetbrains.annotations.NotNull;
@@ -309,4 +309,4 @@ public class KotlinToJVMBytecodeCompiler {
         }
         return generationState;
     }
-}
+}

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java

@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.kotlin;
 
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vfs.VirtualFile;
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.asm4.ClassReader;
@@ -221,4 +221,4 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
     public String toString() {
         return getClass().getSimpleName() + ": " + file.toString();
     }
-}
+}

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java

@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.descriptors.serialization;
 
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer;
@@ -60,4 +60,4 @@ public abstract class AbstractDescriptorFinder implements DescriptorFinder {
 
     @Nullable
     protected abstract ClassData getClassData(@NotNull ClassId classId);
-}
+}

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java

@@ -17,8 +17,8 @@
 package org.jetbrains.jet.descriptors.serialization;
 
 import gnu.trove.TIntObjectHashMap;
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedTypeParameterDescriptor;
@@ -274,4 +274,4 @@ public class TypeDeserializer {
             return Annotations.EMPTY;
         }
     }
-}
+}

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java

@@ -16,8 +16,8 @@
 
 package org.jetbrains.jet.descriptors.serialization.descriptors;
 
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -580,4 +580,3 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme
         }
     }
 }
-

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java

@@ -16,8 +16,8 @@
 
 package org.jetbrains.jet.descriptors.serialization.descriptors;
 
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.descriptors.serialization.DescriptorDeserializer;
@@ -245,4 +245,4 @@ public abstract class DeserializedMemberScope implements JetScope {
         p.popIndent();
         p.println("}");
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java

@@ -22,7 +22,7 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -1374,4 +1374,4 @@ public class DescriptorResolver {
             }
         }
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java

@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve;
 
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -322,4 +322,4 @@ public class TypeResolver {
         }
         return null;
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.lang.resolve.lazy;
 
 import com.google.common.collect.*;
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetImportDirective;
 import org.jetbrains.jet.lang.psi.JetPsiUtil;
@@ -105,4 +105,4 @@ class ImportsProvider {
             return new NameToImportsCache(namesToRelativeImportsBuilder.build(), ImmutableList.copyOf(processedAllUnderImports));
         }
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java

@@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.lazy;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -323,4 +323,4 @@ public class LazyImportScope implements JetScope, LazyEntity {
         p.popIndent();
         p.println("}");
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java

@@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.context.GlobalContextImpl;
@@ -451,4 +451,4 @@ public class ResolveSession implements KotlinCodeAnalyzer {
     public QualifiedExpressionResolver getQualifiedExpressionResolver() {
         return qualifiedExpressionResolver;
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java

@@ -19,8 +19,8 @@ package org.jetbrains.jet.lang.resolve.lazy;
 import com.google.common.collect.Lists;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;
 import org.jetbrains.jet.lang.psi.*;

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.java

@@ -20,7 +20,7 @@ import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.name.Name;
@@ -104,4 +104,4 @@ public abstract class AbstractPsiBasedDeclarationProvider implements Declaration
     public Collection<JetClassOrObject> getClassOrObjectDeclarations(@NotNull Name name) {
         return index.invoke().classesAndObjects.get(name);
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java

@@ -21,8 +21,8 @@ import com.google.common.collect.*;
 import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetFile;
@@ -148,4 +148,4 @@ public class FileBasedDeclarationProviderFactory implements DeclarationProviderF
 
         return new PsiBasedClassMemberDeclarationProvider(storageManager, classLikeInfo);
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.java

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.lang.resolve.lazy.declarations;
 
 import com.intellij.psi.NavigatablePsiElement;
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetFile;
@@ -84,4 +84,4 @@ public class FileBasedPackageMemberDeclarationProvider extends AbstractPsiBasedD
     public String toString() {
         return "Declarations for package " + fqName;
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java

@@ -19,8 +19,8 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors;
 import com.google.common.collect.Sets;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -287,4 +287,4 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
         p.popIndent();
         p.println("}");
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java

@@ -20,9 +20,9 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import com.intellij.psi.PsiElement;
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
-import jet.Unit;
+import kotlin.Unit;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -523,4 +523,4 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyEnti
     private ScopeProvider getScopeProvider() {
         return resolveSession.getScopeProvider();
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java

@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -395,4 +395,4 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope<LazyClassDescr
         // Do not add details here, they may compromise the laziness during debugging
         return "lazy scope for class " + thisDescriptor.getName();
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java

@@ -16,8 +16,8 @@
 
 package org.jetbrains.jet.lang.types;
 
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
@@ -148,4 +148,4 @@ public class DeferredType implements LazyType {
     public int hashCode() {
         return getActualType().hashCode();
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java

@@ -20,7 +20,7 @@ import com.google.common.collect.Lists;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -398,4 +398,4 @@ public class ClosureExpressionsTypingVisitor extends ExpressionTypingVisitor {
         );
         return result;
     }
-}
+}

compiler/frontend/src/org/jetbrains/jet/storage/LazyResolveStorageManager.java

@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.storage;
 
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 
@@ -29,4 +29,4 @@ public interface LazyResolveStorageManager extends StorageManager {
 
     @NotNull
     BindingTrace createSafeTrace(@NotNull BindingTrace originalTrace);
-}
+}

compiler/frontend/src/org/jetbrains/jet/storage/LockBasedLazyResolveStorageManager.java

@@ -18,9 +18,9 @@ package org.jetbrains.jet.storage;
 
 import com.google.common.collect.ImmutableMap;
 import com.intellij.util.containers.ConcurrentWeakValueHashMap;
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
-import jet.Unit;
+import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -267,4 +267,4 @@ public class LockBasedLazyResolveStorageManager implements LazyResolveStorageMan
             }
         }
     }
-}
+}

compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java

@@ -27,7 +27,7 @@ import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
-import jet.Function1;
+import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.intellij.lang.annotations.Language;
 import org.jetbrains.jet.JetTestUtils;
@@ -196,4 +196,4 @@ public abstract class KotlinIntegrationTestBase {
     protected static File getKotlinProjectHome() {
         return new File(PathManager.getHomePath()).getParentFile();
     }
-}
+}

compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java

@@ -1,8 +1,8 @@
 package org.jetbrains.jet.storage;
 
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
-import jet.Unit;
+import kotlin.Unit;
 import junit.framework.TestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -565,4 +565,4 @@ public class StorageManagerTest extends TestCase {
             throw new UnsupportedOperationException();
         }
     }
-}
+}

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java

@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve.kotlin;
 
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf;
@@ -517,4 +517,4 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
 
         return Annotations.EMPTY;
     }
-}
+}

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractClassDescriptor.java

@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.lang.descriptors.impl;
 
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -147,4 +147,4 @@ public abstract class AbstractClassDescriptor implements ClassDescriptor {
     public <R, D> R accept(DeclarationDescriptorVisitor<R, D> visitor, D data) {
         return visitor.visitClassDescriptor(this, data);
     }
-}
+}

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java

@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.lang.descriptors.impl;
 
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.ReadOnly;
 import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
@@ -271,4 +271,4 @@ public abstract class AbstractLazyTypeParameterDescriptor implements TypeParamet
             return this.getClass().getName() + "@" + System.identityHashCode(this);
         }
     }
-}
+}

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/EnumEntrySyntheticClassDescriptor.java

@@ -16,8 +16,8 @@
 
 package org.jetbrains.jet.lang.descriptors.impl;
 
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -268,4 +268,4 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
             p.println("enum entry scope for " + EnumEntrySyntheticClassDescriptor.this);
         }
     }
-}
+}

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.lang.descriptors.impl;
 
 import com.google.common.collect.Sets;
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor;
@@ -257,4 +257,4 @@ public class TypeParameterDescriptorImpl extends DeclarationDescriptorNonRootImp
         checkInitialized();
         return index;
     }
-}
+}

core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.java

@@ -1,6 +1,6 @@
 package org.jetbrains.jet.lang.types.lang;
 
-import jet.Function0;
+import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.descriptors.serialization.*;
@@ -194,4 +194,4 @@ class BuiltinsPackageFragment extends DeclarationDescriptorImpl implements Packa
             return packageName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) ? classNames.invoke() : Collections.<Name>emptyList();
         }
     }
-}
+}

core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java

@@ -16,9 +16,9 @@
 
 package org.jetbrains.jet.storage;
 
-import jet.Function0;
+import kotlin.Function0;
-import jet.Function1;
+import kotlin.Function1;
-import jet.Unit;
+import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.utils.UtilsPackage;
@@ -421,4 +421,4 @@ public class LockBasedStorageManager implements StorageManager {
         }
     }
 
-}
+}

idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetExpressionMover.java

@@ -9,7 +9,7 @@ import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.*;
@@ -550,4 +550,4 @@ public class JetExpressionMover extends AbstractJetUpDownMover {
             PsiDocumentManager.getInstance(editor.getProject()).doPostponedOperationsAndUnblockDocument(editor.getDocument());
         }
     }
-}
+}

idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java

@@ -7,7 +7,7 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.util.ArrayUtil;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
@@ -59,4 +59,4 @@ public class HierarchyUtils {
         //noinspection unchecked
         return PsiUtilPackage.getParentByTypesAndPredicate(element, false, ArrayUtil.EMPTY_CLASS_ARRAY, IS_OVERRIDE_HIERARCHY_ELEMENT);
     }
-}
+}

idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java

@@ -10,7 +10,7 @@ import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiReference;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.HashMap;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.asJava.LightClassUtil;
@@ -145,4 +145,4 @@ public abstract class KotlinCallTreeStructure extends HierarchyTreeStructure {
     public boolean isAlwaysShowPlus() {
         return true;
     }
-}
+}

idea/src/org/jetbrains/jet/plugin/intentions/declarations/JetDeclarationJoinLinesHandler.java

@@ -5,7 +5,7 @@ import com.intellij.openapi.editor.Document;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.ArrayUtil;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetPsiUtil;
 import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
@@ -33,4 +33,4 @@ public class JetDeclarationJoinLinesHandler implements JoinRawLinesHandlerDelega
     public int tryJoinLines(Document document, PsiFile file, int start, int end) {
         return -1;
     }
-}
+}

idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java

@@ -23,7 +23,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.*;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.di.InjectorForBodyResolve;
@@ -503,4 +503,4 @@ public class ResolveElementCache {
             return true;
         }
     }
-}
+}

idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java

@@ -28,7 +28,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import com.intellij.util.SmartList;
-import jet.Function1;
+import kotlin.Function1;
 import junit.framework.Assert;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
@@ -214,4 +214,4 @@ public abstract class AbstractOverrideImplementTest extends LightCodeInsightFixt
             }
         });
     }
-}
+}

idea/tests/org/jetbrains/jet/plugin/compilerMessages/IDECompilerMessagingTest.java

@@ -25,7 +25,7 @@ import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.PlatformTestCase;
-import jet.Function1;
+import kotlin.Function1;
 import junit.framework.Assert;
 import org.jetbrains.annotations.NotNull;
 
@@ -104,4 +104,4 @@ public abstract class IDECompilerMessagingTest extends PlatformTestCase {
         assert compilers.length == 1;
         return compilers[0];
     }
-}
+}

idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java

@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.plugin.compilerMessages;
 
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.jetbrains.jet.plugin.compiler.K2JvmTranslatingCompiler;
@@ -86,4 +86,4 @@ public final class JetCompilerMessagingTest extends IDECompilerMessagingTest {
         checker.expect(Message.stats().textStartsWith("Using Kotlin home directory"));
         checker.expect(Message.stats().text("Configuring the compilation environment"));
     }
-}
+}

idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java

@@ -20,7 +20,7 @@ import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.util.PathUtil;
-import jet.Function1;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.jetbrains.jet.plugin.compiler.K2JsTranslatingCompiler;
@@ -105,4 +105,4 @@ public final class K2JSCompilerMessagingTest extends IDECompilerMessagingTest {
         checker.expect(info().textStartsWith("Kotlin Compiler version"));
         checker.expect(stats().textMatchesRegexp("Compiling source files: .*/src/test.kt"));
     }
-}
+}