#1543: First primitives, then primitive wrappers, then other references

2 files changed, 12 insertions, 12 deletions

diff --git a/test/transform/resource/after-delombok/ValueStaticConstructorOf.java b/test/transform/resource/after-delombok/ValueStaticConstructorOf.java
index fe75f823..e4564628 100644
--- a/test/transform/resource/after-delombok/ValueStaticConstructorOf.java
+++ b/test/transform/resource/after-delombok/ValueStaticConstructorOf.java
@@ -23,12 +23,12 @@ public final class ValueStaticConstructorOf {
 		if (o == this) return true;
 		if (!(o instanceof ValueStaticConstructorOf)) return false;
 		final ValueStaticConstructorOf other = (ValueStaticConstructorOf) o;
-		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;
 		final java.lang.Object this$price = this.getPrice();
 		final java.lang.Object other$price = other.getPrice();
 		if (this$price == null ? other$price != null : !this$price.equals(other$price)) 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;
 		return true;
 	}
 	@java.lang.Override
@@ -36,10 +36,10 @@ public final class ValueStaticConstructorOf {
 	public int hashCode() {
 		final int PRIME = 59;
 		int result = 1;
-		final java.lang.Object $name = this.getName();
-		result = result * PRIME + ($name == null ? 43 : $name.hashCode());
 		final java.lang.Object $price = this.getPrice();
 		result = result * PRIME + ($price == null ? 43 : $price.hashCode());
+		final java.lang.Object $name = this.getName();
+		result = result * PRIME + ($name == null ? 43 : $name.hashCode());
 		return result;
 	}
 	@java.lang.Override
diff --git a/test/transform/resource/after-ecj/ValueStaticConstructorOf.java b/test/transform/resource/after-ecj/ValueStaticConstructorOf.java
index 6cf71ed4..87883566 100644
--- a/test/transform/resource/after-ecj/ValueStaticConstructorOf.java
+++ b/test/transform/resource/after-ecj/ValueStaticConstructorOf.java
@@ -19,23 +19,23 @@ public final @Value(staticConstructor = "of") class ValueStaticConstructorOf {
     if ((! (o instanceof ValueStaticConstructorOf)))
         return false;
     final ValueStaticConstructorOf other = (ValueStaticConstructorOf) o;
-    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;
     final java.lang.Object this$price = this.getPrice();
     final java.lang.Object other$price = other.getPrice();
     if (((this$price == null) ? (other$price != null) : (! this$price.equals(other$price))))
         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;
     return true;
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
     final int PRIME = 59;
     int result = 1;
-    final java.lang.Object $name = this.getName();
-    result = ((result * PRIME) + (($name == null) ? 43 : $name.hashCode()));
     final java.lang.Object $price = this.getPrice();
     result = ((result * PRIME) + (($price == null) ? 43 : $price.hashCode()));
+    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() {
@@ -44,4 +44,4 @@ public final @Value(staticConstructor = "of") class ValueStaticConstructorOf {
   public static @java.lang.SuppressWarnings("all") ValueStaticConstructorOf of(final String name, final Double price) {
     return new ValueStaticConstructorOf(name, price);
   }
-}
\ No newline at end of file
+}