diff --git a/src/java.desktop/share/classes/java/awt/geom/Arc2D.java b/src/java.desktop/share/classes/java/awt/geom/Arc2D.java index 6646a14537e79..ce5a26161bba8 100644 --- a/src/java.desktop/share/classes/java/awt/geom/Arc2D.java +++ b/src/java.desktop/share/classes/java/awt/geom/Arc2D.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,7 @@ package java.awt.geom; +import java.awt.Rectangle; import java.io.IOException; import java.io.Serial; import java.io.Serializable; @@ -1052,19 +1053,7 @@ public void setFrame(double x, double y, double w, double h) { } /** - * Returns the high-precision framing rectangle of the arc. The framing - * rectangle contains only the part of this {@code Arc2D} that is - * in between the starting and ending angles and contains the pie - * wedge, if this {@code Arc2D} has a {@code PIE} closure type. - *
- * This method differs from the
- * {@link RectangularShape#getBounds() getBounds} in that the
- * {@code getBounds} method only returns the bounds of the
- * enclosing ellipse of this {@code Arc2D} without considering
- * the starting and ending angles of this {@code Arc2D}.
- *
- * @return the {@code Rectangle2D} that represents the arc's
- * framing rectangle.
+ * {@inheritDoc}
* @since 1.2
*/
public Rectangle2D getBounds2D() {
@@ -1110,6 +1099,15 @@ public Rectangle2D getBounds2D() {
return makeBounds(x1, y1, x2, y2);
}
+ /**
+ * {@inheritDoc}
+ * @since 1.2
+ */
+ @Override
+ public Rectangle getBounds() {
+ return getBounds2D().getBounds();
+ }
+
/**
* Constructs a {@code Rectangle2D} of the appropriate precision
* to hold the parameters calculated to be the framing rectangle
diff --git a/test/jdk/java/awt/geom/Arc2D/Arc2DGetBoundsTest.java b/test/jdk/java/awt/geom/Arc2D/Arc2DGetBoundsTest.java
new file mode 100644
index 0000000000000..e3b5abd81bc50
--- /dev/null
+++ b/test/jdk/java/awt/geom/Arc2D/Arc2DGetBoundsTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4197755
+ * @summary Verifies that Arc2D.getBounds() is similar to Arc2D.getBounds2D()
+ */
+
+import java.awt.geom.Arc2D;
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Arc2DGetBoundsTest {
+ public static void main(String[] args) {
+ // Imagine a circle that represents a compass.
+ // This arc represents the northern / top quarter.
+ Arc2D arc = new Arc2D.Double(0, 0, 1000, 1000, 45, 90, Arc2D.PIE);
+
+ // Create 8 pie slices, and place a dot in the center of each
+ List