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

remove unused code

Browse Source
This commit is contained in:
Stepan Koltsov
2012-04-27 19:09:39 +04:00
parent fca0b8a530
commit e959c62ee4
1 changed files with 4 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 -9
View File
@@ -1269,8 +1269,6 @@ public class JavaDescriptorResolver {
namedMembers.propertyAccessors = Collections.emptyList(); namedMembers.propertyAccessors = Collections.emptyList();
} }
TypeVariableResolver typeVariableResolver = TypeVariableResolvers.classTypeVariableResolver(owner, context);
class GroupingValue { class GroupingValue {
PropertyAccessorData getter; PropertyAccessorData getter;
PropertyAccessorData setter; PropertyAccessorData setter;
@@ -1411,14 +1409,14 @@ public class JavaDescriptorResolver {
PsiMethodWrapper method = (PsiMethodWrapper) members.setter.getMember(); PsiMethodWrapper method = (PsiMethodWrapper) members.setter.getMember();
if (anyMember == members.setter) { if (anyMember == members.setter) {
typeParameters = resolveMethodTypeParameters(method, propertyDescriptor, typeVariableResolver); typeParameters = resolveMethodTypeParameters(method, propertyDescriptor);
} }
} }
if (members.getter != null) { if (members.getter != null) {
PsiMethodWrapper method = (PsiMethodWrapper) members.getter.getMember(); PsiMethodWrapper method = (PsiMethodWrapper) members.getter.getMember();
if (anyMember == members.getter) { if (anyMember == members.getter) {
typeParameters = resolveMethodTypeParameters(method, propertyDescriptor, typeVariableResolver); typeParameters = resolveMethodTypeParameters(method, propertyDescriptor);
} }
} }
@@ -1647,9 +1645,7 @@ public class JavaDescriptorResolver {
String context = "method " + method.getName() + " in class " + psiClass.getQualifiedName(); String context = "method " + method.getName() + " in class " + psiClass.getQualifiedName();
final TypeVariableResolver typeVariableResolverForParameters = TypeVariableResolvers.classTypeVariableResolver(scopeData.classOrNamespaceDescriptor, context); final List<TypeParameterDescriptor> methodTypeParameters = resolveMethodTypeParameters(method, functionDescriptorImpl);
final List<TypeParameterDescriptor> methodTypeParameters = resolveMethodTypeParameters(method, functionDescriptorImpl, typeVariableResolverForParameters);
TypeVariableResolver methodTypeVariableResolver = TypeVariableResolvers.typeVariableResolverFromTypeParameters(methodTypeParameters, functionDescriptorImpl, context); TypeVariableResolver methodTypeVariableResolver = TypeVariableResolvers.typeVariableResolverFromTypeParameters(methodTypeParameters, functionDescriptorImpl, context);
@@ -1790,8 +1786,7 @@ public class JavaDescriptorResolver {
private List<TypeParameterDescriptor> resolveMethodTypeParameters( private List<TypeParameterDescriptor> resolveMethodTypeParameters(
@NotNull PsiMethodWrapper method, @NotNull PsiMethodWrapper method,
@NotNull DeclarationDescriptor functionDescriptor, @NotNull DeclarationDescriptor functionDescriptor) {
@NotNull TypeVariableResolver classTypeVariableResolver) {
List<TypeParameterDescriptorInitialization> typeParametersIntialization; List<TypeParameterDescriptorInitialization> typeParametersIntialization;
if (method.getJetMethod().typeParameters().length() > 0) { if (method.getJetMethod().typeParameters().length() > 0) {