diff options
| author | Caleb Brinkman <cbrinkman@sonatype.com> | 2019-09-12 11:58:10 -0500 |
|---|---|---|
| committer | Caleb Brinkman <cbrinkman@sonatype.com> | 2019-09-12 11:58:10 -0500 |
| commit | 5b16b48bbffdd579b26e2a7dc18684efdc32e219 (patch) | |
| tree | 9dfd03f46e569cd9efc4fef24b0c67aaee0e1d06 /src/core/lombok/eclipse/handlers/singulars | |
| parent | 36287f2ff9ed2f809f8c1c76155919417ad04d3c (diff) | |
| download | lombok-5b16b48bbffdd579b26e2a7dc18684efdc32e219.tar.gz lombok-5b16b48bbffdd579b26e2a7dc18684efdc32e219.tar.bz2 lombok-5b16b48bbffdd579b26e2a7dc18684efdc32e219.zip | |
Fix class names in after-ecj
Diffstat (limited to 'src/core/lombok/eclipse/handlers/singulars')
| -rwxr-xr-x | src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java b/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java index 53ea15a6..e3a99008 100755 --- a/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java +++ b/src/core/lombok/eclipse/handlers/singulars/EclipseJavaUtilListSetSingularizer.java @@ -150,7 +150,8 @@ abstract class EclipseJavaUtilListSetSingularizer extends EclipseJavaUtilSingula param.annotations = typeUseAnns; md.arguments = new Argument[] {param}; md.returnType = returnType; - md.selector = fluent ? data.getSingularName() : HandlerUtil.buildAccessorName("add", new String(data.getSingularName())).toCharArray(); + char[] prefixedSingularName = data.getSetterPrefix().length == 0 ? data.getSingularName() : HandlerUtil.buildAccessorName(new String(data.getSetterPrefix()), new String(data.getSingularName())).toCharArray(); + md.selector = fluent ? prefixedSingularName : HandlerUtil.buildAccessorName("add", new String(data.getSingularName())).toCharArray(); md.annotations = generateSelfReturnAnnotations(deprecate, cfv, data.getSource()); data.setGeneratedByRecursive(md); @@ -181,7 +182,8 @@ abstract class EclipseJavaUtilListSetSingularizer extends EclipseJavaUtilSingula Argument param = new Argument(data.getPluralName(), 0, paramType, ClassFileConstants.AccFinal); md.arguments = new Argument[] {param}; md.returnType = returnType; - md.selector = fluent ? data.getPluralName() : HandlerUtil.buildAccessorName("addAll", new String(data.getPluralName())).toCharArray(); + char[] prefixedSelector = data.getSetterPrefix().length == 0 ? data.getPluralName() : HandlerUtil.buildAccessorName(new String(data.getSetterPrefix()), new String(data.getPluralName())).toCharArray(); + md.selector = fluent ? prefixedSelector : HandlerUtil.buildAccessorName("addAll", new String(data.getPluralName())).toCharArray(); md.annotations = generateSelfReturnAnnotations(deprecate, cfv, data.getSource()); data.setGeneratedByRecursive(md); |
