aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Rieke <rieke@subshell.com>2018-05-30 15:27:47 +0200
committerJan Rieke <rieke@subshell.com>2018-05-30 15:27:47 +0200
commit04269ef14bf463a1ebe2dd2b376e0a3ff71535e5 (patch)
tree42b23f6fc586d45890fa532bd29b2815d0fa7925 /src
parentcdee277f11becb5a3629158e0ffbe7292a85d255 (diff)
downloadlombok-04269ef14bf463a1ebe2dd2b376e0a3ff71535e5.tar.gz
lombok-04269ef14bf463a1ebe2dd2b376e0a3ff71535e5.tar.bz2
lombok-04269ef14bf463a1ebe2dd2b376e0a3ff71535e5.zip
fixed compiler errors in ant
Diffstat (limited to 'src')
-rw-r--r--src/core/lombok/eclipse/handlers/EclipseSingularsRecipes.java2
-rw-r--r--src/core/lombok/eclipse/handlers/HandleSuperBuilder.java9
2 files changed, 8 insertions, 3 deletions
diff --git a/src/core/lombok/eclipse/handlers/EclipseSingularsRecipes.java b/src/core/lombok/eclipse/handlers/EclipseSingularsRecipes.java
index ac4e5c7b..e24cd5b5 100644
--- a/src/core/lombok/eclipse/handlers/EclipseSingularsRecipes.java
+++ b/src/core/lombok/eclipse/handlers/EclipseSingularsRecipes.java
@@ -229,7 +229,7 @@ public class EclipseSingularsRecipes {
* control over the return type and value, use
* {@link #generateMethods(SingularData, boolean, EclipseNode, boolean, Supplier, Supplier)}.
*/
- public void generateMethods(SingularData data, boolean deprecate, EclipseNode builderType, boolean fluent, boolean chain) {
+ public void generateMethods(SingularData data, boolean deprecate, final EclipseNode builderType, boolean fluent, final boolean chain) {
// TODO: Make these lambdas when switching to a source level >= 1.8.
Supplier<TypeReference> returnType = new Supplier<TypeReference>() {
@Override public TypeReference get() {
diff --git a/src/core/lombok/eclipse/handlers/HandleSuperBuilder.java b/src/core/lombok/eclipse/handlers/HandleSuperBuilder.java
index fa069939..a473a084 100644
--- a/src/core/lombok/eclipse/handlers/HandleSuperBuilder.java
+++ b/src/core/lombok/eclipse/handlers/HandleSuperBuilder.java
@@ -368,7 +368,12 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
}
private TypeReference[] getTypeParametersFrom(TypeReference typeRef) {
- TypeReference[][] typeArgss = typeRef.getTypeArguments();
+ TypeReference[][] typeArgss = null;
+ if (typeRef instanceof ParameterizedQualifiedTypeReference) {
+ typeArgss = ((ParameterizedQualifiedTypeReference)typeRef).typeArguments;
+ } else if (typeRef instanceof ParameterizedSingleTypeReference) {
+ typeArgss = new TypeReference[][] {((ParameterizedSingleTypeReference)typeRef).typeArguments};
+ }
TypeReference[] typeArgs = new TypeReference[0];
if (typeArgss != null && typeArgss.length > 0) {
typeArgs = typeArgss[typeArgss.length - 1];
@@ -609,7 +614,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
}
}
- private void makeSetterMethodsForBuilder(EclipseNode builderType, BuilderFieldData bfd, EclipseNode sourceNode, String builderGenericName) {
+ private void makeSetterMethodsForBuilder(EclipseNode builderType, BuilderFieldData bfd, EclipseNode sourceNode, final String builderGenericName) {
boolean deprecate = isFieldDeprecated(bfd.originalFieldNode);
// TODO: Make these lambdas when switching to a source level >= 1.8.