From 49c19cd7ed673a8308b56599089d287df7b8f7a9 Mon Sep 17 00:00:00 2001 From: Alex Tkachman Date: Thu, 23 Aug 2012 18:07:22 +0300 Subject: [PATCH] abstraction issue: HashMap -> Map, ArrayList -> List in parameters --- .../backend/src/org/jetbrains/jet/codegen/ClassCodegen.java | 4 ++-- .../backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassCodegen.java index be10b76e8fa..afea914079f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassCodegen.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import javax.inject.Inject; -import java.util.HashMap; +import java.util.Map; /** * @author max @@ -82,7 +82,7 @@ public class ClassCodegen { CodegenContext context, JetClassOrObject aClass, OwnerKind kind, - HashMap accessors, + Map accessors, ClassBuilder classBuilder ) { ClassDescriptor descriptor = state.getBindingContext().get(BindingContext.CLASS, aClass); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java index 1f55ea7f4e0..7f2aafde570 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java @@ -309,7 +309,7 @@ public class ClosureCodegen extends ObjectOrClosureCodegen { return constructor; } - private boolean calculateConstructorParameters(FunctionDescriptor funDescriptor, ArrayList> args) { + private boolean calculateConstructorParameters(FunctionDescriptor funDescriptor, List> args) { if (captureThis != null) { final Type type = typeMapper.mapType(context.getThisDescriptor().getDefaultType(), MapTypeMode.VALUE); args.add(new Pair("this$0", type)); @@ -347,7 +347,7 @@ public class ClosureCodegen extends ObjectOrClosureCodegen { return putFieldForMyself; } - private static Type[] nameAnTypeListToTypeArray(ArrayList> args) { + private static Type[] nameAnTypeListToTypeArray(List> args) { final Type[] argTypes = new Type[args.size()]; for (int i = 0; i != argTypes.length; ++i) { argTypes[i] = args.get(i).second;