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

A common method extracted

Browse Source
This commit is contained in:
Andrey Breslav
2013-03-06 12:44:54 +04:00
parent 7107288f88
commit 7e5794cc7f
1 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java
+31 -30
View File
@@ -261,22 +261,8 @@ public class DependencyInjectorGenerator {
p.println("public ", injectorClassName, "() {"); p.println("public ", injectorClassName, "() {");
} }
else { else {
p.println("public ", injectorClassName, "("); p.print("public ", injectorClassName);
p.pushIndent(); generateParameterList(p, parameters);
for (Iterator<Parameter> iterator = parameters.iterator(); iterator.hasNext(); ) {
Parameter parameter = iterator.next();
p.print(); // indent
if (parameter.isRequired()) {
p.printWithNoIndent("@NotNull ");
}
p.printWithNoIndent(type(parameter.getType()), " ", parameter.getName());
if (iterator.hasNext()) {
p.printlnWithNoIndent(",");
}
}
p.printlnWithNoIndent();
p.popIndent();
p.println(") {");
} }
p.pushIndent(); p.pushIndent();
@@ -287,6 +273,25 @@ public class DependencyInjectorGenerator {
p.println("}"); p.println("}");
} }
private void generateParameterList(Printer p, Collection<Parameter> parameters) {
p.printlnWithNoIndent("(");
p.pushIndent();
for (Iterator<Parameter> iterator = parameters.iterator(); iterator.hasNext(); ) {
Parameter parameter = iterator.next();
p.print(); // indent
if (parameter.isRequired()) {
p.printWithNoIndent("@NotNull ");
}
p.printWithNoIndent(type(parameter.getType()), " ", parameter.getName());
if (iterator.hasNext()) {
p.printlnWithNoIndent(",");
}
}
p.printlnWithNoIndent();
p.popIndent();
p.println(") {");
}
private void generateDestroy(@NotNull String injectorClassName, @NotNull Printer out) { private void generateDestroy(@NotNull String injectorClassName, @NotNull Printer out) {
out.println("@PreDestroy"); out.println("@PreDestroy");
out.println("public void destroy() {"); out.println("public void destroy() {");
@@ -333,7 +338,7 @@ public class DependencyInjectorGenerator {
p.popIndent(); p.popIndent();
} }
private void generateFactoryMethod(Printer p, FactoryMethod method) { private Collection<Field> computeFieldsForFactoryMethod(FactoryMethod method, Field resultField) {
Dependencies localDependencies = new Dependencies(); Dependencies localDependencies = new Dependencies();
Map<Parameter, Field> parameterToField = Maps.newHashMap(); Map<Parameter, Field> parameterToField = Maps.newHashMap();
@@ -347,24 +352,20 @@ public class DependencyInjectorGenerator {
localDependencies.addSatisfiedField(storedField); localDependencies.addSatisfiedField(storedField);
} }
Field resultField = new Field(true, method.getReturnType(), "_result");
localDependencies.addField(resultField); localDependencies.addField(resultField);
Collection<Field> fields = Lists.newArrayList(localDependencies.satisfyDependencies()); Collection<Field> fields = Lists.newArrayList(localDependencies.satisfyDependencies());
fields.add(resultField); fields.add(resultField);
return fields;
}
private void generateFactoryMethod(Printer p, FactoryMethod method) {
Field resultField = new Field(true, method.getReturnType(), "_result");
Collection<Field> fields = computeFieldsForFactoryMethod(method, resultField);
p.print("public ", type(method.getReturnType()), " ", method.getName());
generateParameterList(p, method.getParameters());
p.println("public ", type(method.getReturnType()), " ", method.getName(), "(");
p.pushIndent();
for (Iterator<Parameter> iterator = method.getParameters().iterator(); iterator.hasNext(); ) {
Parameter parameter = iterator.next();
p.print(type(parameter.getType()), " ", parameter.getName());
if (iterator.hasNext()) {
p.printlnWithNoIndent(", ");
}
}
p.println();
p.popIndent();
p.println(") {");
p.pushIndent(); p.pushIndent();
InjectionLogicGenerator.generateForLocalVariables(importManager, p, fields); InjectionLogicGenerator.generateForLocalVariables(importManager, p, fields);