From bd8a2e96afaf00312fb3b0c1879e440043cf0e46 Mon Sep 17 00:00:00 2001 From: Casey Marshall Date: Mon, 30 Aug 2004 13:06:48 +0000 Subject: Author e-mail updated for all files. 2004-08-30 Casey Marshall Author e-mail updated for all files. * gnu/java/security/OID.java (equals): Test if the aurgment is an instance of OID. (compareTo): Use `equals'. * gnu/java/security/der/BitString.java (equals): Test if the argument is an instance of BitString. * gnu/java/security/der/DERReader.java: Removed NIO imports. Made class final. Made fields private. (): New constructor. (skip): New method. (makeString): Made static; don't use NIO. (fromIso88591, fromUtf16Be, fromUtf8): New methods. * gnu/java/security/der/DERWriter.java: Fixed imports. (writeString): Don't use NIO. (toIso88591, toUtf16Be, toUtf8): New methods. * gnu/java/security/der/DERValue.java: Formatting changes only. * gnu/java/security/der/DER.java: Likewise. From-SVN: r86765 --- libjava/gnu/java/security/OID.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libjava/gnu/java/security/OID.java') diff --git a/libjava/gnu/java/security/OID.java b/libjava/gnu/java/security/OID.java index c27ec9253ab..c17d94b26d3 100644 --- a/libjava/gnu/java/security/OID.java +++ b/libjava/gnu/java/security/OID.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -65,7 +65,7 @@ import gnu.java.security.der.DEREncodingException; *

OIDs may be relative, in which case the first two elements of the * OID are omitted. * - * @author Casey Marshall (rsdio@metastatic.org) + * @author Casey Marshall (csm@gnu.org) */ public class OID implements Cloneable, Comparable, java.io.Serializable { @@ -336,7 +336,7 @@ public class OID implements Cloneable, Comparable, java.io.Serializable /* Nice idea, but possibly too expensive for whatever benefit it * provides. - + public String getShortName() { return OIDTable.getShortName(this); @@ -391,8 +391,8 @@ public class OID implements Cloneable, Comparable, java.io.Serializable */ public boolean equals(Object o) { - if (this == o) - return true; + if (!(o instanceof OID)) + return false; return java.util.Arrays.equals(components, ((OID) o).components); } @@ -411,7 +411,7 @@ public class OID implements Cloneable, Comparable, java.io.Serializable */ public int compareTo(Object o) { - if (o == this) + if (equals(o)) return 0; int[] components2 = ((OID) o).components; int len = Math.min(components.length, components2.length); -- cgit v1.2.3