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

minor JavaDescriptorResolver refactoring

Browse Source
This commit is contained in:
Stepan Koltsov
2012-04-09 03:26:04 +04:00
parent 10dd366216
commit bd501f3676
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+1 -5
View File
@@ -1427,11 +1427,7 @@ public class JavaDescriptorResolver {
private void getResolverScopeData(@NotNull ResolverScopeData scopeData) { private void getResolverScopeData(@NotNull ResolverScopeData scopeData) {
if (scopeData.namedMembersMap == null) { if (scopeData.namedMembersMap == null) {
if (scopeData.psiClass != null) { scopeData.namedMembersMap = JavaDescriptorResolverHelper.getNamedMembers(scopeData);
scopeData.namedMembersMap = JavaDescriptorResolverHelper.getNamedMembers(new PsiClassWrapper(scopeData.psiClass), scopeData.staticMembers, scopeData.kotlin);
} else {
scopeData.namedMembersMap = Collections.emptyMap();
}
} }
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java
+10 -4
View File
@@ -23,6 +23,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.prop.PropertyNameUtils; import org.jetbrains.jet.lang.resolve.java.prop.PropertyNameUtils;
import org.jetbrains.jet.lang.resolve.java.prop.PropertyParseResult; import org.jetbrains.jet.lang.resolve.java.prop.PropertyParseResult;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -211,10 +212,15 @@ class JavaDescriptorResolverHelper {
} }
static Map<String, NamedMembers> getNamedMembers(@NotNull PsiClassWrapper psiClass, boolean staticMembers, boolean kotlin) { @NotNull
Builder builder = new Builder(psiClass, staticMembers, kotlin); static Map<String, NamedMembers> getNamedMembers(@NotNull JavaDescriptorResolver.ResolverScopeData resolverScopeData) {
builder.run(); if (resolverScopeData.psiClass != null) {
return builder.namedMembersMap; Builder builder = new Builder(new PsiClassWrapper(resolverScopeData.psiClass), resolverScopeData.staticMembers, resolverScopeData.kotlin);
builder.run();
return builder.namedMembersMap;
} else {
return Collections.emptyMap();
}
} }