diff options
| author | Michael Koch <konqueror@gmx.de> | 2002-09-16 09:46:37 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2002-09-16 09:46:37 +0000 |
| commit | cf0f53eb6e76976cd7a2211a331cac5732d4a9bf (patch) | |
| tree | 153e40de6d2df8dbf1b4d09c84c431b1df50322f /libjava/javax/naming/RefAddr.java | |
| parent | b423e6fe615f5d0a65bb02ad8dd15457c8871a5c (diff) | |
| download | gcc-cf0f53eb6e76976cd7a2211a331cac5732d4a9bf.zip gcc-cf0f53eb6e76976cd7a2211a331cac5732d4a9bf.tar.gz gcc-cf0f53eb6e76976cd7a2211a331cac5732d4a9bf.tar.bz2 | |
AssertionError.java: Merge with classpath, fixes HTML.
2002-09-16 Michael Koch <konqueror@gmx.de>
* java/lang/AssertionError.java:
Merge with classpath, fixes HTML.
* java/rmi/server/LogStream.java:
Merge with classpath, fixes some constants.
* java/net/server/RemoteServer.java:
Merge with classpath, adds serialVersionUID.
* javax/naming/BinaryRefAddr.java:
Merge with classpath, s/equal/equals/.
* javax/naming/NamingException.java:
Merge with classpath, fixed typo.
* javax/naming/RefAddr.java:
Merge with classpath, s/equal/equals/.
* java/awt/Toolkit.java:
s/gnu.java.awt.peer.gtk.GtkToolkit/gnu.awt.gtk.GtkToolkit/
and typo fixed.
From-SVN: r57187
Diffstat (limited to 'libjava/javax/naming/RefAddr.java')
| -rw-r--r-- | libjava/javax/naming/RefAddr.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libjava/javax/naming/RefAddr.java b/libjava/javax/naming/RefAddr.java index 2bccdfa..9ed504f 100644 --- a/libjava/javax/naming/RefAddr.java +++ b/libjava/javax/naming/RefAddr.java @@ -71,9 +71,9 @@ public abstract class RefAddr implements Serializable */ protected RefAddr(String addrType) { - if (addrType == null) - throw new NullPointerException("addrType cannot be null"); - + if (addrType == null) + throw new NullPointerException("addrType cannot be null"); + this.addrType = addrType; } @@ -98,20 +98,20 @@ public abstract class RefAddr implements Serializable * is the same as this addrType and the content is equals to the * content of this object. */ - public boolean equals (Object o) + public boolean equal(Object o) { if (o instanceof RefAddr) { RefAddr refAddr = (RefAddr) o; if (this.getType().equals(refAddr.getType())) - { - Object c1 = this.getContent(); - Object c2 = refAddr.getContent(); - if (c1 == null) - return c2 == null; - else - return c1.equals(c2); - } + { + Object c1 = this.getContent(); + Object c2 = refAddr.getContent(); + if (c1 == null) + return c2 == null; + else + return c1.equals(c2); + } } return false; } |