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

Rename: JavaDescriptorPropertiesResolver -> PropertiesResolver

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-06 18:46:05 +04:00
parent 2d33b50b55
commit 38a10bfb86
2 changed files with 9 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
+7 -7
View File
@@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeMethodSign
import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils; import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils;
import org.jetbrains.jet.lang.resolve.java.kt.PsiAnnotationWithFlags; import org.jetbrains.jet.lang.resolve.java.kt.PsiAnnotationWithFlags;
import org.jetbrains.jet.lang.resolve.java.resolver.ClassResolver; import org.jetbrains.jet.lang.resolve.java.resolver.ClassResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaDescriptorPropertiesResolver; import org.jetbrains.jet.lang.resolve.java.resolver.PropertiesResolver;
import org.jetbrains.jet.lang.resolve.java.scope.JavaClassMembersScope; import org.jetbrains.jet.lang.resolve.java.scope.JavaClassMembersScope;
import org.jetbrains.jet.lang.resolve.java.scope.JavaPackageScope; import org.jetbrains.jet.lang.resolve.java.scope.JavaPackageScope;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiClassWrapper; import org.jetbrains.jet.lang.resolve.java.wrapper.PsiClassWrapper;
@@ -123,7 +123,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
private BindingTrace trace; private BindingTrace trace;
private PsiClassFinder psiClassFinder; private PsiClassFinder psiClassFinder;
private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver; private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver;
private JavaDescriptorPropertiesResolver javaDescriptorPropertiesResolver = new JavaDescriptorPropertiesResolver(this); private PropertiesResolver propertiesResolver = new PropertiesResolver(this);
private final ClassResolver classResolver = new ClassResolver(this); private final ClassResolver classResolver = new ClassResolver(this);
@Inject @Inject
@@ -134,13 +134,13 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
@Inject @Inject
public void setSemanticServices(JavaSemanticServices semanticServices) { public void setSemanticServices(JavaSemanticServices semanticServices) {
this.semanticServices = semanticServices; this.semanticServices = semanticServices;
this.javaDescriptorPropertiesResolver.setSemanticServices(semanticServices); this.propertiesResolver.setSemanticServices(semanticServices);
} }
@Inject @Inject
public void setTrace(BindingTrace trace) { public void setTrace(BindingTrace trace) {
this.trace = trace; this.trace = trace;
this.javaDescriptorPropertiesResolver.setTrace(trace); this.propertiesResolver.setTrace(trace);
} }
@Inject @Inject
@@ -151,7 +151,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
@Inject @Inject
public void setJavaDescriptorSignatureResolver(JavaDescriptorSignatureResolver javaDescriptorSignatureResolver) { public void setJavaDescriptorSignatureResolver(JavaDescriptorSignatureResolver javaDescriptorSignatureResolver) {
this.javaDescriptorSignatureResolver = javaDescriptorSignatureResolver; this.javaDescriptorSignatureResolver = javaDescriptorSignatureResolver;
this.javaDescriptorPropertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver); this.propertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver);
} }
@@ -831,7 +831,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
//noinspection ConstantConditions //noinspection ConstantConditions
String qualifiedName = psiClass == null ? scopeData.getPsiPackage().getQualifiedName() : psiClass.getQualifiedName(); String qualifiedName = psiClass == null ? scopeData.getPsiPackage().getQualifiedName() : psiClass.getQualifiedName();
javaDescriptorPropertiesResolver.resolveNamedGroupProperties(scopeData.getClassOrNamespaceDescriptor(), scopeData, namedMembers, fieldName, propertiesResolver.resolveNamedGroupProperties(scopeData.getClassOrNamespaceDescriptor(), scopeData, namedMembers, fieldName,
"class or namespace " + qualifiedName); "class or namespace " + qualifiedName);
return namedMembers.getPropertyDescriptors(); return namedMembers.getPropertyDescriptors();
@@ -850,7 +850,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
NamedMembers namedMembers = entry.getValue(); NamedMembers namedMembers = entry.getValue();
Name propertyName = entry.getKey(); Name propertyName = entry.getKey();
javaDescriptorPropertiesResolver.resolveNamedGroupProperties( propertiesResolver.resolveNamedGroupProperties(
scopeData.getClassOrNamespaceDescriptor(), scopeData, namedMembers, propertyName, scopeData.getClassOrNamespaceDescriptor(), scopeData, namedMembers, propertyName,
"class or namespace " + psiClass.getQualifiedName()); "class or namespace " + psiClass.getQualifiedName());
descriptors.addAll(namedMembers.getPropertyDescriptors()); descriptors.addAll(namedMembers.getPropertyDescriptors());
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaDescriptorPropertiesResolver.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PropertiesResolver.java
+2 -2
View File
@@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.types.TypeUtils;
import java.util.*; import java.util.*;
public final class JavaDescriptorPropertiesResolver { public final class PropertiesResolver {
private static class GroupingValue { private static class GroupingValue {
PropertyAccessorData getter; PropertyAccessorData getter;
@@ -56,7 +56,7 @@ public final class JavaDescriptorPropertiesResolver {
private BindingTrace trace; private BindingTrace trace;
/* internal */ /* internal */
public JavaDescriptorPropertiesResolver(JavaDescriptorResolver resolver) { public PropertiesResolver(JavaDescriptorResolver resolver) {
this.javaDescriptorResolver = resolver; this.javaDescriptorResolver = resolver;
} }