Merge branch 'master' into extensionmethod

Conflicts:
	build.xml

1 files changed, 5 insertions, 5 deletions

diff --git a/test/transform/resource/after-ecj/BuilderDefaults.java b/test/transform/resource/after-ecj/BuilderDefaults.java
index 46f55bef..c9be219d 100644
--- a/test/transform/resource/after-ecj/BuilderDefaults.java
+++ b/test/transform/resource/after-ecj/BuilderDefaults.java
@@ -72,25 +72,25 @@ public final @Value @Builder class BuilderDefaults {
     final BuilderDefaults other = (BuilderDefaults) o;
     if ((this.getX() != other.getX()))
         return false;
+    if ((this.getZ() != other.getZ()))
+        return false;
     final java.lang.Object this$name = this.getName();
     final java.lang.Object other$name = other.getName();
     if (((this$name == null) ? (other$name != null) : (! this$name.equals(other$name))))
         return false;
-    if ((this.getZ() != other.getZ()))
-        return false;
     return true;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
     result = ((result * PRIME) + this.getX());
-    final java.lang.Object $name = this.getName();
-    result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode()));
     final long $z = this.getZ();
     result = ((result * PRIME) + (int) ($z ^ ($z >>> 32)));
+    final java.lang.Object $name = this.getName();
+    result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode()));
     return result;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((((("BuilderDefaults(x=" + this.getX()) + ", name=") + this.getName()) + ", z=") + this.getZ()) + ")");
   }
-}
+}
\ No newline at end of file