From a88f187095b0eea6fbb3bf0b50f4d6bf2aa48db3 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Wed, 12 Mar 2025 10:38:19 -0700 Subject: [PATCH 1/2] Revert `sealed` appended to `Point` and `Rectangle`. --- .../Eclipse SWT/common/org/eclipse/swt/graphics/Point.java | 2 +- .../Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java index 6de7f344460..bf1b6ec5857 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java @@ -41,7 +41,7 @@ * @see Sample code and further information */ -public sealed class Point implements Serializable permits MonitorAwarePoint { +public class Point implements Serializable { /** * the x coordinate of the point diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java index b8e78d3b8da..477ef6cc96c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java @@ -45,7 +45,7 @@ * @see Sample code and further information */ -public sealed class Rectangle implements Serializable permits MonitorAwareRectangle { +public class Rectangle implements Serializable { /** * the x coordinate of the rectangle From 7dc41edde69ad33ae8b4a0b8a72f8d52b80d3409 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Wed, 12 Mar 2025 10:57:58 -0700 Subject: [PATCH 2/2] Make `MonitorAware` package-private and move it next to the win32-specific `MultiZoomCoordinateSystemMapper`. --- .../org/eclipse/swt/widgets}/MonitorAwarePoint.java | 2 +- .../org/eclipse/swt/widgets}/MonitorAwareRectangle.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename bundles/org.eclipse.swt/Eclipse SWT/{common/org/eclipse/swt/graphics => win32/org/eclipse/swt/widgets}/MonitorAwarePoint.java (97%) rename bundles/org.eclipse.swt/Eclipse SWT/{common/org/eclipse/swt/graphics => win32/org/eclipse/swt/widgets}/MonitorAwareRectangle.java (97%) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/MonitorAwarePoint.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MonitorAwarePoint.java similarity index 97% rename from bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/MonitorAwarePoint.java rename to bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MonitorAwarePoint.java index 282acdbe07b..1045aafd168 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/MonitorAwarePoint.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MonitorAwarePoint.java @@ -26,7 +26,7 @@ * @since 3.129 * @noreference This class is not intended to be referenced by clients */ -public final class MonitorAwarePoint extends Point { +final class MonitorAwarePoint extends Point { private static final long serialVersionUID = 6077427420686999194L; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/MonitorAwareRectangle.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MonitorAwareRectangle.java similarity index 97% rename from bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/MonitorAwareRectangle.java rename to bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MonitorAwareRectangle.java index f20d620e356..2e38779dd21 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/MonitorAwareRectangle.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MonitorAwareRectangle.java @@ -26,7 +26,7 @@ * @since 3.129 * @noreference This class is not intended to be referenced by clients */ -public final class MonitorAwareRectangle extends Rectangle { +final class MonitorAwareRectangle extends Rectangle { private static final long serialVersionUID = 5041911840525116925L;