From 71dd3aaf862b48d869a65c8b924e306921204591 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 22 Jan 2014 18:33:10 +0400 Subject: [PATCH] Rename: LazyDescriptor -> LazyEntity --- .../jet/lang/resolve/lazy/ForceResolveUtil.java | 10 +++++----- .../lazy/{LazyDescriptor.java => LazyEntity.java} | 2 +- .../resolve/lazy/descriptors/LazyClassDescriptor.java | 7 +++---- .../lazy/descriptors/LazyPackageDescriptor.java | 4 ++-- .../lazy/descriptors/LazyTypeParameterDescriptor.java | 4 ++-- 5 files changed, 13 insertions(+), 14 deletions(-) rename compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/{LazyDescriptor.java => LazyEntity.java} (95%) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ForceResolveUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ForceResolveUtil.java index fef931bf15a..c2ee69a0ebe 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ForceResolveUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ForceResolveUtil.java @@ -25,9 +25,9 @@ public class ForceResolveUtil { private ForceResolveUtil() {} public static void forceResolveAllContents(@NotNull DeclarationDescriptor descriptor) { - if (descriptor instanceof LazyDescriptor) { - LazyDescriptor lazyDescriptor = (LazyDescriptor) descriptor; - lazyDescriptor.forceResolveAllContents(); + if (descriptor instanceof LazyEntity) { + LazyEntity lazyEntity = (LazyEntity) descriptor; + lazyEntity.forceResolveAllContents(); } } @@ -38,8 +38,8 @@ public class ForceResolveUtil { } public static void forceResolveAllContents(@NotNull TypeConstructor typeConstructor) { - if (typeConstructor instanceof LazyDescriptor) { - LazyDescriptor lazyConstructor = (LazyDescriptor) typeConstructor; + if (typeConstructor instanceof LazyEntity) { + LazyEntity lazyConstructor = (LazyEntity) typeConstructor; lazyConstructor.forceResolveAllContents(); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyEntity.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyDescriptor.java rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyEntity.java index a187cd6d52c..4c16dfd2a44 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyEntity.java @@ -16,6 +16,6 @@ package org.jetbrains.jet.lang.resolve.lazy; -public interface LazyDescriptor { +public interface LazyEntity { void forceResolveAllContents(); } 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 9c778461c4d..55ff4757354 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 @@ -26,7 +26,6 @@ import jet.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorBase; import org.jetbrains.jet.lang.psi.*; @@ -34,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; -import org.jetbrains.jet.lang.resolve.lazy.LazyDescriptor; +import org.jetbrains.jet.lang.resolve.lazy.LazyEntity; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassInfoUtil; @@ -57,7 +56,7 @@ import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isSyntheticClassObj import static org.jetbrains.jet.lang.resolve.ModifiersChecker.*; import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName; -public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDescriptor, ClassDescriptor { +public class LazyClassDescriptor extends ClassDescriptorBase implements LazyEntity, ClassDescriptor { private static final Predicate VALID_SUPERTYPE = new Predicate() { @Override public boolean apply(JetType type) { @@ -340,7 +339,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc getVisibility(); } - private class LazyClassTypeConstructor implements LazyDescriptor, TypeConstructor { + private class LazyClassTypeConstructor implements LazyEntity, TypeConstructor { private final NotNullLazyValue> supertypes = resolveSession.getStorageManager().createLazyValueWithPostCompute( new Function0>() { @Override diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java index c66350ca715..9927610f222 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java @@ -22,14 +22,14 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorImpl; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; -import org.jetbrains.jet.lang.resolve.lazy.LazyDescriptor; +import org.jetbrains.jet.lang.resolve.lazy.LazyEntity; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.TypeSubstitutor; -public class LazyPackageDescriptor extends DeclarationDescriptorImpl implements LazyDescriptor, PackageFragmentDescriptor { +public class LazyPackageDescriptor extends DeclarationDescriptorImpl implements LazyEntity, PackageFragmentDescriptor { private final ResolveSession resolveSession; private final ModuleDescriptor module; private final JetScope memberScope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java index cbc50f6de1e..54af3a89c63 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.impl.AbstractLazyTypeParameterDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.lazy.LazyDescriptor; +import org.jetbrains.jet.lang.resolve.lazy.LazyEntity; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils; import org.jetbrains.jet.lang.types.JetType; @@ -32,7 +32,7 @@ import org.jetbrains.jet.lexer.JetTokens; import java.util.Set; -public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescriptor implements TypeParameterDescriptor, LazyDescriptor { +public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescriptor implements TypeParameterDescriptor, LazyEntity { private final ResolveSession resolveSession; private final JetTypeParameter jetTypeParameter;