Skip to content

Commit 67ca846

Browse files
fedejeannefedejeanne
committed
Reintroduce OfFloat (internal) classes #62
Remove MonitorAware* classes. Both changes were reverted in a previous commit. Add the proper API filters to avoid check failures.
1 parent e2cbda9 commit 67ca846

File tree

18 files changed

+490
-180
lines changed

18 files changed

+490
-180
lines changed

‎binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/.api_filters‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,28 @@
88
</message_arguments>
99
</filter>
1010
</resource>
11+
<resource path="META-INF/MANIFEST.MF">
12+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="923795461">
13+
<message_arguments>
14+
<message_argument value="3.131.0"/>
15+
<message_argument value="3.130.0"/>
16+
</message_arguments>
17+
</filter>
18+
</resource>
19+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwarePoint">
20+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
21+
<message_arguments>
22+
<message_argument value="org.eclipse.swt.graphics.MonitorAwarePoint"/>
23+
<message_argument value="org.eclipse.swt_3.131.0"/>
24+
</message_arguments>
25+
</filter>
26+
</resource>
27+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwareRectangle">
28+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
29+
<message_arguments>
30+
<message_argument value="org.eclipse.swt.graphics.MonitorAwareRectangle"/>
31+
<message_argument value="org.eclipse.swt_3.131.0"/>
32+
</message_arguments>
33+
</filter>
34+
</resource>
1135
</component>

‎binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/.api_filters‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,28 @@
88
</message_arguments>
99
</filter>
1010
</resource>
11+
<resource path="META-INF/MANIFEST.MF">
12+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="923795461">
13+
<message_arguments>
14+
<message_argument value="3.131.0"/>
15+
<message_argument value="3.130.0"/>
16+
</message_arguments>
17+
</filter>
18+
</resource>
19+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwarePoint">
20+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
21+
<message_arguments>
22+
<message_argument value="org.eclipse.swt.graphics.MonitorAwarePoint"/>
23+
<message_argument value="org.eclipse.swt_3.131.0"/>
24+
</message_arguments>
25+
</filter>
26+
</resource>
27+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwareRectangle">
28+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
29+
<message_arguments>
30+
<message_argument value="org.eclipse.swt.graphics.MonitorAwareRectangle"/>
31+
<message_argument value="org.eclipse.swt_3.131.0"/>
32+
</message_arguments>
33+
</filter>
34+
</resource>
1135
</component>

‎binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/.api_filters‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,28 @@
88
</message_arguments>
99
</filter>
1010
</resource>
11+
<resource path="META-INF/MANIFEST.MF">
12+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="923795461">
13+
<message_arguments>
14+
<message_argument value="3.131.0"/>
15+
<message_argument value="3.130.0"/>
16+
</message_arguments>
17+
</filter>
18+
</resource>
19+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwarePoint">
20+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
21+
<message_arguments>
22+
<message_argument value="org.eclipse.swt.graphics.MonitorAwarePoint"/>
23+
<message_argument value="org.eclipse.swt_3.131.0"/>
24+
</message_arguments>
25+
</filter>
26+
</resource>
27+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwareRectangle">
28+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
29+
<message_arguments>
30+
<message_argument value="org.eclipse.swt.graphics.MonitorAwareRectangle"/>
31+
<message_argument value="org.eclipse.swt_3.131.0"/>
32+
</message_arguments>
33+
</filter>
34+
</resource>
1135
</component>

‎binaries/org.eclipse.swt.gtk.linux.loongarch64/.settings/.api_filters‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,28 @@
88
</message_arguments>
99
</filter>
1010
</resource>
11+
<resource path="META-INF/MANIFEST.MF">
12+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="923795461">
13+
<message_arguments>
14+
<message_argument value="3.131.0"/>
15+
<message_argument value="3.130.0"/>
16+
</message_arguments>
17+
</filter>
18+
</resource>
19+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwarePoint">
20+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
21+
<message_arguments>
22+
<message_argument value="org.eclipse.swt.graphics.MonitorAwarePoint"/>
23+
<message_argument value="org.eclipse.swt_3.131.0"/>
24+
</message_arguments>
25+
</filter>
26+
</resource>
27+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwareRectangle">
28+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
29+
<message_arguments>
30+
<message_argument value="org.eclipse.swt.graphics.MonitorAwareRectangle"/>
31+
<message_argument value="org.eclipse.swt_3.131.0"/>
32+
</message_arguments>
33+
</filter>
34+
</resource>
1135
</component>

‎binaries/org.eclipse.swt.gtk.linux.ppc64le/.settings/.api_filters‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,28 @@
88
</message_arguments>
99
</filter>
1010
</resource>
11+
<resource path="META-INF/MANIFEST.MF">
12+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="923795461">
13+
<message_arguments>
14+
<message_argument value="3.131.0"/>
15+
<message_argument value="3.130.0"/>
16+
</message_arguments>
17+
</filter>
18+
</resource>
19+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwarePoint">
20+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
21+
<message_arguments>
22+
<message_argument value="org.eclipse.swt.graphics.MonitorAwarePoint"/>
23+
<message_argument value="org.eclipse.swt_3.131.0"/>
24+
</message_arguments>
25+
</filter>
26+
</resource>
27+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwareRectangle">
28+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
29+
<message_arguments>
30+
<message_argument value="org.eclipse.swt.graphics.MonitorAwareRectangle"/>
31+
<message_argument value="org.eclipse.swt_3.131.0"/>
32+
</message_arguments>
33+
</filter>
34+
</resource>
1135
</component>

‎binaries/org.eclipse.swt.gtk.linux.riscv64/.settings/.api_filters‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,28 @@
88
</message_arguments>
99
</filter>
1010
</resource>
11+
<resource path="META-INF/MANIFEST.MF">
12+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="923795461">
13+
<message_arguments>
14+
<message_argument value="3.131.0"/>
15+
<message_argument value="3.130.0"/>
16+
</message_arguments>
17+
</filter>
18+
</resource>
19+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwarePoint">
20+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
21+
<message_arguments>
22+
<message_argument value="org.eclipse.swt.graphics.MonitorAwarePoint"/>
23+
<message_argument value="org.eclipse.swt_3.131.0"/>
24+
</message_arguments>
25+
</filter>
26+
</resource>
27+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwareRectangle">
28+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
29+
<message_arguments>
30+
<message_argument value="org.eclipse.swt.graphics.MonitorAwareRectangle"/>
31+
<message_argument value="org.eclipse.swt_3.131.0"/>
32+
</message_arguments>
33+
</filter>
34+
</resource>
1135
</component>

‎binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/.api_filters‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,28 @@
88
</message_arguments>
99
</filter>
1010
</resource>
11+
<resource path="META-INF/MANIFEST.MF">
12+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="923795461">
13+
<message_arguments>
14+
<message_argument value="3.131.0"/>
15+
<message_argument value="3.130.0"/>
16+
</message_arguments>
17+
</filter>
18+
</resource>
19+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwarePoint">
20+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
21+
<message_arguments>
22+
<message_argument value="org.eclipse.swt.graphics.MonitorAwarePoint"/>
23+
<message_argument value="org.eclipse.swt_3.131.0"/>
24+
</message_arguments>
25+
</filter>
26+
</resource>
27+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwareRectangle">
28+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
29+
<message_arguments>
30+
<message_argument value="org.eclipse.swt.graphics.MonitorAwareRectangle"/>
31+
<message_argument value="org.eclipse.swt_3.131.0"/>
32+
</message_arguments>
33+
</filter>
34+
</resource>
1135
</component>

‎binaries/org.eclipse.swt.win32.win32.aarch64/.settings/.api_filters‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,28 @@
144144
</message_arguments>
145145
</filter>
146146
</resource>
147+
<resource path="META-INF/MANIFEST.MF">
148+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="923795461">
149+
<message_arguments>
150+
<message_argument value="3.131.0"/>
151+
<message_argument value="3.130.0"/>
152+
</message_arguments>
153+
</filter>
154+
</resource>
155+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwarePoint">
156+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
157+
<message_arguments>
158+
<message_argument value="org.eclipse.swt.graphics.MonitorAwarePoint"/>
159+
<message_argument value="org.eclipse.swt_3.131.0"/>
160+
</message_arguments>
161+
</filter>
162+
</resource>
163+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwareRectangle">
164+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
165+
<message_arguments>
166+
<message_argument value="org.eclipse.swt.graphics.MonitorAwareRectangle"/>
167+
<message_argument value="org.eclipse.swt_3.131.0"/>
168+
</message_arguments>
169+
</filter>
170+
</resource>
147171
</component>

‎binaries/org.eclipse.swt.win32.win32.x86_64/.settings/.api_filters‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,28 @@
144144
</message_arguments>
145145
</filter>
146146
</resource>
147+
<resource path="META-INF/MANIFEST.MF">
148+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="923795461">
149+
<message_arguments>
150+
<message_argument value="3.131.0"/>
151+
<message_argument value="3.130.0"/>
152+
</message_arguments>
153+
</filter>
154+
</resource>
155+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwarePoint">
156+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
157+
<message_arguments>
158+
<message_argument value="org.eclipse.swt.graphics.MonitorAwarePoint"/>
159+
<message_argument value="org.eclipse.swt_3.131.0"/>
160+
</message_arguments>
161+
</filter>
162+
</resource>
163+
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.swt.graphics.MonitorAwareRectangle">
164+
<filter comment="See https://github.com/eclipse-platform/eclipse.platform.swt/issues/62" id="305324134">
165+
<message_arguments>
166+
<message_argument value="org.eclipse.swt.graphics.MonitorAwareRectangle"/>
167+
<message_argument value="org.eclipse.swt_3.131.0"/>
168+
</message_arguments>
169+
</filter>
170+
</resource>
147171
</component>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ public void testCorrectScaleUpUsingDifferentSetBoundsMethod() {
100100

101101
button.setBounds(new Rectangle(0, 47, 200, 47));
102102
assertEquals("Control::setBounds(Rectangle) doesn't scale up correctly",
103-
new Rectangle(0, 82, 350, 83), button.getBoundsInPixels());
103+
new Rectangle(0, 82, 350, 82), button.getBoundsInPixels());
104104

105105
button.setBounds(0, 47, 200, 47);
106106
assertEquals("Control::setBounds(int, int, int, int) doesn't scale up correctly",
107-
new Rectangle(0, 82, 350, 83), button.getBoundsInPixels());
107+
new Rectangle(0, 82, 350, 82), button.getBoundsInPixels());
108108
}
109109

110110
record FontComparison(int originalFontHeight, int currentFontHeight) {

0 commit comments

Comments
 (0)