From 9f69893ce2efd6ca0a6ef64022e48e49fc2b33f0 Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Wed, 2 Dec 2009 04:21:31 +0100
Subject: Changed the order of the generated methods in for @Data -
 Constructor(s) - Getters/Setters per field - equals - hashCode - toString
 Added first test for @Data

---
 .../lombok/eclipse/handlers/HandleEqualsAndHashCode.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java')

diff --git a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
index 7c0980c8..2c636916 100644
--- a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
+++ b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
@@ -204,32 +204,32 @@ public class HandleEqualsAndHashCode implements EclipseAnnotationHandler<EqualsA
 			}
 		}
 		
-		switch (methodExists("hashCode", typeNode)) {
+		switch (methodExists("equals", typeNode)) {
 		case NOT_EXISTS:
-			MethodDeclaration hashCode = createHashCode(typeNode, nodesForEquality, callSuper, errorNode.get());
-			injectMethod(typeNode, hashCode);
+			MethodDeclaration equals = createEquals(typeNode, nodesForEquality, callSuper, errorNode.get());
+			injectMethod(typeNode, equals);
 			break;
 		case EXISTS_BY_LOMBOK:
 			break;
 		default:
 		case EXISTS_BY_USER:
 			if (whineIfExists) {
-				errorNode.addWarning("Not generating hashCode(): A method with that name already exists");
+				errorNode.addWarning("Not generating equals(Object other): A method with that name already exists");
 			}
 			break;
 		}
 		
-		switch (methodExists("equals", typeNode)) {
+		switch (methodExists("hashCode", typeNode)) {
 		case NOT_EXISTS:
-			MethodDeclaration equals = createEquals(typeNode, nodesForEquality, callSuper, errorNode.get());
-			injectMethod(typeNode, equals);
+			MethodDeclaration hashCode = createHashCode(typeNode, nodesForEquality, callSuper, errorNode.get());
+			injectMethod(typeNode, hashCode);
 			break;
 		case EXISTS_BY_LOMBOK:
 			break;
 		default:
 		case EXISTS_BY_USER:
 			if (whineIfExists) {
-				errorNode.addWarning("Not generating equals(Object other): A method with that name already exists");
+				errorNode.addWarning("Not generating hashCode(): A method with that name already exists");
 			}
 			break;
 		}
-- 
cgit