Changeset 19568 in josm for trunk

Timestamp:

2026-04-17T07:46:00+02:00 (6 days ago)

Author:

GerdP

Message:

see #24695: Unpredictable result when scaling or rotating an object again
fix unit tests (testEqualsContract())

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• RotateCommand.java (modified) (2 diffs)
• ScaleCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/RotateCommand.java

@@ -124 +124 @@
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), pivot, startAngle, rotationAngle);
+        return Objects.hash(super.hashCode(), pivot, startAngle, rotationAngle, deltaAngle);
     }
 
@@ -135 +135 @@
         return Double.compare(that.startAngle, startAngle) == 0 &&
                 Double.compare(that.rotationAngle, rotationAngle) == 0 &&
-                Objects.equals(pivot, that.pivot);
+                Objects.equals(pivot, that.pivot) &&
+                Objects.equals(deltaAngle, that.deltaAngle);
     }
 }

trunk/src/org/openstreetmap/josm/command/ScaleCommand.java

@@ -123 +123 @@
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), pivot, scalingFactor, startEN);
+        return Objects.hash(super.hashCode(), pivot, scalingFactor, startEN, deltaScalingFactor);
     }
 
@@ -134 +134 @@
         return Double.compare(that.scalingFactor, scalingFactor) == 0 &&
                 Objects.equals(pivot, that.pivot) &&
-                Objects.equals(startEN, that.startEN);
+                Objects.equals(startEN, that.startEN) &&
+                Objects.equals(deltaScalingFactor, that.deltaScalingFactor);
     }
 }