From f447a860b110d46285c7b6e514d0cf0c233e2fcd Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 8 Jan 2015 21:33:35 +0300 Subject: [PATCH] Rename package jet -> kotlin in util.runtime (StorageManager) org.jetbrains.jet.storage -> org.jetbrains.kotlin.storage --- .../jet/codegen/ClassBuilderOnDemand.java | 4 ++-- .../jetbrains/jet/codegen/MemberCodegen.java | 4 ++-- .../jet/codegen/context/CodegenContext.java | 4 ++-- .../IncrementalPackageFragmentProvider.kt | 4 ++-- .../di/InjectorForJavaDescriptorResolver.java | 2 +- .../di/InjectorForLazyResolveWithJava.java | 2 +- .../kotlin/di/InjectorForReplWithJava.java | 2 +- .../di/InjectorForTopDownAnalyzerForJvm.java | 2 +- .../src/org/jetbrains/jet/context/context.kt | 8 +++---- .../impl/MutableClassDescriptor.java | 2 +- .../jet/lang/resolve/AnnotationResolver.java | 2 +- .../lang/resolve/BodiesResolveContext.java | 4 ++-- .../jet/lang/resolve/DescriptorResolver.java | 2 +- .../lang/resolve/TopDownAnalysisContext.java | 4 ++-- .../resolve/TopDownAnalysisParameters.java | 4 ++-- .../jet/lang/resolve/TypeResolver.kt | 4 ++-- .../calls/tasks/ResolutionTaskHolder.kt | 2 +- .../resolve/calls/tasks/TaskPrioritizer.kt | 2 +- .../lang/resolve/lazy/ImportsProvider.java | 6 ++--- .../jet/lang/resolve/lazy/ResolveSession.java | 2 +- .../jet/lang/resolve/lazy/ScopeProvider.java | 6 ++--- .../AbstractDeclarationProviderFactory.java | 6 ++--- .../AbstractPsiBasedDeclarationProvider.kt | 4 ++-- .../CliDeclarationProviderFactoryService.kt | 2 +- .../FileBasedDeclarationProviderFactory.java | 6 ++--- ...leBasedPackageMemberDeclarationProvider.kt | 6 ++--- .../PsiBasedClassMemberDeclarationProvider.kt | 2 +- .../descriptors/AbstractLazyMemberScope.kt | 4 ++-- .../lazy/descriptors/LazyAnnotations.kt | 2 +- .../lazy/descriptors/LazyClassDescriptor.java | 8 +++---- .../lazy/descriptors/LazyClassMemberScope.kt | 6 ++--- .../descriptors/LazyScriptClassMemberScope.kt | 2 +- .../jet/lang/types/DeferredType.java | 6 ++--- .../kotlin/di/InjectorForBodyResolve.java | 2 +- .../kotlin/di/InjectorForLazyBodyResolve.java | 2 +- .../kotlin/di/InjectorForLazyResolve.java | 2 +- .../InjectorForLazyTopDownAnalyzerBasic.java | 2 +- .../kotlin/di/InjectorForMacros.java | 2 +- .../di/InjectorForTopDownAnalyzerBasic.java | 2 +- .../storage/ExceptionTracker.kt | 4 ++-- .../storage/LazyResolveStorageManager.java | 6 ++--- .../LockBasedLazyResolveStorageManager.kt | 6 ++--- .../checkers/AbstractJetDiagnosticsTest.java | 4 ++-- .../jet/checkers/LoggingStorageManager.kt | 12 +++++----- .../serialization/BuiltInsSerializerTest.kt | 2 +- .../jvm/compiler/AbstractLoadJavaTest.java | 4 ++-- .../JetDefaultModalityModifiersTest.java | 4 ++-- .../jetbrains/kotlin/di/InjectorForTests.java | 2 +- .../storage/StorageManagerTest.java | 6 ++--- .../lazy/LazyJavaPackageFragmentProvider.kt | 2 +- .../jet/lang/resolve/java/lazy/context.kt | 2 +- .../lazy/descriptors/LazyJavaMemberScope.kt | 2 +- .../java/lazy/types/LazyJavaTypeResolver.kt | 2 +- ...tBinaryClassAnnotationAndConstantLoader.kt | 4 ++-- ...aryClassAnnotationAndConstantLoaderImpl.kt | 2 +- .../DeserializationComponentsForJava.kt | 2 +- .../impl/AbstractClassDescriptor.java | 6 ++--- .../AbstractLazyTypeParameterDescriptor.java | 2 +- .../impl/AbstractTypeParameterDescriptor.java | 4 ++-- .../descriptors/impl/ClassDescriptorBase.java | 2 +- .../descriptors/impl/ClassDescriptorImpl.java | 2 +- .../EnumEntrySyntheticClassDescriptor.java | 6 ++--- .../impl/TypeParameterDescriptorImpl.java | 2 +- .../impl/VariableDescriptorImpl.java | 2 +- .../lang/resolve/scopes/LazyScopeAdapter.kt | 2 +- .../jet/lang/types/AbstractLazyType.kt | 4 ++-- .../types/lang/BuiltinsPackageFragment.kt | 2 +- .../jet/lang/types/lang/KotlinBuiltIns.java | 2 +- .../serialization/context/context.kt | 2 +- .../descriptors/DeserializedAnnotations.kt | 2 +- .../storage/LockBasedStorageManager.java | 4 ++-- .../{jet => kotlin}/storage/NoLock.java | 6 ++--- .../{jet => kotlin}/storage/StorageManager.kt | 24 +++++++++---------- .../{jet => kotlin}/storage/storage.kt | 12 +++++----- .../lang/resolve/lazy/ElementResolver.java | 4 ++-- .../caches/resolve/ModuleDependencyMapper.kt | 2 +- .../caches/resolve/globalContextUtils.kt | 6 ++--- .../stubBuilder/ClsStubBuilderContext.kt | 4 ++-- .../textBuilder/DeserializerForDecompiler.kt | 2 +- .../plugin/project/ResolveElementCache.java | 4 ++-- .../project/ResolveSessionForBodies.java | 4 ++-- .../PluginDeclarationProviderFactory.kt | 2 +- ...PluginDeclarationProviderFactoryService.kt | 2 +- .../di/InjectorForTopDownAnalyzerForJs.java | 2 +- 84 files changed, 161 insertions(+), 161 deletions(-) rename compiler/frontend/src/org/jetbrains/{jet => kotlin}/storage/ExceptionTracker.kt (94%) rename compiler/frontend/src/org/jetbrains/{jet => kotlin}/storage/LazyResolveStorageManager.java (93%) rename compiler/frontend/src/org/jetbrains/{jet => kotlin}/storage/LockBasedLazyResolveStorageManager.kt (97%) rename compiler/tests/org/jetbrains/{jet => kotlin}/storage/StorageManagerTest.java (99%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/storage/LockBasedStorageManager.java (99%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/storage/NoLock.java (89%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/storage/StorageManager.kt (58%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/storage/storage.kt (68%) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderOnDemand.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderOnDemand.java index a9b065fe99e..e0a0e68b9e1 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderOnDemand.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderOnDemand.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.codegen; import kotlin.Function0; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.storage.LockBasedStorageManager; -import org.jetbrains.jet.storage.NotNullLazyValue; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.storage.NotNullLazyValue; public class ClassBuilderOnDemand extends DelegatingClassBuilder { private final NotNullLazyValue classBuilder; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java index d1603d1ac5a..c90b0cd5c47 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java @@ -40,8 +40,8 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.SpecialNames; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.storage.LockBasedStorageManager; -import org.jetbrains.jet.storage.NotNullLazyValue; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java index a6ca1129fe2..6a1ede559b6 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java @@ -27,8 +27,8 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.storage.LockBasedStorageManager; -import org.jetbrains.jet.storage.NullableLazyValue; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.storage.NullableLazyValue; import org.jetbrains.org.objectweb.asm.Type; import java.util.*; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt index f1440c11dab..30263d72f00 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt @@ -25,12 +25,12 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope import org.jetbrains.jet.descriptors.serialization.* import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList -import org.jetbrains.jet.storage.NotNullLazyValue +import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils import org.jetbrains.jet.lang.resolve.java.JvmClassName import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java index b259d6ca6d3..66268c780b9 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.context.GlobalContextImpl; -import org.jetbrains.jet.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java index 89f5d9a4d7c..964d64d23f5 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java index 1a6faf9b66f..0edae0d09f2 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java index 78bd78cebd6..511631b579c 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; diff --git a/compiler/frontend/src/org/jetbrains/jet/context/context.kt b/compiler/frontend/src/org/jetbrains/jet/context/context.kt index ba4eb0e6f7b..b924996f30a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/context/context.kt +++ b/compiler/frontend/src/org/jetbrains/jet/context/context.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.context -import org.jetbrains.jet.storage.StorageManager -import org.jetbrains.jet.storage.ExceptionTracker -import org.jetbrains.jet.storage.LockBasedStorageManager +import org.jetbrains.kotlin.storage.StorageManager +import org.jetbrains.kotlin.storage.ExceptionTracker +import org.jetbrains.kotlin.storage.LockBasedStorageManager public trait GlobalContext { public val storageManager: StorageManager @@ -52,4 +52,4 @@ deprecated("Used temporarily while we are in transition from to lazy resolve") public class LazyResolveToken : LazinessToken() { deprecated("Used temporarily while we are in transition from to lazy resolve") override fun isLazy() = true -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java index 62e9b4a885d..323add56d1c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationsImpl; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.*; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; import java.util.ArrayList; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java index 222ef60b491..b236a8c6bb6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import javax.inject.Inject; import java.util.HashMap; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java index f7c3c00344b..67e91949c79 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java @@ -29,8 +29,8 @@ import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.storage.ExceptionTracker; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.ExceptionTracker; +import org.jetbrains.kotlin.storage.StorageManager; import java.util.Collection; import java.util.Map; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index c3d0639eb3f..c06ab9cd52c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lexer.JetKeywordToken; import org.jetbrains.jet.lexer.JetModifierKeywordToken; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import javax.inject.Inject; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java index 90b3d0ad981..caac5e4c54d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java @@ -31,8 +31,8 @@ import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; -import org.jetbrains.jet.storage.ExceptionTracker; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.ExceptionTracker; +import org.jetbrains.kotlin.storage.StorageManager; import java.io.PrintStream; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisParameters.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisParameters.java index 53afb090fbc..3098ed6221c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisParameters.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisParameters.java @@ -21,8 +21,8 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.context.LazinessToken; -import org.jetbrains.jet.storage.ExceptionTracker; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.ExceptionTracker; +import org.jetbrains.kotlin.storage.StorageManager; /** * Various junk that cannot be placed into context (yet). diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt index 730e5a3dd87..93229841894 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt @@ -23,14 +23,14 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.scopes.LazyScopeAdapter import org.jetbrains.jet.lang.types.* import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.storage.LockBasedStorageManager +import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.jet.lang.diagnostics.Errors.* import org.jetbrains.jet.lang.resolve.PossiblyBareType.type import org.jetbrains.jet.lang.types.Variance.* import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider import kotlin.platform.platformStatic -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.context.LazinessToken import org.jetbrains.jet.lang.resolve.lazy.LazyEntity import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt index 933b063176c..8708a23dc03 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.calls.tasks import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.jet.lang.psi.JetPsiUtil import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import java.util.ArrayList import org.jetbrains.kotlin.utils.toReadOnlyList diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt index d0ff7622e78..53b79b43dab 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt @@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.types.* import org.jetbrains.jet.lang.types.checker.JetTypeChecker import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext import java.util.ArrayList diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java index c3f3fda7a51..ff3eddb1247 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.JetImportDirective; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.storage.NotNullLazyValue; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.NotNullLazyValue; +import org.jetbrains.kotlin.storage.StorageManager; import java.util.List; import java.util.Set; @@ -104,4 +104,4 @@ class ImportsProvider { return new NameToImportsCache(namesToRelativeImportsBuilder.build(), ImmutableList.copyOf(processedAllUnderImports)); } } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java index 0fb5f9e3380..8b9f51aa67a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java @@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.renderer.DescriptorRenderer; -import org.jetbrains.jet.storage.*; +import org.jetbrains.kotlin.storage.*; import javax.inject.Inject; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java index 2c74bd30d99..fcc6efa707c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java @@ -31,8 +31,8 @@ import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.ChainedScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.storage.MemoizedFunctionToNotNull; -import org.jetbrains.jet.storage.NotNullLazyValue; +import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; +import org.jetbrains.kotlin.storage.NotNullLazyValue; import javax.inject.Inject; import java.util.ArrayList; @@ -198,4 +198,4 @@ public class ScopeProvider { throw new IllegalStateException("Don't call this method for local declarations: " + jetDeclaration + "\n" + JetPsiUtil.getElementTextWithContext(jetDeclaration)); } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java index 0e841295d62..bdf24712539 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java @@ -20,9 +20,9 @@ import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.storage.LockBasedStorageManager; -import org.jetbrains.jet.storage.MemoizedFunctionToNullable; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.storage.MemoizedFunctionToNullable; +import org.jetbrains.kotlin.storage.StorageManager; public abstract class AbstractDeclarationProviderFactory implements DeclarationProviderFactory { private final MemoizedFunctionToNullable packageDeclarationProviders; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt index daebe141cb3..1ea01e1e3c8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.resolve.lazy.data.JetClassInfoUtil import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils.safeNameForLazyResolve import java.util.ArrayList @@ -83,4 +83,4 @@ public abstract class AbstractPsiBasedDeclarationProvider(storageManager: Storag override fun getClassOrObjectDeclarations(name: Name): Collection = index().classesAndObjects[ResolveSessionUtils.safeNameForLazyResolve(name)] -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CliDeclarationProviderFactoryService.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CliDeclarationProviderFactoryService.kt index 876f4086c2d..4e124a7e5db 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CliDeclarationProviderFactoryService.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CliDeclarationProviderFactoryService.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.utils.sure import java.util.ArrayList diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java index 17f9c8eab1f..8bd48480f1b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java @@ -28,8 +28,8 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetPackageDirective; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.storage.NotNullLazyValue; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.NotNullLazyValue; +import org.jetbrains.kotlin.storage.StorageManager; import java.util.Collection; import java.util.Set; @@ -106,4 +106,4 @@ public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProv return new PsiBasedClassMemberDeclarationProvider(storageManager, classLikeInfo); } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt index 8918c56d67c..dc707c85628 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt @@ -20,8 +20,8 @@ import kotlin.Function0 import org.jetbrains.jet.lang.psi.JetDeclaration import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.storage.NotNullLazyValue -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.NotNullLazyValue +import org.jetbrains.kotlin.storage.StorageManager public class FileBasedPackageMemberDeclarationProvider internal( storageManager: StorageManager, @@ -48,4 +48,4 @@ public class FileBasedPackageMemberDeclarationProvider internal( override fun getPackageFiles() = packageFiles override fun toString() = "Declarations for package $fqName" -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt index 5b4518a08f5..43cd225de2b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations import org.jetbrains.jet.lang.psi.* -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo public class PsiBasedClassMemberDeclarationProvider( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index 01e54f51f29..e9cdc234b37 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -28,11 +28,11 @@ import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProvider import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.storage.MemoizedFunctionToNotNull +import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull import org.jetbrains.kotlin.utils.Printer import java.util.* -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.utils.toReadOnlyList import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyAnnotations.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyAnnotations.kt index 76615369400..09d684c252d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyAnnotations.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyAnnotations.kt @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.AnnotationResolver import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.scopes.JetScope diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java index 9dd1e93ad3b..81f414fe0e4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -51,10 +51,10 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.storage.MemoizedFunctionToNotNull; -import org.jetbrains.jet.storage.NotNullLazyValue; -import org.jetbrains.jet.storage.NullableLazyValue; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; +import org.jetbrains.kotlin.storage.NotNullLazyValue; +import org.jetbrains.kotlin.storage.NullableLazyValue; +import org.jetbrains.kotlin.storage.StorageManager; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt index c013f5f43dc..3298769bd22 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt @@ -30,14 +30,14 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.types.DeferredType import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.storage.NullableLazyValue +import org.jetbrains.kotlin.storage.NullableLazyValue import java.util.* import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.DELEGATION import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.FAKE_OVERRIDE import org.jetbrains.jet.lang.resolve.DelegationResolver.generateDelegatedMembers -import org.jetbrains.jet.storage.NotNullLazyValue +import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker @@ -317,4 +317,4 @@ public open class LazyClassMemberScope(resolveSession: ResolveSession, } } } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt index c1f4491c157..f0bf0c39687 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.resolve.lazy.ResolveSession import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo import org.jetbrains.jet.lang.resolve.lazy.declarations.ClassMemberDeclarationProvider import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.storage.NotNullLazyValue +import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.kotlin.utils.toReadOnlyList // SCRIPT: Members of a script class diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java index f9a5398f84e..e5e8ec9eae1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java @@ -20,8 +20,8 @@ import kotlin.Function0; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.storage.NotNullLazyValue; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.NotNullLazyValue; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.util.Box; import org.jetbrains.jet.util.ReenteringLazyValueComputationException; @@ -100,4 +100,4 @@ public class DeferredType extends DelegatingType implements LazyType { return ""; } } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java index 66a3eb3cd19..52a67933442 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java index a4f5e32dea2..2d8c256e606 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java index 2305348d51e..4bcb78d8ecc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java index 2361b15f760..eba92a8b646 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java index ea5327bc083..d5a050ab38e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider.Empty; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.TypeResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java index e170a3fe0cb..3382db691b0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; diff --git a/compiler/frontend/src/org/jetbrains/jet/storage/ExceptionTracker.kt b/compiler/frontend/src/org/jetbrains/kotlin/storage/ExceptionTracker.kt similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/storage/ExceptionTracker.kt rename to compiler/frontend/src/org/jetbrains/kotlin/storage/ExceptionTracker.kt index 5d3bbc51cfc..6d993a570a8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/storage/ExceptionTracker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/storage/ExceptionTracker.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.storage +package org.jetbrains.kotlin.storage import com.intellij.openapi.util.ModificationTracker import java.util.concurrent.atomic.AtomicLong diff --git a/compiler/frontend/src/org/jetbrains/jet/storage/LazyResolveStorageManager.java b/compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/storage/LazyResolveStorageManager.java rename to compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java index 66b1af004d5..e16e8e174a0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/storage/LazyResolveStorageManager.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.storage; +package org.jetbrains.kotlin.storage; import kotlin.Function1; import org.jetbrains.annotations.NotNull; @@ -29,4 +29,4 @@ public interface LazyResolveStorageManager extends StorageManager { @NotNull BindingTrace createSafeTrace(@NotNull BindingTrace originalTrace); -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/storage/LockBasedLazyResolveStorageManager.kt b/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/storage/LockBasedLazyResolveStorageManager.kt rename to compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt index 4b4d4e22d27..3d781488595 100644 --- a/compiler/frontend/src/org/jetbrains/jet/storage/LockBasedLazyResolveStorageManager.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.storage +package org.jetbrains.kotlin.storage import com.intellij.util.containers.ConcurrentWeakValueHashMap import org.jetbrains.annotations.TestOnly @@ -69,4 +69,4 @@ public class LockBasedLazyResolveStorageManager(private val storageManager: Stor storageManager.compute { trace.report(diagnostic) } } } -} \ No newline at end of file +} diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index d2255b7c027..c76c1edbeda 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -49,8 +49,8 @@ import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.storage.ExceptionTracker; -import org.jetbrains.jet.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.storage.ExceptionTracker; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.jet.test.util.DescriptorValidator; import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/compiler/tests/org/jetbrains/jet/checkers/LoggingStorageManager.kt b/compiler/tests/org/jetbrains/jet/checkers/LoggingStorageManager.kt index c4037cf9a61..838204df6c9 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/LoggingStorageManager.kt +++ b/compiler/tests/org/jetbrains/jet/checkers/LoggingStorageManager.kt @@ -17,12 +17,12 @@ package org.jetbrains.jet.checkers import org.jetbrains.jet.checkers.LoggingStorageManager.CallData -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import java.lang.reflect.* -import org.jetbrains.jet.storage.MemoizedFunctionToNotNull -import org.jetbrains.jet.storage.MemoizedFunctionToNullable -import org.jetbrains.jet.storage.NotNullLazyValue -import org.jetbrains.jet.storage.NullableLazyValue +import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull +import org.jetbrains.kotlin.storage.MemoizedFunctionToNullable +import org.jetbrains.kotlin.storage.NotNullLazyValue +import org.jetbrains.kotlin.storage.NullableLazyValue import java.util.concurrent.ConcurrentMap public class LoggingStorageManager( @@ -174,4 +174,4 @@ public class LoggingStorageManager( override fun compute(computable: () -> T): T { return delegate.compute(computable.logged) } -} \ No newline at end of file +} diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt index b749051a820..f17b9aaee52 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.serialization.builtins.BuiltInsSerializer import org.jetbrains.jet.test.TestCaseWithTmpdir import org.jetbrains.jet.lang.types.lang.BuiltinsPackageFragment import org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME -import org.jetbrains.jet.storage.LockBasedStorageManager +import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.jet.JetTestUtils import java.io.FileInputStream import org.jetbrains.jet.test.util.RecursiveDescriptorComparator diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index d77fa72b196..cf3743b9c90 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -41,8 +41,8 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; -import org.jetbrains.jet.storage.ExceptionTracker; -import org.jetbrains.jet.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.storage.ExceptionTracker; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.jet.test.util.DescriptorValidator; import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index 5a62486ef21..633ce08a967 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -36,8 +36,8 @@ import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.storage.ExceptionTracker; -import org.jetbrains.jet.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.storage.ExceptionTracker; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; diff --git a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java index cc85f2f6dce..649e41e6639 100644 --- a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; diff --git a/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java b/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java rename to compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java index 525eb57cf5d..f74a2f38ea8 100644 --- a/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java +++ b/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.storage; +package org.jetbrains.kotlin.storage; +import junit.framework.TestCase; import kotlin.Function0; import kotlin.Function1; import kotlin.Unit; -import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.util.ReenteringLazyValueComputationException; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt index fe0483b5efb..1832452971e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.java.lazy import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.storage.MemoizedFunctionToNullable +import org.jetbrains.kotlin.storage.MemoizedFunctionToNullable import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.resolve.java.structure.JavaClass import org.jetbrains.jet.lang.descriptors.ClassDescriptor diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/context.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/context.kt index 19aec813029..9fe689f7d9e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/context.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/context.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.java.lazy -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeResolver import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt index deaece5fe5b..ca796dc05e6 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.storage.NotNullLazyValue +import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt index 22e6232db18..751bf845d23 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.kotlin.utils.sure import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.java.lazy.* -import org.jetbrains.jet.storage.* +import org.jetbrains.kotlin.storage.* import java.util.HashSet import org.jetbrains.jet.lang.types.checker.JetTypeChecker import org.jetbrains.jet.lang.resolve.java.PLATFORM_TYPES diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt index 41796e957b8..d91fde6a86c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.descriptors.serialization.ProtoBuf import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.* import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter import org.jetbrains.jet.lang.resolve.name.FqName import java.util.HashMap @@ -284,4 +284,4 @@ private fun getCallableSignature( } } return null -} \ No newline at end of file +} diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt index 76fdda6979a..740c93b821a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass.AnnotationArrayArgumentVisitor import org.jetbrains.jet.lang.types.ErrorUtils import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.javaClassIdToKotlinClassId -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import java.util.* import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.name.ClassId diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt index 1aab8b08c64..fe987fede7b 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.kotlin -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider import org.jetbrains.jet.lang.descriptors.ModuleDescriptor import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractClassDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractClassDescriptor.java index 1633b3c8762..7ddc2870d6a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractClassDescriptor.java @@ -25,8 +25,8 @@ import org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.SubstitutingScope; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.storage.NotNullLazyValue; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.NotNullLazyValue; +import org.jetbrains.kotlin.storage.StorageManager; import java.util.List; import java.util.Map; @@ -144,4 +144,4 @@ public abstract class AbstractClassDescriptor implements ClassDescriptor { public R accept(DeclarationDescriptorVisitor visitor, D data) { return visitor.visitClassDescriptor(this, data); } -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java index ac267d1dbc5..930afa607df 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.Variance; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import java.util.Collection; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractTypeParameterDescriptor.java index 91859baedf8..db320b44cd7 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractTypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractTypeParameterDescriptor.java @@ -30,8 +30,8 @@ import org.jetbrains.jet.lang.resolve.scopes.LazyScopeAdapter; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.storage.NotNullLazyValue; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.NotNullLazyValue; +import org.jetbrains.kotlin.storage.StorageManager; import java.util.Collections; import java.util.Set; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java index 99e380f331a..c6736c1b095 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.SourceElement; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; public abstract class ClassDescriptorBase extends AbstractClassDescriptor { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java index fe0aa656ae9..c4c9499afa0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.scopes.StaticScopeForKotlinClass; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.TypeConstructorImpl; -import org.jetbrains.jet.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; import java.util.Collection; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/EnumEntrySyntheticClassDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/EnumEntrySyntheticClassDescriptor.java index 1476478a6a5..2aa603bb7bf 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/EnumEntrySyntheticClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/EnumEntrySyntheticClassDescriptor.java @@ -33,9 +33,9 @@ import org.jetbrains.jet.lang.resolve.scopes.StaticScopeForKotlinClass; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.TypeConstructorImpl; -import org.jetbrains.jet.storage.MemoizedFunctionToNotNull; -import org.jetbrains.jet.storage.NotNullLazyValue; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; +import org.jetbrains.kotlin.storage.NotNullLazyValue; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.utils.Printer; import java.util.Collection; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java index fc96f9ce9b8..5449fc19e65 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.TypeConstructorImpl; import org.jetbrains.jet.lang.types.Variance; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/VariableDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/VariableDescriptorImpl.java index 02f5544325a..9325c52e0e0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/VariableDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/VariableDescriptorImpl.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.storage.NullableLazyValue; +import org.jetbrains.kotlin.storage.NullableLazyValue; import java.util.Collections; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.kt index bb30e5d6e1a..cd5dd53455b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.scopes -import org.jetbrains.jet.storage.NotNullLazyValue +import org.jetbrains.kotlin.storage.NotNullLazyValue public class LazyScopeAdapter(private val scope: NotNullLazyValue) : AbstractScopeAdapter() { override val workerScope: JetScope diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractLazyType.kt b/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractLazyType.kt index b401f64aca0..4f3ac45d935 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractLazyType.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractLazyType.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.types -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.descriptors.annotations.Annotations @@ -52,4 +52,4 @@ public abstract class AbstractLazyType(storageManager: StorageManager) : Abstrac } return super.toString() } -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt index 9da81a31a5b..3f68f8cacb9 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider import org.jetbrains.jet.lang.descriptors.PackageFragmentProviderImpl import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl import org.jetbrains.jet.lang.resolve.name.* -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import java.io.InputStream import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents import com.google.protobuf.ExtensionRegistryLite diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index c37e5ec2295..2c999ed5fae 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; import java.io.InputStream; import java.util.*; diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt index 6ad22545287..0b799118937 100644 --- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.descriptors.serialization.context -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.descriptors.serialization.* import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationAndConstantLoader diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedAnnotations.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedAnnotations.kt index 7f1a8131895..2160766b128 100644 --- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedAnnotations.kt +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedAnnotations.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.descriptors.serialization.descriptors import org.jetbrains.kotlin.utils.toReadOnlyList -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor import org.jetbrains.jet.lang.descriptors.annotations.Annotations import org.jetbrains.jet.lang.resolve.name.FqName diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java similarity index 99% rename from core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java rename to core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java index 85d677aebb7..550ca3024f2 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java +++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.storage; +package org.jetbrains.kotlin.storage; import kotlin.Function0; import kotlin.Function1; diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/NoLock.java b/core/util.runtime/src/org/jetbrains/kotlin/storage/NoLock.java similarity index 89% rename from core/util.runtime/src/org/jetbrains/jet/storage/NoLock.java rename to core/util.runtime/src/org/jetbrains/kotlin/storage/NoLock.java index 063aa73d333..b2eca0a0974 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/NoLock.java +++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/NoLock.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.storage; +package org.jetbrains.kotlin.storage; import org.jetbrains.annotations.NotNull; @@ -49,7 +49,7 @@ import java.util.concurrent.locks.Lock; } @Override - public boolean tryLock(long time, TimeUnit unit) throws InterruptedException { + public boolean tryLock(long time, @NotNull TimeUnit unit) throws InterruptedException { throw new UnsupportedOperationException("Should not be called"); } diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/StorageManager.kt b/core/util.runtime/src/org/jetbrains/kotlin/storage/StorageManager.kt similarity index 58% rename from core/util.runtime/src/org/jetbrains/jet/storage/StorageManager.kt rename to core/util.runtime/src/org/jetbrains/kotlin/storage/StorageManager.kt index 9f1774de026..5bfaf29d543 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/StorageManager.kt +++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/StorageManager.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.storage +package org.jetbrains.kotlin.storage import java.util.concurrent.ConcurrentMap @@ -27,17 +27,17 @@ public trait StorageManager { * NOTE: if compute() has side-effects the WEAK reference kind is dangerous: the side-effects will be repeated if * the value gets collected and then re-computed */ - public fun createMemoizedFunction(compute: (K) -> V): MemoizedFunctionToNotNull + public fun createMemoizedFunction(compute: (K) -> V): MemoizedFunctionToNotNull - public fun createMemoizedFunctionWithNullableValues(compute: (K) -> V?): MemoizedFunctionToNullable + public fun createMemoizedFunctionWithNullableValues(compute: (K) -> V?): MemoizedFunctionToNullable - public fun createMemoizedFunction(compute: (K) -> V, map: ConcurrentMap): MemoizedFunctionToNotNull + public fun createMemoizedFunction(compute: (K) -> V, map: ConcurrentMap): MemoizedFunctionToNotNull - public fun createMemoizedFunctionWithNullableValues(compute: (K) -> V, map: ConcurrentMap): MemoizedFunctionToNullable + public fun createMemoizedFunctionWithNullableValues(compute: (K) -> V, map: ConcurrentMap): MemoizedFunctionToNullable - public fun createLazyValue(computable: () -> T): NotNullLazyValue + public fun createLazyValue(computable: () -> T): NotNullLazyValue - public fun createRecursionTolerantLazyValue(computable: () -> T, onRecursiveCall: T): NotNullLazyValue + public fun createRecursionTolerantLazyValue(computable: () -> T, onRecursiveCall: T): NotNullLazyValue /** * @param onRecursiveCall is called if the computation calls itself recursively. @@ -46,17 +46,17 @@ public trait StorageManager { * otherwise it's executed and its result is returned * @param postCompute is called after the value is computed, but before any other thread sees it */ - public fun createLazyValueWithPostCompute(computable: () -> T, onRecursiveCall: ((Boolean) -> T)?, postCompute: (T) -> Unit): NotNullLazyValue + public fun createLazyValueWithPostCompute(computable: () -> T, onRecursiveCall: ((Boolean) -> T)?, postCompute: (T) -> Unit): NotNullLazyValue - public fun createNullableLazyValue(computable: () -> T?): NullableLazyValue + public fun createNullableLazyValue(computable: () -> T?): NullableLazyValue - public fun createRecursionTolerantNullableLazyValue(computable: () -> T?, onRecursiveCall: T?): NullableLazyValue + public fun createRecursionTolerantNullableLazyValue(computable: () -> T?, onRecursiveCall: T?): NullableLazyValue /** * {@code postCompute} is called after the value is computed, but before any other thread sees it (the current thread may * see it in between) */ - public fun createNullableLazyValueWithPostCompute(computable: () -> T?, postCompute: (T?) -> Unit): NullableLazyValue + public fun createNullableLazyValueWithPostCompute(computable: () -> T?, postCompute: (T?) -> Unit): NullableLazyValue public fun compute(computable: () -> T): T } diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/storage.kt b/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt similarity index 68% rename from core/util.runtime/src/org/jetbrains/jet/storage/storage.kt rename to core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt index 81b8407809e..9db570efed8 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/storage.kt +++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/storage.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.storage +package org.jetbrains.kotlin.storage -public trait MemoizedFunctionToNotNull : Function1 -public trait MemoizedFunctionToNullable : Function1 +public trait MemoizedFunctionToNotNull : Function1 +public trait MemoizedFunctionToNullable : Function1 -public trait NotNullLazyValue : Function0 { +public trait NotNullLazyValue : Function0 { public fun isComputed(): Boolean } -public trait NullableLazyValue : Function0 { +public trait NullableLazyValue : Function0 { public fun isComputed(): Boolean } diff --git a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java index 457e424038e..6b756683860 100644 --- a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java +++ b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java @@ -40,8 +40,8 @@ import org.jetbrains.jet.lang.resolve.scopes.ChainedScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.TypeUtils; -import org.jetbrains.jet.storage.ExceptionTracker; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.ExceptionTracker; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.di.InjectorForBodyResolve; import java.util.Collection; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt index 6da2d852e19..0b68e84e2ea 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt @@ -28,7 +28,7 @@ import com.intellij.openapi.roots.JdkOrderEntry import org.jetbrains.jet.analyzer.AnalyzerFacade import org.jetbrains.jet.analyzer.ResolverForModule import org.jetbrains.jet.lang.psi.* -import org.jetbrains.jet.storage.ExceptionTracker +import org.jetbrains.kotlin.storage.ExceptionTracker import org.jetbrains.jet.lang.resolve.java.structure.JavaClass import org.jetbrains.jet.analyzer.ResolverForProject import org.jetbrains.jet.analyzer.ModuleContent diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/globalContextUtils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/globalContextUtils.kt index 11e3c929d0f..0033a5218f9 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/globalContextUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/globalContextUtils.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.plugin.caches.resolve import org.jetbrains.jet.context.GlobalContextImpl -import org.jetbrains.jet.storage.LockBasedStorageManager -import org.jetbrains.jet.storage.ExceptionTracker +import org.jetbrains.kotlin.storage.LockBasedStorageManager +import org.jetbrains.kotlin.storage.ExceptionTracker import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.openapi.diagnostic.Logger @@ -51,4 +51,4 @@ private class ExceptionTrackerWithProcessCanceledReport() : ExceptionTracker() { public fun GlobalContext(logProcessCanceled: Boolean): GlobalContextImpl { val tracker = if (logProcessCanceled) ExceptionTrackerWithProcessCanceledReport() else ExceptionTracker() return GlobalContextImpl(LockBasedStorageManager.createWithExceptionHandling(tracker), tracker) -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt index 1989d6234aa..c16c619ee6e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter import org.jetbrains.jet.lang.resolve.kotlin.AbstractBinaryClassAnnotationAndConstantLoader import org.jetbrains.jet.lang.resolve.name.ClassId -import org.jetbrains.jet.storage.LockBasedStorageManager +import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass import org.jetbrains.jet.lang.resolve.name.SpecialNames @@ -106,4 +106,4 @@ class AnnotationLoaderForStubBuilder( result.add(annotationClassId) return null } -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt index 8c60cd9f34b..a1ee72e0dcf 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor import org.jetbrains.jet.lang.resolve.kotlin.* import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.storage.LockBasedStorageManager +import org.jetbrains.kotlin.storage.LockBasedStorageManager import java.util.Collections import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java index c57f78e441b..17187a03443 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java @@ -31,8 +31,8 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.*; import org.jetbrains.jet.plugin.stubindex.JetProbablyNothingFunctionShortNameIndex; import org.jetbrains.jet.plugin.stubindex.JetProbablyNothingPropertyShortNameIndex; -import org.jetbrains.jet.storage.LazyResolveStorageManager; -import org.jetbrains.jet.storage.MemoizedFunctionToNotNull; +import org.jetbrains.kotlin.storage.LazyResolveStorageManager; +import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; import java.util.Collection; import java.util.HashSet; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java index b2c24375844..2c4a7327c8d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java @@ -30,8 +30,8 @@ import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.storage.ExceptionTracker; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.ExceptionTracker; +import org.jetbrains.kotlin.storage.StorageManager; import java.util.Collection; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactory.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactory.kt index 4fb7f5a48b4..402a1a052ea 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactory.kt @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo import org.jetbrains.jet.lang.resolve.lazy.declarations.* import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil public class PluginDeclarationProviderFactory( diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactoryService.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactoryService.kt index b8fb2317322..51ad019d38e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactoryService.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactoryService.kt @@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService -import org.jetbrains.jet.storage.StorageManager +import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope import org.jetbrains.jet.plugin.caches.resolve.JsProjectDetector diff --git a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java index 79c16678e89..936c605f17f 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.storage.StorageManager; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;