tiennm99/lombok
1
0
Fork 0
mirror of https://github.com/tiennm99/lombok.git synced 2026-09-03 06:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes for updates to getter/setter stuff based on @Accessors.

Browse Source
This commit is contained in:
Reinier Zwitserloot
2012-03-22 16:53:09 +01:00
parent cbaa53a9b5
commit aa5d3b8bb2
3 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/lombok/core/TransformationsUtil.java
+6 -5
View File
@@ -150,14 +150,15 @@ public class TransformationsUtil {
fieldName = removePrefix(fieldName, ac.prefix());
if (fieldName == null) return null;
if (ac.fluent()) return fieldName.toString();
String fName = fieldName.toString();
if (ac.fluent()) return fName;
if (isBoolean && fieldName.toString().startsWith("is") && fieldName.length() > 2 && !Character.isLowerCase(fieldName.charAt(2))) {
if (isBoolean && fName.startsWith("is") && fieldName.length() > 2 && !Character.isLowerCase(fName.charAt(2))) {
// The field is for example named 'isRunning'.
return "set" + fieldName.toString().substring(2);
return "set" + fName.substring(2);
}
return buildName("set", fieldName.toString());
return buildName("set", fName);
}
/**
@@ -215,7 +216,7 @@ public class TransformationsUtil {
if (acc.fluent()) {
names.add(baseName);
} else {
names.add("set" + baseName);
names.add(buildName("set", baseName));
}
}
src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
+1 -1
View File
@@ -990,7 +990,7 @@ public class EclipseHandlerUtil {
return createAnnotation(Accessors.class, node);
}
}
current = field.up();
current = current.up();
}
return AnnotationValues.of(Accessors.class, field);
src/core/lombok/javac/handlers/JavacHandlerUtil.java
+10 -13
View File
@@ -279,9 +279,7 @@ public class JavacHandlerUtil {
*/
public static java.util.List<String> toAllGetterNames(JavacNode field) {
String fieldName = field.getName();
boolean isBoolean = ((JCVariableDecl) field.get()).vartype.toString().equals("boolean");
boolean isBoolean = isBoolean(field);
AnnotationValues<Accessors> accessors = JavacHandlerUtil.getAccessorsForField(field);
return TransformationsUtil.toAllGetterNames(accessors, fieldName, isBoolean);
@@ -294,9 +292,7 @@ public class JavacHandlerUtil {
*/
public static String toGetterName(JavacNode field) {
String fieldName = field.getName();
boolean isBoolean = ((JCVariableDecl) field.get()).vartype.toString().equals("boolean");
boolean isBoolean = isBoolean(field);
AnnotationValues<Accessors> accessors = JavacHandlerUtil.getAccessorsForField(field);
return TransformationsUtil.toGetterName(accessors, fieldName, isBoolean);
@@ -308,9 +304,7 @@ public class JavacHandlerUtil {
*/
public static java.util.List<String> toAllSetterNames(JavacNode field) {
String fieldName = field.getName();
boolean isBoolean = ((JCVariableDecl) field.get()).vartype.toString().equals("boolean");
boolean isBoolean = isBoolean(field);
AnnotationValues<Accessors> accessors = JavacHandlerUtil.getAccessorsForField(field);
return TransformationsUtil.toAllSetterNames(accessors, fieldName, isBoolean);
@@ -323,14 +317,17 @@ public class JavacHandlerUtil {
*/
public static String toSetterName(JavacNode field) {
String fieldName = field.getName();
boolean isBoolean = ((JCVariableDecl) field.get()).toString().equals("boolean");
boolean isBoolean = isBoolean(field);
AnnotationValues<Accessors> accessors = JavacHandlerUtil.getAccessorsForField(field);
return TransformationsUtil.toSetterName(accessors, fieldName, isBoolean);
}
private static boolean isBoolean(JavacNode field) {
JCExpression varType = ((JCVariableDecl) field.get()).vartype;
return varType != null && varType.toString().equals("boolean");
}
public static AnnotationValues<Accessors> getAccessorsForField(JavacNode field) {
for (JavacNode node : field.down()) {
if (annotationTypeMatches(Accessors.class, node)) {
@@ -345,7 +342,7 @@ public class JavacHandlerUtil {
return createAnnotation(Accessors.class, node);
}
}
current = field.up();
current = current.up();
}
return AnnotationValues.of(Accessors.class, field);