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

2014-03-02 21:33:22 +04:00
parent 6eae950812
commit d04ee09636
43 changed files with 101 additions and 102 deletions
@@ -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);
    }
-}
+}
@@ -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;
        }
    }
-}
+}
@@ -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();
        }
    }
-}
+}
@@ -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;
    }
-}
+}
@@ -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();
    }
-}
+}
@@ -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);
-}
+}
@@ -17,8 +17,8 @@
 package org.jetbrains.jet.descriptors.serialization;

 import gnu.trove.TIntObjectHashMap;
-import jet.Function0;
-import jet.Function1;
+import kotlin.Function0;
+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;
        }
    }
-}
+}
@@ -16,8 +16,8 @@

 package org.jetbrains.jet.descriptors.serialization.descriptors;

-import jet.Function0;
-import jet.Function1;
+import kotlin.Function0;
+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
        }
    }
 }
-
@@ -16,8 +16,8 @@

 package org.jetbrains.jet.descriptors.serialization.descriptors;

-import jet.Function0;
-import jet.Function1;
+import kotlin.Function0;
+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("}");
    }
-}
+}
@@ -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 {
            }
        }
    }
-}
+}
@@ -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;
    }
-}
+}
@@ -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));
        }
    }
-}
+}
@@ -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 jet.Function1;
+import kotlin.Function0;
+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("}");
    }
-}
+}
@@ -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;
    }
-}
+}
@@ -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 jet.Function1;
+import kotlin.Function0;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;
 import org.jetbrains.jet.lang.psi.*;
@@ -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);
    }
-}
+}
@@ -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 jet.Function1;
+import kotlin.Function0;
+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);
    }
-}
+}
@@ -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;
    }
-}
+}
@@ -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 jet.Function1;
+import kotlin.Function0;
+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("}");
    }
-}
+}
@@ -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 jet.Function1;
-import jet.Unit;
+import kotlin.Function0;
+import kotlin.Function1;
+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();
    }
-}
+}
@@ -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();
    }
-}
+}
@@ -16,8 +16,8 @@

 package org.jetbrains.jet.lang.types;

-import jet.Function0;
-import jet.Function1;
+import kotlin.Function0;
+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();
    }
-}
+}
@@ -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;
    }
-}
+}
@@ -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);
-}
+}
@@ -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 jet.Function1;
-import jet.Unit;
+import kotlin.Function0;
+import kotlin.Function1;
+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
            }
        }
    }
-}
+}
@@ -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();
    }
-}
+}
@@ -1,8 +1,8 @@
 package org.jetbrains.jet.storage;

-import jet.Function0;
-import jet.Function1;
-import jet.Unit;
+import kotlin.Function0;
+import kotlin.Function1;
+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();
        }
    }
-}
+}