azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename: MembersByNameCache -> MembersCache

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-19 18:05:41 +04:00
parent 56a452139f
commit 334c7d237d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersByNameCache.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersCache.java
+3 -3
View File
@@ -29,7 +29,7 @@ import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public final class MembersByNameCache { public final class MembersCache {
@NotNull @NotNull
private final Map<Name, NamedMembers> namedMembersMap = new HashMap<Name, NamedMembers>(); private final Map<Name, NamedMembers> namedMembersMap = new HashMap<Name, NamedMembers>();
@@ -55,13 +55,13 @@ public final class MembersByNameCache {
} }
@NotNull @NotNull
public static MembersByNameCache buildMembersByNameCache( public static MembersCache buildMembersByNameCache(
@Nullable PsiClass psiClass, @Nullable PsiClass psiClass,
@Nullable PsiPackage psiPackage, @Nullable PsiPackage psiPackage,
boolean staticMembers, boolean staticMembers,
boolean isKotlin boolean isKotlin
) { ) {
MembersByNameCache cache = new MembersByNameCache(); MembersCache cache = new MembersCache();
if (psiClass != null) { if (psiClass != null) {
cache.new ClassProcessor(new PsiClassWrapper(psiClass), staticMembers, isKotlin).process(); cache.new ClassProcessor(new PsiClassWrapper(psiClass), staticMembers, isKotlin).process();
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverScopeData.java
+4 -4
View File
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils; import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils;
import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.MembersByNameCache; import org.jetbrains.jet.lang.resolve.java.MembersCache;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.Name;
@@ -118,12 +118,12 @@ public abstract class ResolverScopeData {
} }
} }
private MembersByNameCache membersCache = null; private MembersCache membersCache = null;
@NotNull @NotNull
public MembersByNameCache getMembersCache() { public MembersCache getMembersCache() {
if (membersCache == null) { if (membersCache == null) {
membersCache = MembersByNameCache.buildMembersByNameCache(psiClass, psiPackage, staticMembers, kotlin); membersCache = MembersCache.buildMembersByNameCache(psiClass, psiPackage, staticMembers, kotlin);
} }
return membersCache; return membersCache;
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+1 -1
View File
@@ -221,7 +221,7 @@ public final class JavaFunctionResolver {
@NotNull @NotNull
public Set<FunctionDescriptor> resolveFunctionGroup(Name methodName, ResolverScopeData scopeData) { public Set<FunctionDescriptor> resolveFunctionGroup(Name methodName, ResolverScopeData scopeData) {
MembersByNameCache namedMembersMap = scopeData.getMembersCache(); MembersCache namedMembersMap = scopeData.getMembersCache();
NamedMembers namedMembers = namedMembersMap.get(methodName); NamedMembers namedMembers = namedMembersMap.get(methodName);
if (namedMembers == null) { if (namedMembers == null) {