aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-01-11 00:51:29 +0000
committerTom Tromey <tromey@gcc.gnu.org>2003-01-11 00:51:29 +0000
commitb1771c6ac2f7917c10a8c47c61201f88e63eb2bb (patch)
treea700ade33c6ce165e447097e0f7af9cf4d4be28c
parent63af3bd1a2b1193444d01766cec9092cfbe4370a (diff)
downloadgcc-b1771c6ac2f7917c10a8c47c61201f88e63eb2bb.zip
gcc-b1771c6ac2f7917c10a8c47c61201f88e63eb2bb.tar.gz
gcc-b1771c6ac2f7917c10a8c47c61201f88e63eb2bb.tar.bz2
2003-01-10 Michael Koch <konqueror@gmx.de>
* java/awt/DisplayMode.java (equals): Fixed argument type and implementation. From-SVN: r61184
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/awt/DisplayMode.java16
2 files changed, 13 insertions, 8 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e7e4ae6..562a6af 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-10 Michael Koch <konqueror@gmx.de>
+
+ * java/awt/DisplayMode.java
+ (equals): Fixed argument type and implementation.
+
2003-01-07 Tom Tromey <tromey@redhat.com>
* include/posix.h (_Jv_platform_usleep): Wrap in ifdef
diff --git a/libjava/java/awt/DisplayMode.java b/libjava/java/awt/DisplayMode.java
index b988e20..533ab5e 100644
--- a/libjava/java/awt/DisplayMode.java
+++ b/libjava/java/awt/DisplayMode.java
@@ -1,5 +1,5 @@
/* DisplayMode.java -- a description of display mode configurations
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -140,16 +140,16 @@ public final class DisplayMode
* Test for equality. This returns true for two modes with identical
* parameters.
*
- * @param o the object to compare to
+ * @param dm The display mode to compare to
+ *
* @return true if it is equal
*/
- public boolean equals(Object o)
+ public boolean equals (DisplayMode dm)
{
- if (! (o instanceof DisplayMode))
- return false;
- DisplayMode m = (DisplayMode) o;
- return width == m.width && height == m.height && bitDepth == m.bitDepth
- && refreshRate == m.refreshRate;
+ return (width == dm.width
+ && height == dm.height
+ && bitDepth == dm.bitDepth
+ && refreshRate == dm.refreshRate);
}
/**