Revert "Internalize MonitorAware* Classes to Parent #62"

This reverts commit 5b9f3a0.

Author: iloveeclipse

bundles/org.eclipse.swt/Eclipse SWT Tests/win32/org/eclipse/swt/widgets/CoordinateSystemMapperTests.java

@@ -137,7 +137,7 @@ void translateRectangleInGapPartiallyInRightBackAndForthInSingleZoomShouldBeTheS
 	void translateRectangleInGapPartiallyInRightBackAndForthInMultiZoomShouldBeInside() {
 		MultiZoomCoordinateSystemMapper mapper = getMultiZoomCoordinateSystemMapper();
 		setupMonitors(mapper);
-		Rectangle rectInPts = new Rectangle.WithMonitor(1950, 400, 150, 100, monitors[1]);
+		Rectangle rectInPts = new MonitorAwareRectangle(1950, 400, 150, 100, monitors[1]);
 		Rectangle rectInPxs = mapper.translateToDisplayCoordinates(rectInPts, monitors[0].getZoom());
 		assertEquals(rectInPts, mapper.translateFromDisplayCoordinates(rectInPxs, monitors[0].getZoom()));
 	}
@@ -223,15 +223,15 @@ private Point createExpectedPoint(CoordinateSystemMapper mapper, int x, int y, M
 		if (mapper instanceof SingleZoomCoordinateSystemMapper) {
 			return new Point(x, y);
 		} else {
-			return new Point.WithMonitor(x, y, monitor);
+			return new MonitorAwarePoint(x, y, monitor);
 		}
 	}
 
 	private Rectangle createExpectedRectangle(CoordinateSystemMapper mapper, int x, int y, int width, int height, Monitor monitor) {
 		if (mapper instanceof SingleZoomCoordinateSystemMapper) {
 			return new Rectangle(x, y, width, height);
 		} else {
-			return new Rectangle.WithMonitor(x, y, width, height, monitor);
+			return new MonitorAwareRectangle(x, y, width, height, monitor);
 		}
 	}
 

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/MonitorAwarePoint.java

@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Yatta Solutions and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Yatta Solutions - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.graphics;
+
+import org.eclipse.swt.widgets.*;
+
+/**
+ * Instances of this class represent {@link org.eclipse.swt.graphics.Point}
+ * objects along with the context of the monitor in relation to which they are
+ * placed on the display. The monitor awareness makes it easy to scale and
+ * translate the points between pixels and points.
+ *
+ * @since 3.129
+ * @noreference This class is not intended to be referenced by clients
+ */
+public final class MonitorAwarePoint extends Point {
+
+	private static final long serialVersionUID = 6077427420686999194L;
+
+	private final Monitor monitor;
+
+	/**
+	 * Constructs a new MonitorAwarePoint
+	 *
+	 * @param x       the x coordinate of the point
+	 * @param y       the y coordinate of the point
+	 * @param monitor the monitor with whose context the point is created
+	 */
+	public MonitorAwarePoint(int x, int y, Monitor monitor) {
+		super(x, y);
+		this.monitor = monitor;
+	}
+
+	/**
+	 * {@return the monitor with whose context the instance is created}
+	 */
+	public Monitor getMonitor() {
+		return monitor;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		return super.equals(object);
+	}
+
+	@Override
+	public int hashCode() {
+		return super.hashCode();
+	}
+
+}

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/MonitorAwareRectangle.java

@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Yatta Solutions and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Yatta Solutions - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.graphics;
+
+import org.eclipse.swt.widgets.*;
+
+/**
+ * Instances of this class represent {@link org.eclipse.swt.graphics.Rectangle}
+ * objects along with the context of the monitor in relation to which they are
+ * placed on the display. The monitor awareness makes it easy to scale and
+ * translate the rectangles between pixels and points.
+ *
+ * @since 3.129
+ * @noreference This class is not intended to be referenced by clients
+ */
+public final class MonitorAwareRectangle extends Rectangle {
+
+	private static final long serialVersionUID = 5041911840525116925L;
+
+	private final Monitor monitor;
+
+	/**
+	 * Constructs a new MonitorAwareRectangle
+	 *
+	 * @param x the x coordinate of the top left corner of the rectangle
+	 * @param y the y coordinate of the top left corner of the rectangle
+	 * @param width the width of the rectangle
+	 * @param height the height of the rectangle
+	 * @param monitor the monitor with whose context the rectangle is created
+	 */
+	public MonitorAwareRectangle(int x, int y, int width, int height, Monitor monitor) {
+		super(x, y, width, height);
+		this.monitor = monitor;
+	}
+
+	/**
+	 * {@return the monitor with whose context the instance is created}
+	 */
+	public Monitor getMonitor() {
+		return monitor;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		return super.equals(object);
+	}
+
+	@Override
+	public int hashCode() {
+		return super.hashCode();
+	}
+
+	@Override
+	public MonitorAwareRectangle clone() {
+		return new MonitorAwareRectangle(x, y, width, height, monitor);
+	}
+
+}

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java

@@ -16,8 +16,6 @@
 
 import java.io.*;
 
-import org.eclipse.swt.widgets.*;
-
 /**
  * Instances of this class represent places on the (x, y)
  * coordinate plane.
@@ -43,7 +41,7 @@
  * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
  */
 
-public sealed class Point implements Serializable permits Point.WithMonitor {
+public sealed class Point implements Serializable permits MonitorAwarePoint {
 
 	/**
 	 * the x coordinate of the point
@@ -118,41 +116,5 @@ public String toString () {
 	return "Point {" + x + ", " + y + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 }
 
-/**
- * Instances of this class represent {@link org.eclipse.swt.graphics.Point}
- * objects along with the context of the monitor in relation to which they are
- * placed on the display. The monitor awareness makes it easy to scale and
- * translate the points between pixels and points.
- *
- * @since 3.131
- * @noreference This class is not intended to be referenced by clients
- */
-public static final class WithMonitor extends Point {
-
-	private static final long serialVersionUID = 6077427420686999194L;
-
-	private final Monitor monitor;
-
-	/**
-	 * Constructs a new Point.WithMonitor
-	 *
-	 * @param x       the x coordinate of the point
-	 * @param y       the y coordinate of the point
-	 * @param monitor the monitor with whose context the point is created
-	 */
-	public WithMonitor(int x, int y, Monitor monitor) {
-		super(x, y);
-		this.monitor = monitor;
-	}
-
-	/**
-	 * {@return the monitor with whose context the instance is created}
-	 */
-	public Monitor getMonitor() {
-		return monitor;
-	}
-
-}
-
 }
 

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java

@@ -17,7 +17,6 @@
 import java.io.*;
 
 import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
 
 /**
  * Instances of this class represent rectangular areas in an
@@ -46,7 +45,7 @@
  * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
  */
 
-public sealed class Rectangle implements Serializable, Cloneable permits Rectangle.WithMonitor {
+public sealed class Rectangle implements Serializable, Cloneable permits MonitorAwareRectangle {
 
 	/**
 	 * the x coordinate of the rectangle
@@ -374,8 +373,8 @@ public Rectangle union (Rectangle rect) {
  * @since 3.131
  */
 public static Rectangle of(Point topLeft, int width, int height) {
-	if (topLeft instanceof Point.WithMonitor monitorAwareTopLeft) {
-		return new Rectangle.WithMonitor(topLeft.x, topLeft.y, width, height, monitorAwareTopLeft.getMonitor());
+	if (topLeft instanceof MonitorAwarePoint monitorAwareTopLeft) {
+		return new MonitorAwareRectangle(topLeft.x, topLeft.y, width, height, monitorAwareTopLeft.getMonitor());
 	}
 	return new Rectangle(topLeft.x, topLeft.y, width, height);
 }
@@ -397,47 +396,4 @@ public static Rectangle of(Point topLeft, int width, int height) {
 public Rectangle clone() {
 	return new Rectangle(x, y, width, height);
 }
-
-/**
- * Instances of this class represent {@link org.eclipse.swt.graphics.Rectangle}
- * objects along with the context of the monitor in relation to which they are
- * placed on the display. The monitor awareness makes it easy to scale and
- * translate the rectangles between pixels and points.
- *
- * @since 3.131
- * @noreference This class is not intended to be referenced by clients
- */
-public static final class WithMonitor extends Rectangle {
-
-	private static final long serialVersionUID = 5041911840525116925L;
-
-	private final Monitor monitor;
-
-	/**
-	 * Constructs a new Rectangle.WithMonitor
-	 *
-	 * @param x the x coordinate of the top left corner of the rectangle
-	 * @param y the y coordinate of the top left corner of the rectangle
-	 * @param width the width of the rectangle
-	 * @param height the height of the rectangle
-	 * @param monitor the monitor with whose context the rectangle is created
-	 */
-	public WithMonitor(int x, int y, int width, int height, Monitor monitor) {
-		super(x, y, width, height);
-		this.monitor = monitor;
-	}
-
-	/**
-	 * {@return the monitor with whose context the instance is created}
-	 */
-	public Monitor getMonitor() {
-		return monitor;
-	}
-
-	@Override
-	public Rectangle.WithMonitor clone() {
-		return new Rectangle.WithMonitor(x, y, width, height, monitor);
-	}
-
-}
 }

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MultiZoomCoordinateSystemMapper.java

@@ -98,19 +98,19 @@ public Point translateFromDisplayCoordinates(Point point, int zoom) {
 
 	@Override
 	public Point translateToDisplayCoordinates(Point point, int zoom) {
-		Monitor monitor = point instanceof Point.WithMonitor pointWithMonitor ? pointWithMonitor.getMonitor() : null;
+		Monitor monitor = point instanceof MonitorAwarePoint monitorAwarePoint ? monitorAwarePoint.getMonitor() : null;
 		return translateLocationInPointsToPixels(point.x, point.y, monitor);
 	}
 
 	@Override
 	public Rectangle translateFromDisplayCoordinates(Rectangle rect, int zoom) {
-		Monitor monitor = rect instanceof Rectangle.WithMonitor rectWithMonitor ? rectWithMonitor.getMonitor() : null;
+		Monitor monitor = rect instanceof MonitorAwareRectangle monitorAwareRect ? monitorAwareRect.getMonitor() : null;
 		return translateRectangleInPixelsToPoints(rect.x, rect.y, rect.width, rect.height, monitor);
 	}
 
 	@Override
 	public Rectangle translateToDisplayCoordinates(Rectangle rect, int zoom) {
-		Monitor monitor = rect instanceof Rectangle.WithMonitor rectWithMonitor ? rectWithMonitor.getMonitor() : null;
+		Monitor monitor = rect instanceof MonitorAwareRectangle monitorAwareRect ? monitorAwareRect.getMonitor() : null;
 		return translateRectangleInPointsToPixels(rect.x, rect.y, rect.width, rect.height, monitor);
 	}
 
@@ -152,7 +152,7 @@ private Rectangle translateRectangleInPixelsToPoints(int x, int y, int widthInPi
 		Point topLeft = getPointFromPixels(monitor, x, y);
 		int width = DPIUtil.scaleDown(widthInPixels, zoom);
 		int height = DPIUtil.scaleDown(heightInPixels, zoom);
-		Rectangle.WithMonitor rect = new Rectangle.WithMonitor(topLeft.x, topLeft.y, width, height, monitor);
+		MonitorAwareRectangle rect = new MonitorAwareRectangle(topLeft.x, topLeft.y, width, height, monitor);
 		return rect;
 	}
 
@@ -264,7 +264,7 @@ private Point getPointFromPixels(Monitor monitor, int x, int y) {
 		int zoom = getApplicableMonitorZoom(monitor);
 		int mappedX = DPIUtil.scaleDown(x - monitor.clientX, zoom) + monitor.clientX;
 		int mappedY = DPIUtil.scaleDown(y - monitor.clientY, zoom) + monitor.clientY;
-		return new Point.WithMonitor(mappedX, mappedY, monitor);
+		return new MonitorAwarePoint(mappedX, mappedY, monitor);
 	}
 
 	private int getApplicableMonitorZoom(Monitor monitor) {
@@ -273,7 +273,7 @@ private int getApplicableMonitorZoom(Monitor monitor) {
 
 	@Override
 	public Rectangle getContainingMonitorBoundsInPixels(Point point) {
-		Monitor monitor = point instanceof Point.WithMonitor monitorAwarePoint ? monitorAwarePoint.getMonitor()
+		Monitor monitor = point instanceof MonitorAwarePoint monitorAwarePoint ? monitorAwarePoint.getMonitor()
 				: getContainingMonitorForPoints(point.x, point.y);
 		return getMonitorClientAreaInPixels(monitor);
 	}