From 5029fd041ddf0e3654c7f3d5106cf8cbb90b5243 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 23 Nov 2015 03:29:27 +0100 Subject: [Fixes #949] accessor prefixes messed up auto-singular generation. --- src/core/lombok/eclipse/handlers/HandleBuilder.java | 2 +- src/core/lombok/javac/handlers/HandleBuilder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/lombok') diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java index be14653a..4e0c4218 100644 --- a/src/core/lombok/eclipse/handlers/HandleBuilder.java +++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java @@ -711,7 +711,7 @@ public class HandleBuilder extends EclipseAnnotationHandler { node.addError("The singular must be specified explicitly (e.g. @Singular(\"task\")) because auto singularization is disabled."); explicitSingular = new String(pluralName); } else { - explicitSingular = autoSingularize(node.getName()); + explicitSingular = autoSingularize(new String(pluralName)); if (explicitSingular == null) { node.addError("Can't singularize this name; please specify the singular explicitly (i.e. @Singular(\"sheep\"))"); explicitSingular = new String(pluralName); diff --git a/src/core/lombok/javac/handlers/HandleBuilder.java b/src/core/lombok/javac/handlers/HandleBuilder.java index efe40da3..b83e3d5f 100644 --- a/src/core/lombok/javac/handlers/HandleBuilder.java +++ b/src/core/lombok/javac/handlers/HandleBuilder.java @@ -666,7 +666,7 @@ public class HandleBuilder extends JavacAnnotationHandler { node.addError("The singular must be specified explicitly (e.g. @Singular(\"task\")) because auto singularization is disabled."); explicitSingular = pluralName.toString(); } else { - explicitSingular = autoSingularize(node.getName()); + explicitSingular = autoSingularize(pluralName.toString()); if (explicitSingular == null) { node.addError("Can't singularize this name; please specify the singular explicitly (i.e. @Singular(\"sheep\"))"); explicitSingular = pluralName.toString(); -- cgit