From 0ce25e1e9bcfaeb0cb8f8d5a38caf4bd7544da3b Mon Sep 17 00:00:00 2001 From: Hannes Braun Date: Wed, 30 Aug 2023 16:44:40 +0200 Subject: [PATCH] Use pattern variables in conjunction with instanceof --- src/main/java/hso/autonomy/util/geometry/Area2D.java | 6 ++---- src/main/java/hso/autonomy/util/geometry/Circle2D.java | 3 +-- src/main/java/hso/autonomy/util/geometry/Pose2D.java | 3 +-- src/main/java/hso/autonomy/util/geometry/Pose3D.java | 3 +-- src/main/java/hso/autonomy/util/geometry/Tangent.java | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/java/hso/autonomy/util/geometry/Area2D.java b/src/main/java/hso/autonomy/util/geometry/Area2D.java index 5a06ee9..8aa3ce5 100644 --- a/src/main/java/hso/autonomy/util/geometry/Area2D.java +++ b/src/main/java/hso/autonomy/util/geometry/Area2D.java @@ -152,8 +152,7 @@ public boolean equals(Object obj) return true; } - if (obj instanceof Area2D.Int) { - Area2D.Int other = (Area2D.Int) obj; + if (obj instanceof Int other) { return other.minX == minX && other.maxX == maxX && other.minY == minY && other.maxY == maxY; } @@ -314,8 +313,7 @@ public boolean equals(Object obj) return true; } - if (obj instanceof Area2D.Float) { - Area2D.Float other = (Area2D.Float) obj; + if (obj instanceof Float other) { return other.minX == minX && other.maxX == maxX && other.minY == minY && other.maxY == maxY; } diff --git a/src/main/java/hso/autonomy/util/geometry/Circle2D.java b/src/main/java/hso/autonomy/util/geometry/Circle2D.java index 00839dc..3ab04cb 100644 --- a/src/main/java/hso/autonomy/util/geometry/Circle2D.java +++ b/src/main/java/hso/autonomy/util/geometry/Circle2D.java @@ -195,9 +195,8 @@ public double getDistance(Circle2D other) @Override public boolean equals(Object other) { - if (!(other instanceof Circle2D)) + if (!(other instanceof Circle2D c)) return false; - Circle2D c = (Circle2D) other; return (this.x == c.getX() && this.y == c.getY() && this.radius == c.getRadius()); } diff --git a/src/main/java/hso/autonomy/util/geometry/Pose2D.java b/src/main/java/hso/autonomy/util/geometry/Pose2D.java index c4b0aec..29e537b 100644 --- a/src/main/java/hso/autonomy/util/geometry/Pose2D.java +++ b/src/main/java/hso/autonomy/util/geometry/Pose2D.java @@ -352,9 +352,8 @@ public String toString() @Override public boolean equals(Object other) { - if (!(other instanceof Pose2D)) + if (!(other instanceof Pose2D p)) return false; - Pose2D p = (Pose2D) other; return (this.x == p.x && this.y == p.y && this.angle.equals(p.angle)); } diff --git a/src/main/java/hso/autonomy/util/geometry/Pose3D.java b/src/main/java/hso/autonomy/util/geometry/Pose3D.java index 9799003..7da77b9 100644 --- a/src/main/java/hso/autonomy/util/geometry/Pose3D.java +++ b/src/main/java/hso/autonomy/util/geometry/Pose3D.java @@ -223,8 +223,7 @@ public double getDistanceTo(IPose3D other) @Override public boolean equals(Object obj) { - if (obj instanceof IPose3D) { - IPose3D other = (IPose3D) obj; + if (obj instanceof IPose3D other) { return position.equals(other.getPosition()) && Rotation.distance(orientation, other.getOrientation()) < 0.0001; } diff --git a/src/main/java/hso/autonomy/util/geometry/Tangent.java b/src/main/java/hso/autonomy/util/geometry/Tangent.java index ed27870..bcc9018 100644 --- a/src/main/java/hso/autonomy/util/geometry/Tangent.java +++ b/src/main/java/hso/autonomy/util/geometry/Tangent.java @@ -26,8 +26,7 @@ public Tangent(Pose2D p1, Pose2D p2) @Override public boolean equals(Object other) { - if (other instanceof Tangent) { - Tangent t = (Tangent) other; + if (other instanceof Tangent t) { if ((this.p1.equals(t.p1) && this.p2.equals(t.p2)) || (this.p1.equals(t.p2) && this.p2.equals(t.p1))) return true; }