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

Get rid of getClassResolver method in JavaDescriptorResolver

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-08 13:05:48 +04:00
parent 5bc2422cb0
commit fb6fbdfaad
4 changed files with 8 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
+4 -4
View File
@@ -173,10 +173,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
return constructorResolver.resolveConstructors(classData); return constructorResolver.resolveConstructors(classData);
} }
public ClassResolver getClassResolver() {
return classResolver;
}
public CompileTimeConstResolver getCompileTimeConstResolver() { public CompileTimeConstResolver getCompileTimeConstResolver() {
return compileTimeConstResolver; return compileTimeConstResolver;
} }
@@ -212,6 +208,10 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
return propertiesResolver.resolveFieldGroup(data); return propertiesResolver.resolveFieldGroup(data);
} }
public ClassDescriptor resolveClass(FqName name, DescriptorSearchRule searchRule, List<Runnable> list) {
return classResolver.resolveClass(name, searchRule, list);
}
public static class ValueParameterDescriptors { public static class ValueParameterDescriptors {
private final JetType receiverType; private final JetType receiverType;
private final List<ValueParameterDescriptor> descriptors; private final List<ValueParameterDescriptor> descriptors;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationResolver.java
+1 -1
View File
@@ -79,7 +79,7 @@ public final class AnnotationResolver {
FqName annotationFqName = new FqName(qname); FqName annotationFqName = new FqName(qname);
final ClassDescriptor clazz = final ClassDescriptor clazz =
javaDescriptorResolver.getClassResolver().resolveClass(annotationFqName, DescriptorSearchRule.INCLUDE_KOTLIN, taskList); javaDescriptorResolver.resolveClass(annotationFqName, DescriptorSearchRule.INCLUDE_KOTLIN, taskList);
if (clazz == null) { if (clazz == null) {
return null; return null;
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/CompileTimeConstResolver.java
+2 -3
View File
@@ -89,7 +89,7 @@ public final class CompileTimeConstResolver {
List<CompileTimeConstant<?>> values = getCompileTimeConstantForArrayValues(annotationFqName, valueName, taskList, initializers); List<CompileTimeConstant<?>> values = getCompileTimeConstantForArrayValues(annotationFqName, valueName, taskList, initializers);
ClassDescriptor classDescriptor = ClassDescriptor classDescriptor =
javaDescriptorResolver.getClassResolver().resolveClass(annotationFqName, DescriptorSearchRule.INCLUDE_KOTLIN, taskList); javaDescriptorResolver.resolveClass(annotationFqName, DescriptorSearchRule.INCLUDE_KOTLIN, taskList);
ValueParameterDescriptor valueParameterDescriptor = ValueParameterDescriptor valueParameterDescriptor =
DescriptorResolverUtils.getValueParameterDescriptorForAnnotationParameter(valueName, classDescriptor); DescriptorResolverUtils.getValueParameterDescriptorForAnnotationParameter(valueName, classDescriptor);
@@ -132,8 +132,7 @@ public final class CompileTimeConstResolver {
JetScope scope; JetScope scope;
ClassDescriptor classDescriptor = ClassDescriptor classDescriptor =
javaDescriptorResolver.getClassResolver() javaDescriptorResolver.resolveClass(new FqName(fqName), DescriptorSearchRule.INCLUDE_KOTLIN, taskList);
.resolveClass(new FqName(fqName), DescriptorSearchRule.INCLUDE_KOTLIN, taskList);
if (classDescriptor == null) { if (classDescriptor == null) {
return null; return null;
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/InnerClassResolver.java
+1 -1
View File
@@ -84,7 +84,7 @@ public final class InnerClassResolver {
String name = innerPsiClass.getQualifiedName(); String name = innerPsiClass.getQualifiedName();
assert name != null : "Inner class has no qualified name"; assert name != null : "Inner class has no qualified name";
ClassDescriptor classDescriptor = ClassDescriptor classDescriptor =
javaDescriptorResolver.getClassResolver().resolveClass(new FqName(name), DescriptorSearchRule.IGNORE_IF_FOUND_IN_KOTLIN); javaDescriptorResolver.resolveClass(new FqName(name), DescriptorSearchRule.IGNORE_IF_FOUND_IN_KOTLIN);
assert classDescriptor != null : "Couldn't resolve class " + name; assert classDescriptor != null : "Couldn't resolve class " + name;
return classDescriptor; return classDescriptor;
} }