From 81cf9b36ff28d4306578a0ad13fd9591ac6d5020 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Wed, 15 Feb 2012 00:13:33 +0400 Subject: [PATCH] cleanup in JavaDescriptorResovler --- .../resolve/java/JavaTypeTransformer.java | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java index cc466287615..6a9af4a80e1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java @@ -140,26 +140,7 @@ public class JavaTypeTransformer { PsiType psiArgument = psiArguments[i]; TypeParameterDescriptor typeParameterDescriptor = parameters.get(i); - TypeVariableResolver typeVariableByPsiResolver2 = new TypeVariableResolver() { - @NotNull - @Override - public TypeParameterDescriptor getTypeVariable(@NotNull String name) { - if (classData instanceof JavaDescriptorResolver.ResolverSrcClassData) { - for (TypeParameterDescriptor typeParameter : classData.getClassDescriptor().getTypeConstructor().getParameters()) { - if (name.equals(typeParameter.getName())) { - // TODO? - return typeParameter; - } - } - return typeVariableResolver.getTypeVariable(name); - } else if (classData instanceof JavaDescriptorResolver.ResolverBinaryClassData) { - return typeVariableResolver.getTypeVariable(name); - } else { - throw new IllegalStateException(); - } - } - }; - arguments.add(transformToTypeProjection(psiArgument, typeParameterDescriptor, typeVariableByPsiResolver2)); + arguments.add(transformToTypeProjection(psiArgument, typeParameterDescriptor, typeVariableResolver)); } } return new JetTypeImpl(