aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lombok/eclipse/handlers/HandleGetter.java73
-rw-r--r--src/lombok/eclipse/handlers/HandleSetter.java86
-rw-r--r--src/lombok/eclipse/handlers/PKG.java36
-rw-r--r--src/lombok/javac/handlers/PKG.java2
4 files changed, 149 insertions, 48 deletions
diff --git a/src/lombok/eclipse/handlers/HandleGetter.java b/src/lombok/eclipse/handlers/HandleGetter.java
index 6be978c6..ca561a48 100644
--- a/src/lombok/eclipse/handlers/HandleGetter.java
+++ b/src/lombok/eclipse/handlers/HandleGetter.java
@@ -1,8 +1,7 @@
package lombok.eclipse.handlers;
-import java.lang.reflect.Modifier;
+import static lombok.eclipse.handlers.PKG.*;
-import lombok.AccessLevel;
import lombok.Getter;
import lombok.core.AnnotationValues;
import lombok.core.TransformationsUtil;
@@ -25,10 +24,6 @@ import org.mangosdk.spi.ProviderFor;
@ProviderFor(EclipseAnnotationHandler.class)
public class HandleGetter implements EclipseAnnotationHandler<Getter> {
- private void generateDuplicateGetterWarning(Node annotationNode, String methodName) {
- annotationNode.addWarning(String.format("Not generating %s(): A method with that name already exists", methodName));
- }
-
@Override public boolean handle(AnnotationValues<Getter> annotation, Annotation ast, Node annotationNode) {
if ( !(annotationNode.up().get() instanceof FieldDeclaration) ) return false;
FieldDeclaration field = (FieldDeclaration) annotationNode.up().get();
@@ -39,17 +34,37 @@ public class HandleGetter implements EclipseAnnotationHandler<Getter> {
TypeDeclaration parent = (TypeDeclaration) annotationNode.up().up().get();
if ( parent.methods != null ) for ( AbstractMethodDeclaration method : parent.methods ) {
if ( method.selector != null && new String(method.selector).equals(getterName) ) {
- generateDuplicateGetterWarning(annotationNode, getterName);
+ annotationNode.addWarning(String.format(
+ "Not generating %s(): A method with that name already exists", getterName));
return false;
}
}
+ int modifier = toModifier(annotation.getInstance().value());
+
+ MethodDeclaration method = generateGetter(parent, field, getterName, modifier, ast);
+
+ if ( parent.methods == null ) {
+ parent.methods = new AbstractMethodDeclaration[1];
+ parent.methods[0] = method;
+ } else {
+ AbstractMethodDeclaration[] newArray = new AbstractMethodDeclaration[parent.methods.length + 1];
+ System.arraycopy(parent.methods, 0, newArray, 0, parent.methods.length);
+ newArray[parent.methods.length] = method;
+ parent.methods = newArray;
+ }
+
+ return true;
+ }
+
+ private MethodDeclaration generateGetter(TypeDeclaration parent, FieldDeclaration field, String name,
+ int modifier, Annotation ast) {
MethodDeclaration method = new MethodDeclaration(parent.compilationResult);
- method.modifiers = toModifier(annotation.getInstance().value());
+ method.modifiers = modifier;
method.returnType = field.type;
method.annotations = null;
method.arguments = null;
- method.selector = getterName.toCharArray();
+ method.selector = name.toCharArray();
method.binding = null;
method.thrownExceptions = null;
method.typeParameters = null;
@@ -60,44 +75,6 @@ public class HandleGetter implements EclipseAnnotationHandler<Getter> {
method.bodyStart = method.declarationSourceStart = method.sourceStart = ast.sourceStart;
method.bodyEnd = method.declarationSourceEnd = method.sourceEnd = ast.sourceEnd;
method.statements = new Statement[] { returnStatement };
- if ( parent.methods == null ) {
- parent.methods = new AbstractMethodDeclaration[1];
- parent.methods[0] = method;
- } else {
- AbstractMethodDeclaration[] newArray = new AbstractMethodDeclaration[parent.methods.length + 1];
- System.arraycopy(parent.methods, 0, newArray, 0, parent.methods.length);
- newArray[parent.methods.length] = method;
- parent.methods = newArray;
- }
-
- return true;
+ return method;
}
-
- private int toModifier(AccessLevel value) {
- switch ( value ) {
- case MODULE:
- case PACKAGE:
- return 0;
- default:
- case PUBLIC:
- return Modifier.PUBLIC;
- case PROTECTED:
- return Modifier.PROTECTED;
- case PRIVATE:
- return Modifier.PRIVATE;
- }
- }
-
- private boolean nameEquals(char[][] typeName, String string) {
- StringBuilder sb = new StringBuilder();
- boolean first = true;
- for ( char[] elem : typeName ) {
- if ( first ) first = false;
- else sb.append('.');
- sb.append(elem);
- }
-
- return string.contentEquals(sb);
- }
-
}
diff --git a/src/lombok/eclipse/handlers/HandleSetter.java b/src/lombok/eclipse/handlers/HandleSetter.java
new file mode 100644
index 00000000..692061e4
--- /dev/null
+++ b/src/lombok/eclipse/handlers/HandleSetter.java
@@ -0,0 +1,86 @@
+package lombok.eclipse.handlers;
+
+import static lombok.eclipse.handlers.PKG.*;
+
+import org.eclipse.jdt.internal.compiler.ast.ASTNode;
+import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.Annotation;
+import org.eclipse.jdt.internal.compiler.ast.Argument;
+import org.eclipse.jdt.internal.compiler.ast.Assignment;
+import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.FieldReference;
+import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.SingleNameReference;
+import org.eclipse.jdt.internal.compiler.ast.Statement;
+import org.eclipse.jdt.internal.compiler.ast.ThisReference;
+import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.TypeReference;
+import org.eclipse.jdt.internal.compiler.lookup.MethodScope;
+import org.eclipse.jdt.internal.compiler.lookup.TypeIds;
+import org.mangosdk.spi.ProviderFor;
+
+import lombok.Setter;
+import lombok.core.AnnotationValues;
+import lombok.core.TransformationsUtil;
+import lombok.eclipse.EclipseAnnotationHandler;
+import lombok.eclipse.EclipseAST.Node;
+
+@ProviderFor(EclipseAnnotationHandler.class)
+public class HandleSetter implements EclipseAnnotationHandler<Setter> {
+ @Override public boolean handle(AnnotationValues<Setter> annotation, Annotation ast, Node annotationNode) {
+ if ( !(annotationNode.up().get() instanceof FieldDeclaration) ) return false;
+ FieldDeclaration field = (FieldDeclaration) annotationNode.up().get();
+ String setterName = TransformationsUtil.toSetterName(new String(field.name));
+
+ TypeDeclaration parent = (TypeDeclaration) annotationNode.up().up().get();
+ if ( parent.methods != null ) for ( AbstractMethodDeclaration method : parent.methods ) {
+ if ( method.selector != null && new String(method.selector).equals(setterName) ) {
+ annotationNode.addWarning(String.format(
+ "Not generating %s(%s %s): A method with that name already exists",
+ setterName, field.type, new String(field.name)));
+ return false;
+ }
+ }
+
+ int modifier = toModifier(annotation.getInstance().value());
+
+ MethodDeclaration method = generateSetter(parent, field, setterName, modifier, ast);
+
+ if ( parent.methods == null ) {
+ parent.methods = new AbstractMethodDeclaration[1];
+ parent.methods[0] = method;
+ } else {
+ AbstractMethodDeclaration[] newArray = new AbstractMethodDeclaration[parent.methods.length + 1];
+ System.arraycopy(parent.methods, 0, newArray, 0, parent.methods.length);
+ newArray[parent.methods.length] = method;
+ parent.methods = newArray;
+ }
+
+ return true;
+ }
+
+ private MethodDeclaration generateSetter(TypeDeclaration parent, FieldDeclaration field, String name,
+ int modifier, Annotation ast) {
+ long pos = (((long)ast.sourceStart) << 32) | ast.sourceEnd;
+ MethodDeclaration method = new MethodDeclaration(parent.compilationResult);
+ method.modifiers = modifier;
+ method.returnType = TypeReference.baseTypeReference(TypeIds.T_void, 0);
+ method.annotations = null;
+ Argument param = new Argument(field.name, pos, field.type, 0);
+ method.arguments = new Argument[] { param };
+ method.selector = name.toCharArray();
+ method.binding = null;
+ method.thrownExceptions = null;
+ method.typeParameters = null;
+ method.scope = parent.scope == null ? null : new MethodScope(parent.scope, method, false);
+ method.bits |= ASTNode.Bit24;
+ FieldReference thisX = new FieldReference(("this." + new String(field.name)).toCharArray(), pos);
+ thisX.receiver = new ThisReference(ast.sourceStart, ast.sourceEnd);
+ thisX.token = field.name;
+ Assignment assignment = new Assignment(thisX, new SingleNameReference(field.name, pos), (int)pos);
+ method.bodyStart = method.declarationSourceStart = method.sourceStart = ast.sourceStart;
+ method.bodyEnd = method.declarationSourceEnd = method.sourceEnd = ast.sourceEnd;
+ method.statements = new Statement[] { assignment };
+ return method;
+ }
+}
diff --git a/src/lombok/eclipse/handlers/PKG.java b/src/lombok/eclipse/handlers/PKG.java
new file mode 100644
index 00000000..61f71140
--- /dev/null
+++ b/src/lombok/eclipse/handlers/PKG.java
@@ -0,0 +1,36 @@
+package lombok.eclipse.handlers;
+
+import java.lang.reflect.Modifier;
+
+import lombok.AccessLevel;
+
+class PKG {
+ private PKG() {}
+
+ static int toModifier(AccessLevel value) {
+ switch ( value ) {
+ case MODULE:
+ case PACKAGE:
+ return 0;
+ default:
+ case PUBLIC:
+ return Modifier.PUBLIC;
+ case PROTECTED:
+ return Modifier.PROTECTED;
+ case PRIVATE:
+ return Modifier.PRIVATE;
+ }
+ }
+
+ static boolean nameEquals(char[][] typeName, String string) {
+ StringBuilder sb = new StringBuilder();
+ boolean first = true;
+ for ( char[] elem : typeName ) {
+ if ( first ) first = false;
+ else sb.append('.');
+ sb.append(elem);
+ }
+
+ return string.contentEquals(sb);
+ }
+}
diff --git a/src/lombok/javac/handlers/PKG.java b/src/lombok/javac/handlers/PKG.java
index 161248c8..2c038b2d 100644
--- a/src/lombok/javac/handlers/PKG.java
+++ b/src/lombok/javac/handlers/PKG.java
@@ -12,6 +12,8 @@ import lombok.core.TransformationsUtil;
import lombok.javac.JavacAST;
class PKG {
+ private PKG() {}
+
static String toGetterName(JCVariableDecl field) {
CharSequence fieldName = field.name;
generated by cgit (git 2.46.0) at 2024-11-29 05:48:17 +0000