Skip to content

Commit a5e8853

Browse files
akoch-yattaakoch-yatta
committed
Remove obsolete hashCode/equals for Region
This commit removes the obsolete equals and hashCode methods for Region. For the upcoming changes for win32 the current implementation cannot be used anymore because all handles will be created on demand. As the current implementation is equal in their behavior to the base behavior for these methods inherited from Object they will be removed.
1 parent 0368a6b commit a5e8853

File tree

12 files changed

+126
-97
lines changed

12 files changed

+126
-97
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,20 @@
456456
</message_arguments>
457457
</filter>
458458
</resource>
459+
<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java" type="org.eclipse.swt.graphics.Region">
460+
<filter id="338792546">
461+
<message_arguments>
462+
<message_argument value="org.eclipse.swt.graphics.Region"/>
463+
<message_argument value="equals(Object)"/>
464+
</message_arguments>
465+
</filter>
466+
<filter id="338792546">
467+
<message_arguments>
468+
<message_argument value="org.eclipse.swt.graphics.Region"/>
469+
<message_argument value="hashCode()"/>
470+
</message_arguments>
471+
</filter>
472+
</resource>
459473
<resource path="Eclipse SWT/common/org/eclipse/swt/SWT.java" type="org.eclipse.swt.SWT">
460474
<filter id="336658481">
461475
<message_arguments>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,20 @@
456456
</message_arguments>
457457
</filter>
458458
</resource>
459+
<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java" type="org.eclipse.swt.graphics.Region">
460+
<filter id="338792546">
461+
<message_arguments>
462+
<message_argument value="org.eclipse.swt.graphics.Region"/>
463+
<message_argument value="equals(Object)"/>
464+
</message_arguments>
465+
</filter>
466+
<filter id="338792546">
467+
<message_arguments>
468+
<message_argument value="org.eclipse.swt.graphics.Region"/>
469+
<message_argument value="hashCode()"/>
470+
</message_arguments>
471+
</filter>
472+
</resource>
459473
<resource path="Eclipse SWT/common/org/eclipse/swt/SWT.java" type="org.eclipse.swt.SWT">
460474
<filter id="336658481">
461475
<message_arguments>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,20 @@
448448
</message_arguments>
449449
</filter>
450450
</resource>
451+
<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java" type="org.eclipse.swt.graphics.Region">
452+
<filter id="338792546">
453+
<message_arguments>
454+
<message_argument value="org.eclipse.swt.graphics.Region"/>
455+
<message_argument value="equals(Object)"/>
456+
</message_arguments>
457+
</filter>
458+
<filter id="338792546">
459+
<message_arguments>
460+
<message_argument value="org.eclipse.swt.graphics.Region"/>
461+
<message_argument value="hashCode()"/>
462+
</message_arguments>
463+
</filter>
464+
</resource>
451465
<resource path="Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java" type="org.eclipse.swt.widgets.Composite">
452466
<filter id="576778288">
453467
<message_arguments>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,20 @@
448448
</message_arguments>
449449
</filter>
450450
</resource>
451+
<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java" type="org.eclipse.swt.graphics.Region">
452+
<filter id="338792546">
453+
<message_arguments>
454+
<message_argument value="org.eclipse.swt.graphics.Region"/>
455+
<message_argument value="equals(Object)"/>
456+
</message_arguments>
457+
</filter>
458+
<filter id="338792546">
459+
<message_arguments>
460+
<message_argument value="org.eclipse.swt.graphics.Region"/>
461+
<message_argument value="hashCode()"/>
462+
</message_arguments>
463+
</filter>
464+
</resource>
451465
<resource path="Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java" type="org.eclipse.swt.widgets.Composite">
452466
<filter id="576778288">
453467
<message_arguments>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,20 @@
448448
</message_arguments>
449449
</filter>
450450
</resource>
451+
<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java" type="org.eclipse.swt.graphics.Region">
452+
<filter id="338792546">
453+
<message_arguments>
454+
<message_argument value="org.eclipse.swt.graphics.Region"/>
455+
<message_argument value="equals(Object)"/>
456+
</message_arguments>
457+
</filter>
458+
<filter id="338792546">
459+
<message_arguments>
460+
<message_argument value="org.eclipse.swt.graphics.Region"/>
461+
<message_argument value="hashCode()"/>
462+
</message_arguments>
463+
</filter>
464+
</resource>
451465
<resource path="Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java" type="org.eclipse.swt.widgets.Composite">
452466
<filter id="576778288">
453467
<message_arguments>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,20 @@
448448
</message_arguments>
449449
</filter>
450450
</resource>
451+
<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java" type="org.eclipse.swt.graphics.Region">
452+
<filter id="338792546">
453+
<message_arguments>
454+
<message_argument value="org.eclipse.swt.graphics.Region"/>
455+
<message_argument value="equals(Object)"/>
456+
</message_arguments>
457+
</filter>
458+
<filter id="338792546">
459+
<message_arguments>
460+
<message_argument value="org.eclipse.swt.graphics.Region"/>
461+
<message_argument value="hashCode()"/>
462+
</message_arguments>
463+
</filter>
464+
</resource>
451465
<resource path="Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java" type="org.eclipse.swt.widgets.Composite">
452466
<filter id="576778288">
453467
<message_arguments>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<component id="org.eclipse.swt.gtk.linux.x86_64" version="2">
3+
<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java" type="org.eclipse.swt.graphics.Region">
4+
<filter id="338792546">
5+
<message_arguments>
6+
<message_argument value="org.eclipse.swt.graphics.Region"/>
7+
<message_argument value="equals(Object)"/>
8+
</message_arguments>
9+
</filter>
10+
<filter id="338792546">
11+
<message_arguments>
12+
<message_argument value="org.eclipse.swt.graphics.Region"/>
13+
<message_argument value="hashCode()"/>
14+
</message_arguments>
15+
</filter>
16+
</resource>
317
<resource path="Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java" type="org.eclipse.swt.widgets.Composite">
418
<filter id="576778288">
519
<message_arguments>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,20 @@
592592
</message_arguments>
593593
</filter>
594594
</resource>
595+
<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java" type="org.eclipse.swt.graphics.Region">
596+
<filter id="338792546">
597+
<message_arguments>
598+
<message_argument value="org.eclipse.swt.graphics.Region"/>
599+
<message_argument value="equals(Object)"/>
600+
</message_arguments>
601+
</filter>
602+
<filter id="338792546">
603+
<message_arguments>
604+
<message_argument value="org.eclipse.swt.graphics.Region"/>
605+
<message_argument value="hashCode()"/>
606+
</message_arguments>
607+
</filter>
608+
</resource>
595609
<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java" type="org.eclipse.swt.widgets.Composite">
596610
<filter id="576778288">
597611
<message_arguments>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,20 @@
592592
</message_arguments>
593593
</filter>
594594
</resource>
595+
<resource path="Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java" type="org.eclipse.swt.graphics.Region">
596+
<filter id="338792546">
597+
<message_arguments>
598+
<message_argument value="org.eclipse.swt.graphics.Region"/>
599+
<message_argument value="equals(Object)"/>
600+
</message_arguments>
601+
</filter>
602+
<filter id="338792546">
603+
<message_arguments>
604+
<message_argument value="org.eclipse.swt.graphics.Region"/>
605+
<message_argument value="hashCode()"/>
606+
</message_arguments>
607+
</filter>
608+
</resource>
595609
<resource path="Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java" type="org.eclipse.swt.widgets.Composite">
596610
<filter id="576778288">
597611
<message_arguments>

‎bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -424,23 +424,6 @@ void destroy() {
424424
handle = 0;
425425
}
426426

427-
/**
428-
* Compares the argument to the receiver, and returns true
429-
* if they represent the <em>same</em> object using a class
430-
* specific comparison.
431-
*
432-
* @param object the object to compare with this object
433-
* @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise
434-
*
435-
* @see #hashCode
436-
*/
437-
@Override
438-
public boolean equals(Object object) {
439-
if (this == object) return true;
440-
if (!(object instanceof Region region)) return false;
441-
return handle == region.handle;
442-
}
443-
444427
/**
445428
* Returns a rectangle which represents the rectangular
446429
* union of the collection of polygons the receiver
@@ -499,21 +482,6 @@ long regionToRects(long message, long rgn, long r, long path) {
499482
return 0;
500483
}
501484

502-
/**
503-
* Returns an integer hash code for the receiver. Any two
504-
* objects that return <code>true</code> when passed to
505-
* <code>equals</code> must return the same value for this
506-
* method.
507-
*
508-
* @return the receiver's hash
509-
*
510-
* @see #equals
511-
*/
512-
@Override
513-
public int hashCode() {
514-
return (int)handle;
515-
}
516-
517485
/**
518486
* Intersects the given rectangle to the collection of polygons
519487
* the receiver maintains to describe its area.

0 commit comments

Comments
 (0)