diff options
author | spc <spacanowski@gmail.com> | 2015-10-08 17:23:42 +0200 |
---|---|---|
committer | spc <spacanowski@gmail.com> | 2015-10-08 17:23:42 +0200 |
commit | 22e1fb91d4699a0bacafcd9f74fdca6acd8b275b (patch) | |
tree | 19b61ede5c40773110dcf679766751b4523199f8 /src/core/lombok/javac/handlers/singulars | |
parent | db8281f7f5c027c24cf9a1a8208a2aa92d06a73d (diff) | |
download | lombok-22e1fb91d4699a0bacafcd9f74fdca6acd8b275b.tar.gz lombok-22e1fb91d4699a0bacafcd9f74fdca6acd8b275b.tar.bz2 lombok-22e1fb91d4699a0bacafcd9f74fdca6acd8b275b.zip |
Fixed typo, moved imports
Diffstat (limited to 'src/core/lombok/javac/handlers/singulars')
-rw-r--r-- | src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java index 399f2239..1bf47e6e 100644 --- a/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java +++ b/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java @@ -26,6 +26,14 @@ import static lombok.javac.handlers.JavacHandlerUtil.*; import java.util.Collections; +import lombok.core.GuavaTypeMap; +import lombok.core.handlers.HandlerUtil; +import lombok.javac.JavacNode; +import lombok.javac.JavacTreeMaker; +import lombok.javac.handlers.JavacHandlerUtil; +import lombok.javac.handlers.JavacSingularsRecipes.JavacSingularizer; +import lombok.javac.handlers.JavacSingularsRecipes.SingularData; + import com.sun.tools.javac.code.Flags; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCBlock; @@ -39,14 +47,6 @@ import com.sun.tools.javac.util.List; import com.sun.tools.javac.util.ListBuffer; import com.sun.tools.javac.util.Name; -import lombok.core.GuavaTypeMap; -import lombok.core.handlers.HandlerUtil; -import lombok.javac.JavacNode; -import lombok.javac.JavacTreeMaker; -import lombok.javac.handlers.JavacHandlerUtil; -import lombok.javac.handlers.JavacSingularsRecipes.JavacSingularizer; -import lombok.javac.handlers.JavacSingularsRecipes.SingularData; - abstract class JavacGuavaSingularizer extends JavacSingularizer { protected String getSimpleTargetTypeName(SingularData data) { return GuavaTypeMap.getGuavaTypeName(data.getTargetFqn()); @@ -64,7 +64,7 @@ abstract class JavacGuavaSingularizer extends JavacSingularizer { JavacTreeMaker maker = builderType.getTreeMaker(); String simpleTypeName = getSimpleTargetTypeName(data); JCExpression type = JavacHandlerUtil.chainDots(builderType, "com", "google", "common", "collect", simpleTypeName, "Builder"); - type = addTypeArgs(getTypeAgrumentsCount(isMap(), simpleTypeName), false, builderType, type, data.getTypeArgs(), source); + type = addTypeArgs(getTypeArgumentsCount(isMap(), simpleTypeName), false, builderType, type, data.getTypeArgs(), source); JCVariableDecl buildField = maker.VarDef(maker.Modifiers(Flags.PRIVATE), data.getPluralName(), type, null); return Collections.singletonList(injectFieldAndMarkGenerated(builderType, buildField)); @@ -155,7 +155,7 @@ abstract class JavacGuavaSingularizer extends JavacSingularizer { } } String simpleTypeName = getSimpleTargetTypeName(data); - paramType = addTypeArgs(getTypeAgrumentsCount(mapMode, simpleTypeName), true, builderType, paramType, data.getTypeArgs(), source); + paramType = addTypeArgs(getTypeArgumentsCount(mapMode, simpleTypeName), true, builderType, paramType, data.getTypeArgs(), source); JCVariableDecl param = maker.VarDef(maker.Modifiers(paramFlags), data.getPluralName(), paramType, null); JCMethodDecl method = maker.MethodDef(mods, methodName, returnType, typeParams, List.of(param), thrown, body, null); injectMethod(builderType, method); @@ -168,7 +168,7 @@ abstract class JavacGuavaSingularizer extends JavacSingularizer { String simpleTypeName = getSimpleTargetTypeName(data); JCExpression varType = chainDotsString(builderType, data.getTargetFqn()); - int agrumentsCount = getTypeAgrumentsCount(mapMode, simpleTypeName); + int agrumentsCount = getTypeArgumentsCount(mapMode, simpleTypeName); varType = addTypeArgs(agrumentsCount, false, builderType, varType, data.getTypeArgs(), source); JCExpression empty; { @@ -207,7 +207,7 @@ abstract class JavacGuavaSingularizer extends JavacSingularizer { return maker.If(cond, thenPart, null); } - private int getTypeAgrumentsCount(boolean isMap, String simpleTypeName) { + private int getTypeArgumentsCount(boolean isMap, String simpleTypeName) { return isMap ? 2 : getListSetTypeArgumentsCount(simpleTypeName); } |