Issue 366: don't call the getter twice, fixed for Eclipse.

7 files changed, 51 insertions, 21 deletions

diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java
index 4ee0ebcd..ae7eb0bb 100644
--- a/test/transform/resource/after-ecj/Accessors.java
+++ b/test/transform/resource/after-ecj/Accessors.java
@@ -74,7 +74,9 @@ class AccessorsChain {
     final @java.lang.SuppressWarnings("all") AccessorsPrefix3 other = (AccessorsPrefix3) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
-    if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
+    final java.lang.Object this$fName = this.getName();
+    final java.lang.Object other$fName = other.getName();
+    if (((this$fName == null) ? (other$fName != null) : (! this$fName.equals(other$fName))))
         return false;
     return true;
   }
@@ -84,7 +86,8 @@ class AccessorsChain {
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 31;
     int result = 1;
-    result = ((result * PRIME) + ((this.getName() == null) ? 0 : this.getName().hashCode()));
+    final java.lang.Object $fName = this.getName();
+    result = ((result * PRIME) + (($fName == null) ? 0 : $fName.hashCode()));
     return result;
   }
   AccessorsPrefix3() {
diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java
index 44ae0ddc..76a4b47d 100644
--- a/test/transform/resource/after-ecj/DataOnLocalClass.java
+++ b/test/transform/resource/after-ecj/DataOnLocalClass.java
@@ -30,7 +30,9 @@ class DataOnLocalClass1 {
             return false;
         if ((this.getX() != other.getX()))
             return false;
-        if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
+        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;
         return true;
       }
@@ -41,7 +43,8 @@ class DataOnLocalClass1 {
         final int PRIME = 31;
         int result = 1;
         result = ((result * PRIME) + this.getX());
-        result = ((result * PRIME) + ((this.getName() == null) ? 0 : this.getName().hashCode()));
+        final java.lang.Object $name = this.getName();
+        result = ((result * PRIME) + (($name == null) ? 0 : $name.hashCode()));
         return result;
       }
       public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
@@ -77,7 +80,9 @@ class DataOnLocalClass2 {
           final @java.lang.SuppressWarnings("all") InnerLocal other = (InnerLocal) o;
           if ((! other.canEqual((java.lang.Object) this)))
               return false;
-          if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
+          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;
           return true;
         }
@@ -87,7 +92,8 @@ class DataOnLocalClass2 {
         public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
           final int PRIME = 31;
           int result = 1;
-          result = ((result * PRIME) + ((this.getName() == null) ? 0 : this.getName().hashCode()));
+          final java.lang.Object $name = this.getName();
+          result = ((result * PRIME) + (($name == null) ? 0 : $name.hashCode()));
           return result;
         }
         public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
diff --git a/test/transform/resource/after-ecj/DataPlain.java b/test/transform/resource/after-ecj/DataPlain.java
index 6322d347..0828bc44 100644
--- a/test/transform/resource/after-ecj/DataPlain.java
+++ b/test/transform/resource/after-ecj/DataPlain.java
@@ -25,7 +25,9 @@ import lombok.Data;
         return false;
     if ((this.getX() != other.getX()))
         return false;
-    if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
+    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;
     return true;
   }
@@ -36,7 +38,8 @@ import lombok.Data;
     final int PRIME = 31;
     int result = 1;
     result = ((result * PRIME) + this.getX());
-    result = ((result * PRIME) + ((this.getName() == null) ? 0 : this.getName().hashCode()));
+    final java.lang.Object $name = this.getName();
+    result = ((result * PRIME) + (($name == null) ? 0 : $name.hashCode()));
     return result;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
@@ -69,7 +72,9 @@ import lombok.Data;
         return false;
     if ((this.getX() != other.getX()))
         return false;
-    if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
+    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;
     return true;
   }
@@ -80,7 +85,8 @@ import lombok.Data;
     final int PRIME = 31;
     int result = 1;
     result = ((result * PRIME) + this.getX());
-    result = ((result * PRIME) + ((this.getName() == null) ? 0 : this.getName().hashCode()));
+    final java.lang.Object $name = this.getName();
+    result = ((result * PRIME) + (($name == null) ? 0 : $name.hashCode()));
     return result;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
@@ -111,7 +117,9 @@ final @Data class Data3 {
     final @java.lang.SuppressWarnings("all") Data3 other = (Data3) o;
     if ((this.getX() != other.getX()))
         return false;
-    if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
+    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;
     return true;
   }
@@ -119,7 +127,8 @@ final @Data class Data3 {
     final int PRIME = 31;
     int result = 1;
     result = ((result * PRIME) + this.getX());
-    result = ((result * PRIME) + ((this.getName() == null) ? 0 : this.getName().hashCode()));
+    final java.lang.Object $name = this.getName();
+    result = ((result * PRIME) + (($name == null) ? 0 : $name.hashCode()));
     return result;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
diff --git a/test/transform/resource/after-ecj/DataWithGetter.java b/test/transform/resource/after-ecj/DataWithGetter.java
index 80e11be4..cc9ce1c0 100644
--- a/test/transform/resource/after-ecj/DataWithGetter.java
+++ b/test/transform/resource/after-ecj/DataWithGetter.java
@@ -24,7 +24,9 @@
         return false;
     if ((this.getY() != other.getY()))
         return false;
-    if (((this.getZ() == null) ? (other.getZ() != null) : (! this.getZ().equals((java.lang.Object) other.getZ()))))
+    final java.lang.Object this$z = this.getZ();
+    final java.lang.Object other$z = other.getZ();
+    if (((this$z == null) ? (other$z != null) : (! this$z.equals(other$z))))
         return false;
     return true;
   }
@@ -36,7 +38,8 @@
     int result = 1;
     result = ((result * PRIME) + this.getX());
     result = ((result * PRIME) + this.getY());
-    result = ((result * PRIME) + ((this.getZ() == null) ? 0 : this.getZ().hashCode()));
+    final java.lang.Object $z = this.getZ();
+    result = ((result * PRIME) + (($z == null) ? 0 : $z.hashCode()));
     return result;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
diff --git a/test/transform/resource/after-ecj/DataWithGetterNone.java b/test/transform/resource/after-ecj/DataWithGetterNone.java
index a31ebece..6fa5659e 100644
--- a/test/transform/resource/after-ecj/DataWithGetterNone.java
+++ b/test/transform/resource/after-ecj/DataWithGetterNone.java
@@ -24,7 +24,9 @@
         return false;
     if ((this.y != other.y))
         return false;
-    if (((this.z == null) ? (other.z != null) : (! this.z.equals((java.lang.Object) other.z))))
+    final java.lang.Object this$z = this.z;
+    final java.lang.Object other$z = other.z;
+    if (((this$z == null) ? (other$z != null) : (! this$z.equals(other$z))))
         return false;
     return true;
   }
@@ -36,7 +38,8 @@
     int result = 1;
     result = ((result * PRIME) + this.x);
     result = ((result * PRIME) + this.y);
-    result = ((result * PRIME) + ((this.z == null) ? 0 : this.z.hashCode()));
+    final java.lang.Object $z = this.z;
+    result = ((result * PRIME) + (($z == null) ? 0 : $z.hashCode()));
     return result;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
diff --git a/test/transform/resource/after-ecj/EqualsAndHashCode.java b/test/transform/resource/after-ecj/EqualsAndHashCode.java
index 0417f54c..ebbc1ffe 100644
--- a/test/transform/resource/after-ecj/EqualsAndHashCode.java
+++ b/test/transform/resource/after-ecj/EqualsAndHashCode.java
@@ -25,7 +25,7 @@
     final java.lang.Object this$b = this.b;
     final java.lang.Object other$b = other.b;
     if (((this$b == null) ? (other$b != null) : (! this$b.equals(other$b))))
-    	return false;
+        return false;
     return true;
   }
   public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
diff --git a/test/transform/resource/after-ecj/GetterLazyEahcToString.java b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
index 15c774a2..9faab0de 100644
--- a/test/transform/resource/after-ecj/GetterLazyEahcToString.java
+++ b/test/transform/resource/after-ecj/GetterLazyEahcToString.java
@@ -29,9 +29,13 @@
     final @java.lang.SuppressWarnings("all") GetterLazyEahcToString other = (GetterLazyEahcToString) o;
     if ((! other.canEqual((java.lang.Object) this)))
         return false;
-    if (((this.getValue() == null) ? (other.getValue() != null) : (! this.getValue().equals((java.lang.Object) other.getValue()))))
+    final java.lang.Object this$value = this.getValue();
+    final java.lang.Object other$value = other.getValue();
+    if (((this$value == null) ? (other$value != null) : (! this$value.equals(other$value))))
         return false;
-    if (((this.value2 == null) ? (other.value2 != null) : (! this.value2.equals((java.lang.Object) other.value2))))
+    final java.lang.Object this$value2 = this.value2;
+    final java.lang.Object other$value2 = other.value2;
+    if (((this$value2 == null) ? (other$value2 != null) : (! this$value2.equals(other$value2))))
         return false;
     return true;
   }
@@ -41,8 +45,10 @@
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 31;
     int result = 1;
-    result = ((result * PRIME) + ((this.getValue() == null) ? 0 : this.getValue().hashCode()));
-    result = ((result * PRIME) + ((this.value2 == null) ? 0 : this.value2.hashCode()));
+    final java.lang.Object $value = this.getValue();
+    result = ((result * PRIME) + (($value == null) ? 0 : $value.hashCode()));
+    final java.lang.Object $value2 = this.value2;
+    result = ((result * PRIME) + (($value2 == null) ? 0 : $value2.hashCode()));
     return result;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {