Refactored the source folders.

11 files changed, 0 insertions, 2615 deletions

diff --git a/src/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/lombok/eclipse/handlers/EclipseHandlerUtil.java
deleted file mode 100644
index 2f676d09..00000000
--- a/src/lombok/eclipse/handlers/EclipseHandlerUtil.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.eclipse.handlers;
-
-import static lombok.eclipse.Eclipse.fromQualifiedName;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import lombok.AccessLevel;
-import lombok.core.TransformationsUtil;
-import lombok.core.AST.Kind;
-import lombok.eclipse.Eclipse;
-import lombok.eclipse.EclipseNode;
-
-import org.eclipse.jdt.internal.compiler.ast.ASTNode;
-import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
-import org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;
-import org.eclipse.jdt.internal.compiler.ast.AllocationExpression;
-import org.eclipse.jdt.internal.compiler.ast.Annotation;
-import org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;
-import org.eclipse.jdt.internal.compiler.ast.EqualExpression;
-import org.eclipse.jdt.internal.compiler.ast.Expression;
-import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration;
-import org.eclipse.jdt.internal.compiler.ast.IfStatement;
-import org.eclipse.jdt.internal.compiler.ast.MarkerAnnotation;
-import org.eclipse.jdt.internal.compiler.ast.NullLiteral;
-import org.eclipse.jdt.internal.compiler.ast.OperatorIds;
-import org.eclipse.jdt.internal.compiler.ast.QualifiedTypeReference;
-import org.eclipse.jdt.internal.compiler.ast.SingleNameReference;
-import org.eclipse.jdt.internal.compiler.ast.Statement;
-import org.eclipse.jdt.internal.compiler.ast.StringLiteral;
-import org.eclipse.jdt.internal.compiler.ast.ThrowStatement;
-import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
-import org.eclipse.jdt.internal.compiler.ast.TypeReference;
-import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
-
-/**
- * Container for static utility methods useful to handlers written for eclipse.
- */
-public class EclipseHandlerUtil {
-	private EclipseHandlerUtil() {
-		//Prevent instantiation
-	}
-	
-	/**
-	 * Checks if the given type reference represents a primitive type.
-	 */
-	public static boolean isPrimitive(TypeReference ref) {
-		if (ref.dimensions() > 0) return false;
-		return TransformationsUtil.PRIMITIVE_TYPE_NAME_PATTERN.matcher(Eclipse.toQualifiedName(ref.getTypeName())).matches();
-	}
-	
-	/**
-	 * Turns an {@code AccessLevel} instance into the flag bit used by eclipse.
-	 */
-	public static int toEclipseModifier(AccessLevel value) {
-		switch (value) {
-		case MODULE:
-		case PACKAGE:
-			return 0;
-		default:
-		case PUBLIC:
-			return ClassFileConstants.AccPublic;
-		case PROTECTED:
-			return ClassFileConstants.AccProtected;
-		case PRIVATE:
-			return ClassFileConstants.AccPrivate;
-		}
-	}
-	
-	/**
-	 * Checks if an eclipse-style array-of-array-of-characters to represent a fully qualified name ('foo.bar.baz'), matches a plain
-	 * string containing the same fully qualified name with dots in the string.
-	 */
-	public 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);
-	}
-	
-	/** Serves as return value for the methods that check for the existence of fields and methods. */
-	public enum MemberExistsResult {
-		NOT_EXISTS, EXISTS_BY_USER, EXISTS_BY_LOMBOK;
-	}
-	
-	/**
-	 * Checks if there is a field with the provided name.
-	 * 
-	 * @param fieldName the field name to check for.
-	 * @param node Any node that represents the Type (TypeDeclaration) to look in, or any child node thereof.
-	 */
-	public static MemberExistsResult fieldExists(String fieldName, EclipseNode node) {
-		while (node != null && !(node.get() instanceof TypeDeclaration)) {
-			node = node.up();
-		}
-		
-		if (node != null && node.get() instanceof TypeDeclaration) {
-			TypeDeclaration typeDecl = (TypeDeclaration)node.get();
-			if (typeDecl.fields != null) for (FieldDeclaration def : typeDecl.fields) {
-				char[] fName = def.name;
-				if (fName == null) continue;
-				if (fieldName.equals(new String(fName))) {
-					EclipseNode existing = node.getNodeFor(def);
-					if (existing == null || !existing.isHandled()) return MemberExistsResult.EXISTS_BY_USER;
-					return MemberExistsResult.EXISTS_BY_LOMBOK;
-				}
-			}
-		}
-		
-		return MemberExistsResult.NOT_EXISTS;
-	}
-	
-	/**
-	 * Checks if there is a method with the provided name. In case of multiple methods (overloading), only
-	 * the first method decides if EXISTS_BY_USER or EXISTS_BY_LOMBOK is returned.
-	 * 
-	 * @param methodName the method name to check for.
-	 * @param node Any node that represents the Type (TypeDeclaration) to look in, or any child node thereof.
-	 */
-	public static MemberExistsResult methodExists(String methodName, EclipseNode node) {
-		while (node != null && !(node.get() instanceof TypeDeclaration)) {
-			node = node.up();
-		}
-		
-		if (node != null && node.get() instanceof TypeDeclaration) {
-			TypeDeclaration typeDecl = (TypeDeclaration)node.get();
-			if (typeDecl.methods != null) for (AbstractMethodDeclaration def : typeDecl.methods) {
-				char[] mName = def.selector;
-				if (mName == null) continue;
-				if (methodName.equals(new String(mName))) {
-					EclipseNode existing = node.getNodeFor(def);
-					if (existing == null || !existing.isHandled()) return MemberExistsResult.EXISTS_BY_USER;
-					return MemberExistsResult.EXISTS_BY_LOMBOK;
-				}
-			}
-		}
-		
-		return MemberExistsResult.NOT_EXISTS;
-	}
-	
-	/**
-	 * Checks if there is a (non-default) constructor. In case of multiple constructors (overloading), only
-	 * the first constructor decides if EXISTS_BY_USER or EXISTS_BY_LOMBOK is returned.
-	 * 
-	 * @param node Any node that represents the Type (TypeDeclaration) to look in, or any child node thereof.
-	 */
-	public static MemberExistsResult constructorExists(EclipseNode node) {
-		while (node != null && !(node.get() instanceof TypeDeclaration)) {
-			node = node.up();
-		}
-		
-		if (node != null && node.get() instanceof TypeDeclaration) {
-			TypeDeclaration typeDecl = (TypeDeclaration)node.get();
-			if (typeDecl.methods != null) for (AbstractMethodDeclaration def : typeDecl.methods) {
-				if (def instanceof ConstructorDeclaration) {
-					if ((def.bits & ASTNode.IsDefaultConstructor) != 0) continue;
-					EclipseNode existing = node.getNodeFor(def);
-					if (existing == null || !existing.isHandled()) return MemberExistsResult.EXISTS_BY_USER;
-					return MemberExistsResult.EXISTS_BY_LOMBOK;
-				}
-			}
-		}
-		
-		return MemberExistsResult.NOT_EXISTS;
-	}
-	
-	/**
-	 * Returns the constructor that's already been generated by lombok.
-	 * Provide any node that represents the type (TypeDeclaration) to look in, or any child node thereof.
-	 */
-	public static EclipseNode getExistingLombokConstructor(EclipseNode node) {
-		while (node != null && !(node.get() instanceof TypeDeclaration)) {
-			node = node.up();
-		}
-		
-		if (node == null) return null;
-		
-		if (node.get() instanceof TypeDeclaration) {
-			for (AbstractMethodDeclaration def : ((TypeDeclaration)node.get()).methods) {
-				if (def instanceof ConstructorDeclaration) {
-					if ((def.bits & ASTNode.IsDefaultConstructor) != 0) continue;
-					EclipseNode existing = node.getNodeFor(def);
-					if (existing.isHandled()) return existing;
-				}
-			}
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * Returns the method that's already been generated by lombok with the given name.
-	 * Provide any node that represents the type (TypeDeclaration) to look in, or any child node thereof.
-	 */
-	public static EclipseNode getExistingLombokMethod(String methodName, EclipseNode node) {
-		while (node != null && !(node.get() instanceof TypeDeclaration)) {
-			node = node.up();
-		}
-		
-		if (node == null) return null;
-		
-		if (node.get() instanceof TypeDeclaration) {
-			for (AbstractMethodDeclaration def : ((TypeDeclaration)node.get()).methods) {
-				char[] mName = def.selector;
-				if (mName == null) continue;
-				if (methodName.equals(new String(mName))) {
-					EclipseNode existing = node.getNodeFor(def);
-					if (existing.isHandled()) return existing;
-				}
-			}
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * Inserts a field into an existing type. The type must represent a {@code TypeDeclaration}.
-	 */
-	public static void injectField(EclipseNode type, FieldDeclaration field) {
-		TypeDeclaration parent = (TypeDeclaration) type.get();
-		
-		if (parent.fields == null) {
-			parent.fields = new FieldDeclaration[1];
-			parent.fields[0] = field;
-		} else {
-			FieldDeclaration[] newArray = new FieldDeclaration[parent.fields.length + 1];
-			System.arraycopy(parent.fields, 0, newArray, 0, parent.fields.length);
-			newArray[parent.fields.length] = field;
-			parent.fields = newArray;
-		}
-		
-		type.add(field, Kind.FIELD).recursiveSetHandled();
-	}
-	
-	/**
-	 * Inserts a method into an existing type. The type must represent a {@code TypeDeclaration}.
-	 */
-	public static void injectMethod(EclipseNode type, AbstractMethodDeclaration method) {
-		TypeDeclaration parent = (TypeDeclaration) type.get();
-		
-		if (parent.methods == null) {
-			parent.methods = new AbstractMethodDeclaration[1];
-			parent.methods[0] = method;
-		} else {
-			boolean injectionComplete = false;
-			if (method instanceof ConstructorDeclaration) {
-				for (int i = 0 ; i < parent.methods.length ; i++) {
-					if (parent.methods[i] instanceof ConstructorDeclaration &&
-							(parent.methods[i].bits & ASTNode.IsDefaultConstructor) != 0) {
-						EclipseNode tossMe = type.getNodeFor(parent.methods[i]);
-						parent.methods[i] = method;
-						if (tossMe != null) tossMe.up().removeChild(tossMe);
-						injectionComplete = true;
-						break;
-					}
-				}
-			}
-			if (!injectionComplete) {
-				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;
-			}
-		}
-		
-		type.add(method, Kind.METHOD).recursiveSetHandled();
-	}
-	
-	/**
-	 * Searches the given field node for annotations and returns each one that matches the provided regular expression pattern.
-	 * 
-	 * Only the simple name is checked - the package and any containing class are ignored.
-	 */
-	public static Annotation[] findAnnotations(FieldDeclaration field, Pattern namePattern) {
-		List<Annotation> result = new ArrayList<Annotation>();
-		if (field.annotations == null) return new Annotation[0];
-		for (Annotation annotation : field.annotations) {
-			TypeReference typeRef = annotation.type;
-			if (typeRef != null && typeRef.getTypeName()!= null) {
-				char[][] typeName = typeRef.getTypeName();
-				String suspect = new String(typeName[typeName.length - 1]);
-				if (namePattern.matcher(suspect).matches()) {
-					result.add(annotation);
-				}
-			}
-		}	
-		return result.toArray(new Annotation[0]);
-	}
-	
-	/**
-	 * Generates a new statement that checks if the given variable is null, and if so, throws a {@code NullPointerException} with the
-	 * variable name as message.
-	 */
-	public static Statement generateNullCheck(AbstractVariableDeclaration variable, ASTNode source) {
-		int pS = source.sourceStart, pE = source.sourceEnd;
-		long p = (long)pS << 32 | pE;
-		
-		if (isPrimitive(variable.type)) return null;
-		AllocationExpression exception = new AllocationExpression();
-		Eclipse.setGeneratedBy(exception, source);
-		exception.type = new QualifiedTypeReference(fromQualifiedName("java.lang.NullPointerException"), new long[]{p, p, p});
-		Eclipse.setGeneratedBy(exception.type, source);
-		exception.arguments = new Expression[] { new StringLiteral(variable.name, pS, pE, 0)};
-		Eclipse.setGeneratedBy(exception.arguments[0], source);
-		ThrowStatement throwStatement = new ThrowStatement(exception, pS, pE);
-		Eclipse.setGeneratedBy(throwStatement, source);
-		
-		SingleNameReference varName = new SingleNameReference(variable.name, p);
-		Eclipse.setGeneratedBy(varName, source);
-		NullLiteral nullLiteral = new NullLiteral(pS, pE);
-		Eclipse.setGeneratedBy(nullLiteral, source);
-		EqualExpression equalExpression = new EqualExpression(varName, nullLiteral, OperatorIds.EQUAL_EQUAL);
-		equalExpression.sourceStart = pS; equalExpression.sourceEnd = pE;
-		Eclipse.setGeneratedBy(equalExpression, source);
-		IfStatement ifStatement = new IfStatement(equalExpression, throwStatement, 0, 0);
-		Eclipse.setGeneratedBy(ifStatement, source);
-		return ifStatement;
-	}
-	
-	/**
-	 * Create an annotation of the given name, and is marked as being generated by the given source.
-	 */
-	public static MarkerAnnotation makeMarkerAnnotation(char[][] name, ASTNode source) {
-		long pos = (long)source.sourceStart << 32 | source.sourceEnd;
-		TypeReference typeRef = new QualifiedTypeReference(name, new long[] {pos, pos, pos});
-		Eclipse.setGeneratedBy(typeRef, source);
-		MarkerAnnotation ann = new MarkerAnnotation(typeRef, (int)(pos >> 32));
-		ann.declarationSourceEnd = ann.sourceEnd = ann.statementEnd = (int)pos;
-		Eclipse.setGeneratedBy(ann, source);
-		return ann;
-	}
-	
-	/**
-	 * Given a list of field names and a node referring to a type, finds each name in the list that does not match a field within the type.
-	 */
-	public static List<Integer> createListOfNonExistentFields(List<String> list, EclipseNode type, boolean excludeStandard, boolean excludeTransient) {
-		boolean[] matched = new boolean[list.size()];
-		
-		for (EclipseNode child : type.down()) {
-			if (list.isEmpty()) break;
-			if (child.getKind() != Kind.FIELD) continue;
-			if (excludeStandard) {
-				if ((((FieldDeclaration)child.get()).modifiers & ClassFileConstants.AccStatic) != 0) continue;
-				if (child.getName().startsWith("$")) continue;
-			}
-			if (excludeTransient && (((FieldDeclaration)child.get()).modifiers & ClassFileConstants.AccTransient) != 0) continue;
-			int idx = list.indexOf(child.getName());
-			if (idx > -1) matched[idx] = true;
-		}
-		
-		List<Integer> problematic = new ArrayList<Integer>();
-		for (int i = 0 ; i < list.size() ; i++) {
-			if (!matched[i]) problematic.add(i);
-		}
-		
-		return problematic;
-	}
-}
diff --git a/src/lombok/eclipse/handlers/HandleCleanup.java b/src/lombok/eclipse/handlers/HandleCleanup.java
deleted file mode 100644
index d296e96b..00000000
--- a/src/lombok/eclipse/handlers/HandleCleanup.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.eclipse.handlers;
-
-import java.util.Arrays;
-
-import lombok.Cleanup;
-import lombok.core.AnnotationValues;
-import lombok.core.AST.Kind;
-import lombok.eclipse.Eclipse;
-import lombok.eclipse.EclipseAnnotationHandler;
-import lombok.eclipse.EclipseNode;
-
-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.Assignment;
-import org.eclipse.jdt.internal.compiler.ast.Block;
-import org.eclipse.jdt.internal.compiler.ast.CaseStatement;
-import org.eclipse.jdt.internal.compiler.ast.CastExpression;
-import org.eclipse.jdt.internal.compiler.ast.LocalDeclaration;
-import org.eclipse.jdt.internal.compiler.ast.MemberValuePair;
-import org.eclipse.jdt.internal.compiler.ast.MessageSend;
-import org.eclipse.jdt.internal.compiler.ast.SingleNameReference;
-import org.eclipse.jdt.internal.compiler.ast.Statement;
-import org.eclipse.jdt.internal.compiler.ast.SwitchStatement;
-import org.eclipse.jdt.internal.compiler.ast.TryStatement;
-import org.mangosdk.spi.ProviderFor;
-
-/**
- * Handles the {@code lombok.Cleanup} annotation for eclipse.
- */
-@ProviderFor(EclipseAnnotationHandler.class)
-public class HandleCleanup implements EclipseAnnotationHandler<Cleanup> {
-	public boolean handle(AnnotationValues<Cleanup> annotation, Annotation ast, EclipseNode annotationNode) {
-		String cleanupName = annotation.getInstance().value();
-		if (cleanupName.length() == 0) {
-			annotationNode.addError("cleanupName cannot be the empty string.");
-			return true;
-		}
-		
-		if (annotationNode.up().getKind() != Kind.LOCAL) {
-			annotationNode.addError("@Cleanup is legal only on local variable declarations.");
-			return true;
-		}
-		
-		LocalDeclaration decl = (LocalDeclaration)annotationNode.up().get();
-		
-		if (decl.initialization == null) {
-			annotationNode.addError("@Cleanup variable declarations need to be initialized.");
-			return true;
-		}
-		
-		EclipseNode ancestor = annotationNode.up().directUp();
-		ASTNode blockNode = ancestor.get();
-		
-		final boolean isSwitch;
-		final Statement[] statements;
-		if (blockNode instanceof AbstractMethodDeclaration) {
-			isSwitch = false;
-			statements = ((AbstractMethodDeclaration)blockNode).statements;
-		} else if (blockNode instanceof Block) {
-			isSwitch = false;
-			statements = ((Block)blockNode).statements;
-		} else if (blockNode instanceof SwitchStatement) {
-			isSwitch = true;
-			statements = ((SwitchStatement)blockNode).statements;
-		} else {
-			annotationNode.addError("@Cleanup is legal only on a local variable declaration inside a block.");
-			return true;
-		}
-		
-		if (statements == null) {
-			annotationNode.addError("LOMBOK BUG: Parent block does not contain any statements.");
-			return true;
-		}
-		
-		int start = 0;
-		for (; start < statements.length ; start++) {
-			if (statements[start] == decl) break;
-		}
-		
-		if (start == statements.length) {
-			annotationNode.addError("LOMBOK BUG: Can't find this local variable declaration inside its parent.");
-			return true;
-		}
-		
-		start++;  //We start with try{} *AFTER* the var declaration.
-		
-		int end;
-		if (isSwitch) {
-			end = start + 1;
-			for (; end < statements.length ; end++) {
-				if (statements[end] instanceof CaseStatement) {
-					break;
-				}
-			}
-		} else end = statements.length;
-		
-		//At this point:
-		//  start-1 = Local Declaration marked with @Cleanup
-		//  start = first instruction that needs to be wrapped into a try block
-		//  end = last intruction of the scope -OR- last instruction before the next case label in switch statements.
-		//  hence:
-		//  [start, end) = statements for the try block.
-		
-		Statement[] tryBlock = new Statement[end - start];
-		System.arraycopy(statements, start, tryBlock, 0, end-start);
-		//Remove the stuff we just dumped into the tryBlock, and then leave room for the try node.
-		int newStatementsLength = statements.length - (end-start); //Remove room for every statement moved into try block...
-		newStatementsLength += 1; //But add room for the TryStatement node itself.
-		Statement[] newStatements = new Statement[newStatementsLength];
-		System.arraycopy(statements, 0, newStatements, 0, start); //copy all statements before the try block verbatim.
-		System.arraycopy(statements, end, newStatements, start+1, statements.length - end); //For switch statements.
-		
-		doAssignmentCheck(annotationNode, tryBlock, decl.name);
-		
-		TryStatement tryStatement = new TryStatement();
-		Eclipse.setGeneratedBy(tryStatement, ast);
-		tryStatement.tryBlock = new Block(0);
-		tryStatement.tryBlock.statements = tryBlock;
-		newStatements[start] = tryStatement;
-		
-		Statement[] finallyBlock = new Statement[1];
-		MessageSend unsafeClose = new MessageSend();
-		Eclipse.setGeneratedBy(unsafeClose, ast);
-		unsafeClose.sourceStart = ast.sourceStart;
-		unsafeClose.sourceEnd = ast.sourceEnd;
-		SingleNameReference receiver = new SingleNameReference(decl.name, 0);
-		Eclipse.setGeneratedBy(receiver, ast);
-		unsafeClose.receiver = receiver;
-		long nameSourcePosition = (long)ast.sourceStart << 32 | ast.sourceEnd;
-		if (ast.memberValuePairs() != null) for (MemberValuePair pair : ast.memberValuePairs()) {
-			if (pair.name != null && new String(pair.name).equals("value")) {
-				nameSourcePosition = (long)pair.value.sourceStart << 32 | pair.value.sourceEnd;
-				break;
-			}
-		}
-		unsafeClose.nameSourcePosition = nameSourcePosition;
-		unsafeClose.selector = cleanupName.toCharArray();
-		finallyBlock[0] = unsafeClose;
-		tryStatement.finallyBlock = new Block(0);
-		Eclipse.setGeneratedBy(tryStatement.finallyBlock, ast);
-		tryStatement.finallyBlock.statements = finallyBlock;
-		
-		tryStatement.catchArguments = null;
-		tryStatement.catchBlocks = null;
-		
-		if (blockNode instanceof AbstractMethodDeclaration) {
-			((AbstractMethodDeclaration)blockNode).statements = newStatements;
-		} else if (blockNode instanceof Block) {
-			((Block)blockNode).statements = newStatements;
-		} else if (blockNode instanceof SwitchStatement) {
-			((SwitchStatement)blockNode).statements = newStatements;
-		}
-		
-		ancestor.rebuild();
-		
-		return true;
-	}
-	
-	private void doAssignmentCheck(EclipseNode node, Statement[] tryBlock, char[] varName) {
-		for (Statement statement : tryBlock) doAssignmentCheck0(node, statement, varName);
-	}
-	
-	private void doAssignmentCheck0(EclipseNode node, Statement statement, char[] varName) {
-		if (statement instanceof Assignment)
-			doAssignmentCheck0(node, ((Assignment)statement).expression, varName);
-		else if (statement instanceof LocalDeclaration)
-			doAssignmentCheck0(node, ((LocalDeclaration)statement).initialization, varName);
-		else if (statement instanceof CastExpression)
-			doAssignmentCheck0(node, ((CastExpression)statement).expression, varName);
-		else if (statement instanceof SingleNameReference) {
-			if (Arrays.equals(((SingleNameReference)statement).token, varName)) {
-				EclipseNode problemNode = node.getNodeFor(statement);
-				if (problemNode != null) problemNode.addWarning(
-						"You're assigning an auto-cleanup variable to something else. This is a bad idea.");
-			}
-		}
-	}
-}
diff --git a/src/lombok/eclipse/handlers/HandleData.java b/src/lombok/eclipse/handlers/HandleData.java
deleted file mode 100644
index 8c4e07ce..00000000
--- a/src/lombok/eclipse/handlers/HandleData.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.eclipse.handlers;
-
-import static lombok.eclipse.Eclipse.*;
-import static lombok.eclipse.handlers.EclipseHandlerUtil.*;
-
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.core.AnnotationValues;
-import lombok.core.TransformationsUtil;
-import lombok.core.AST.Kind;
-import lombok.eclipse.Eclipse;
-import lombok.eclipse.EclipseAnnotationHandler;
-import lombok.eclipse.EclipseNode;
-import lombok.eclipse.handlers.EclipseHandlerUtil.MemberExistsResult;
-
-import org.eclipse.jdt.internal.compiler.ast.ASTNode;
-import org.eclipse.jdt.internal.compiler.ast.AllocationExpression;
-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.CompilationUnitDeclaration;
-import org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;
-import org.eclipse.jdt.internal.compiler.ast.ExplicitConstructorCall;
-import org.eclipse.jdt.internal.compiler.ast.Expression;
-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.ParameterizedSingleTypeReference;
-import org.eclipse.jdt.internal.compiler.ast.ReturnStatement;
-import org.eclipse.jdt.internal.compiler.ast.SingleNameReference;
-import org.eclipse.jdt.internal.compiler.ast.SingleTypeReference;
-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.TypeParameter;
-import org.eclipse.jdt.internal.compiler.ast.TypeReference;
-import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
-import org.mangosdk.spi.ProviderFor;
-
-/**
- * Handles the {@code lombok.Data} annotation for eclipse.
- */
-@ProviderFor(EclipseAnnotationHandler.class)
-public class HandleData implements EclipseAnnotationHandler<Data> {
-	public boolean handle(AnnotationValues<Data> annotation, Annotation ast, EclipseNode annotationNode) {
-		Data ann = annotation.getInstance();
-		EclipseNode typeNode = annotationNode.up();
-		
-		TypeDeclaration typeDecl = null;
-		if (typeNode.get() instanceof TypeDeclaration) typeDecl = (TypeDeclaration) typeNode.get();
-		int modifiers = typeDecl == null ? 0 : typeDecl.modifiers;
-		boolean notAClass = (modifiers &
-				(ClassFileConstants.AccInterface | ClassFileConstants.AccAnnotation | ClassFileConstants.AccEnum)) != 0;
-		
-		if (typeDecl == null || notAClass) {
-			annotationNode.addError("@Data is only supported on a class.");
-			return false;
-		}
-		
-		List<EclipseNode> nodesForConstructor = new ArrayList<EclipseNode>();
-		for (EclipseNode child : typeNode.down()) {
-			if (child.getKind() != Kind.FIELD) continue;
-			FieldDeclaration fieldDecl = (FieldDeclaration) child.get();
-			//Skip fields that start with $
-			if (fieldDecl.name.length > 0 && fieldDecl.name[0] == '$') continue;
-			//Skip static fields.
-			if ((fieldDecl.modifiers & ClassFileConstants.AccStatic) != 0) continue;
-			boolean isFinal = (fieldDecl.modifiers & ClassFileConstants.AccFinal) != 0;
-			boolean isNonNull = findAnnotations(fieldDecl, TransformationsUtil.NON_NULL_PATTERN).length != 0;
-			if ((isFinal || isNonNull) && fieldDecl.initialization == null) nodesForConstructor.add(child);
-			new HandleGetter().generateGetterForField(child, annotationNode.get());
-			if (!isFinal) new HandleSetter().generateSetterForField(child, annotationNode.get());
-		}
-		
-		new HandleToString().generateToStringForType(typeNode, annotationNode);
-		new HandleEqualsAndHashCode().generateEqualsAndHashCodeForType(typeNode, annotationNode);
-		
-		//Careful: Generate the public static constructor (if there is one) LAST, so that any attempt to
-		//'find callers' on the annotation node will find callers of the constructor, which is by far the
-		//most useful of the many methods built by @Data. This trick won't work for the non-static constructor,
-		//for whatever reason, though you can find callers of that one by focusing on the class name itself
-		//and hitting 'find callers'.
-		
-		if (constructorExists(typeNode) == MemberExistsResult.NOT_EXISTS) {
-			ConstructorDeclaration constructor = createConstructor(
-					ann.staticConstructor().length() == 0, typeNode, nodesForConstructor, ast);
-			injectMethod(typeNode, constructor);
-		}
-		
-		if (ann.staticConstructor().length() > 0) {
-			if (methodExists("of", typeNode) == MemberExistsResult.NOT_EXISTS) {
-				MethodDeclaration staticConstructor = createStaticConstructor(
-						ann.staticConstructor(), typeNode, nodesForConstructor, ast);
-				injectMethod(typeNode, staticConstructor);
-			}
-		}
-		
-		return false;
-	}
-	
-	private ConstructorDeclaration createConstructor(boolean isPublic,
-			EclipseNode type, Collection<EclipseNode> fields, ASTNode source) {
-		long p = (long)source.sourceStart << 32 | source.sourceEnd;
-		
-		ConstructorDeclaration constructor = new ConstructorDeclaration(
-				((CompilationUnitDeclaration) type.top().get()).compilationResult);
-		Eclipse.setGeneratedBy(constructor, source);
-		
-		constructor.modifiers = EclipseHandlerUtil.toEclipseModifier(isPublic ? AccessLevel.PUBLIC : AccessLevel.PRIVATE);
-		constructor.annotations = null;
-		constructor.selector = ((TypeDeclaration)type.get()).name;
-		constructor.constructorCall = new ExplicitConstructorCall(ExplicitConstructorCall.ImplicitSuper);
-		Eclipse.setGeneratedBy(constructor.constructorCall, source);
-		constructor.thrownExceptions = null;
-		constructor.typeParameters = null;
-		constructor.bits |= Eclipse.ECLIPSE_DO_NOT_TOUCH_FLAG;
-		constructor.bodyStart = constructor.declarationSourceStart = constructor.sourceStart = source.sourceStart;
-		constructor.bodyEnd = constructor.declarationSourceEnd = constructor.sourceEnd = source.sourceEnd;
-		constructor.arguments = null;
-		
-		List<Argument> args = new ArrayList<Argument>();
-		List<Statement> assigns = new ArrayList<Statement>();
-		List<Statement> nullChecks = new ArrayList<Statement>();
-		
-		for (EclipseNode fieldNode : fields) {
-			FieldDeclaration field = (FieldDeclaration) fieldNode.get();
-			FieldReference thisX = new FieldReference(("this." + new String(field.name)).toCharArray(), p);
-			Eclipse.setGeneratedBy(thisX, source);
-			thisX.receiver = new ThisReference((int)(p >> 32), (int)p);
-			Eclipse.setGeneratedBy(thisX.receiver, source);
-			thisX.token = field.name;
-			
-			SingleNameReference assignmentNameRef = new SingleNameReference(field.name, p);
-			Eclipse.setGeneratedBy(assignmentNameRef, source);
-			Assignment assignment = new Assignment(thisX, assignmentNameRef, (int)p);
-			Eclipse.setGeneratedBy(assignment, source);
-			assigns.add(assignment);
-			long fieldPos = (((long)field.sourceStart) << 32) | field.sourceEnd;
-			Argument argument = new Argument(field.name, fieldPos, copyType(field.type, source), Modifier.FINAL);
-			Eclipse.setGeneratedBy(argument, source);
-			Annotation[] nonNulls = findAnnotations(field, TransformationsUtil.NON_NULL_PATTERN);
-			Annotation[] nullables = findAnnotations(field, TransformationsUtil.NULLABLE_PATTERN);
-			if (nonNulls.length != 0) {
-				Statement nullCheck = generateNullCheck(field, source);
-				if (nullCheck != null) nullChecks.add(nullCheck);
-			}
-			Annotation[] copiedAnnotations = copyAnnotations(nonNulls, nullables, source);
-			if (copiedAnnotations.length != 0) argument.annotations = copiedAnnotations;
-			args.add(argument);
-		}
-		
-		nullChecks.addAll(assigns);
-		constructor.statements = nullChecks.isEmpty() ? null : nullChecks.toArray(new Statement[nullChecks.size()]);
-		constructor.arguments = args.isEmpty() ? null : args.toArray(new Argument[args.size()]);
-		return constructor;
-	}
-	
-	private MethodDeclaration createStaticConstructor(String name, EclipseNode type, Collection<EclipseNode> fields, ASTNode source) {
-		int pS = source.sourceStart, pE = source.sourceEnd;
-		long p = (long)pS << 32 | pE;
-		
-		MethodDeclaration constructor = new MethodDeclaration(
-				((CompilationUnitDeclaration) type.top().get()).compilationResult);
-		Eclipse.setGeneratedBy(constructor, source);
-		
-		constructor.modifiers = EclipseHandlerUtil.toEclipseModifier(AccessLevel.PUBLIC) | Modifier.STATIC;
-		TypeDeclaration typeDecl = (TypeDeclaration) type.get();
-		if (typeDecl.typeParameters != null && typeDecl.typeParameters.length > 0) {
-			TypeReference[] refs = new TypeReference[typeDecl.typeParameters.length];
-			int idx = 0;
-			for (TypeParameter param : typeDecl.typeP