abstraction issue: HashMap -> Map, ArrayList -> List in parameters
This commit is contained in:
@@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.psi.*;
|
|||||||
import org.jetbrains.jet.lang.resolve.BindingContext;
|
import org.jetbrains.jet.lang.resolve.BindingContext;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import java.util.HashMap;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author max
|
* @author max
|
||||||
@@ -82,7 +82,7 @@ public class ClassCodegen {
|
|||||||
CodegenContext context,
|
CodegenContext context,
|
||||||
JetClassOrObject aClass,
|
JetClassOrObject aClass,
|
||||||
OwnerKind kind,
|
OwnerKind kind,
|
||||||
HashMap<DeclarationDescriptor, DeclarationDescriptor> accessors,
|
Map<DeclarationDescriptor, DeclarationDescriptor> accessors,
|
||||||
ClassBuilder classBuilder
|
ClassBuilder classBuilder
|
||||||
) {
|
) {
|
||||||
ClassDescriptor descriptor = state.getBindingContext().get(BindingContext.CLASS, aClass);
|
ClassDescriptor descriptor = state.getBindingContext().get(BindingContext.CLASS, aClass);
|
||||||
|
|||||||
@@ -309,7 +309,7 @@ public class ClosureCodegen extends ObjectOrClosureCodegen {
|
|||||||
return constructor;
|
return constructor;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean calculateConstructorParameters(FunctionDescriptor funDescriptor, ArrayList<Pair<String, Type>> args) {
|
private boolean calculateConstructorParameters(FunctionDescriptor funDescriptor, List<Pair<String, Type>> args) {
|
||||||
if (captureThis != null) {
|
if (captureThis != null) {
|
||||||
final Type type = typeMapper.mapType(context.getThisDescriptor().getDefaultType(), MapTypeMode.VALUE);
|
final Type type = typeMapper.mapType(context.getThisDescriptor().getDefaultType(), MapTypeMode.VALUE);
|
||||||
args.add(new Pair<String, Type>("this$0", type));
|
args.add(new Pair<String, Type>("this$0", type));
|
||||||
@@ -347,7 +347,7 @@ public class ClosureCodegen extends ObjectOrClosureCodegen {
|
|||||||
return putFieldForMyself;
|
return putFieldForMyself;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Type[] nameAnTypeListToTypeArray(ArrayList<Pair<String, Type>> args) {
|
private static Type[] nameAnTypeListToTypeArray(List<Pair<String, Type>> args) {
|
||||||
final Type[] argTypes = new Type[args.size()];
|
final Type[] argTypes = new Type[args.size()];
|
||||||
for (int i = 0; i != argTypes.length; ++i) {
|
for (int i = 0; i != argTypes.length; ++i) {
|
||||||
argTypes[i] = args.get(i).second;
|
argTypes[i] = args.get(i).second;
|
||||||
|
|||||||
Reference in New Issue
Block a user