From b1771c6ac2f7917c10a8c47c61201f88e63eb2bb Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sat, 11 Jan 2003 00:51:29 +0000 Subject: [PATCH] 2003-01-10 Michael Koch * java/awt/DisplayMode.java (equals): Fixed argument type and implementation. From-SVN: r61184 --- libjava/ChangeLog | 5 +++++ libjava/java/awt/DisplayMode.java | 16 ++++++++-------- 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 + + * java/awt/DisplayMode.java + (equals): Fixed argument type and implementation. + 2003-01-07 Tom Tromey * 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); } /** -- 2.7.4