Font.java, [...]: Removed some redundant obj == null checks.

2003-11-11  Michael Koch  <konqueror@gmx.de>

	* java/awt/Font.java,
	java/awt/datatransfer/DataFlavor.java,
	java/math/BigInteger.java,
	java/net/Inet4Address.java,
	java/net/Inet6Address.java,
	java/rmi/MarshalledObject.java,
	java/rmi/server/RMIClassLoader.java,
	java/security/cert/CertStore.java,
	java/sql/Timestamp.java,
	java/text/SimpleDateFormat.java,
	javax/naming/CompoundName.java:
	Removed some redundant obj == null checks.

From-SVN: r73448

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 607d1f8ef69b95dacafb4fe15595b7e41bf25be5..1d26a6f039808a416afea39d377a5c4c378891e5 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,18 @@
+2003-11-11  Michael Koch  <konqueror@gmx.de>
+
+       * java/awt/Font.java,
+       java/awt/datatransfer/DataFlavor.java,
+       java/math/BigInteger.java,
+       java/net/Inet4Address.java,
+       java/net/Inet6Address.java,
+       java/rmi/MarshalledObject.java,
+       java/rmi/server/RMIClassLoader.java,
+       java/security/cert/CertStore.java,
+       java/sql/Timestamp.java,
+       java/text/SimpleDateFormat.java,
+       javax/naming/CompoundName.java:
+       Removed some redundant obj == null checks.
+
 2003-11-11  Michael Koch  <konqueror@gmx.de>
 
        * java/nio/ByteBuffer.java

diff --git a/libjava/java/awt/Font.java b/libjava/java/awt/Font.java
index d1ff566e5592813b64a3c17ead9fd7fb74dad861..809684311f08e7c0947ffa25635c1695833599f9 100644 (file)
--- a/libjava/java/awt/Font.java
+++ b/libjava/java/awt/Font.java
@@ -1226,9 +1226,6 @@ hashCode()
 public boolean
 equals(Object obj)
 {
-  if (obj == null)
-    return(false);
-
   if (!(obj instanceof Font))
     return(false);
 

diff --git a/libjava/java/awt/datatransfer/DataFlavor.java b/libjava/java/awt/datatransfer/DataFlavor.java
index e56f9759a50ab3c96ad874736df81918993b97e1..897edff4c0f51904ffdfbf8187c945017f4c07ec 100644 (file)
--- a/libjava/java/awt/datatransfer/DataFlavor.java
+++ b/libjava/java/awt/datatransfer/DataFlavor.java
@@ -723,9 +723,6 @@ equals(DataFlavor flavor)
 public boolean
 equals(Object obj)
 {
-  if (obj == null)
-    return(false);
-
   if (!(obj instanceof DataFlavor))
     return(false);
 

diff --git a/libjava/java/math/BigInteger.java b/libjava/java/math/BigInteger.java
index fb1cf7c59bd7630c7c55be572a368d1bf70bd008..312a9e91a8eec1f8fa019f2141f5ab81391634a1 100644 (file)
--- a/libjava/java/math/BigInteger.java
+++ b/libjava/java/math/BigInteger.java
@@ -1565,7 +1565,7 @@ public class BigInteger extends Number implements Comparable
   /* Assumes this and obj are both canonicalized. */
   public boolean equals(Object obj)
   {
-    if (obj == null || ! (obj instanceof BigInteger))
+    if (! (obj instanceof BigInteger))
       return false;
     return equals(this, (BigInteger) obj);
   }

diff --git a/libjava/java/net/Inet4Address.java b/libjava/java/net/Inet4Address.java
index 3b18f6fdd10ebc33252647a23b39f312c5642e2c..76abfc3fce41806808853ee43fb073033d7f57db 100644 (file)
--- a/libjava/java/net/Inet4Address.java
+++ b/libjava/java/net/Inet4Address.java
@@ -258,7 +258,7 @@ public final class Inet4Address extends InetAddress
    */
   public boolean equals (Object obj)
   {
-    if (obj == null || ! (obj instanceof InetAddress))
+    if (! (obj instanceof InetAddress))
       return false;
     
     byte[] addr1 = addr;

diff --git a/libjava/java/net/Inet6Address.java b/libjava/java/net/Inet6Address.java
index 4f4563ddcc562d901fac8654e185a3b2590503ab..c3418c654a951f6ffa3d46ac7f74b37d8c58c9b2 100644 (file)
--- a/libjava/java/net/Inet6Address.java
+++ b/libjava/java/net/Inet6Address.java
@@ -243,7 +243,7 @@ public final class Inet6Address extends InetAddress
    */
   public boolean equals (Object obj)
   {
-    if (obj == null || ! (obj instanceof Inet6Address))
+    if (! (obj instanceof Inet6Address))
       return false;
 
     Inet6Address tmp = (Inet6Address) obj;

diff --git a/libjava/java/rmi/MarshalledObject.java b/libjava/java/rmi/MarshalledObject.java
index 9f966b9d9dce59dc07193b83ef339545410c41ed..0ba91580d1ab39e0071eab8245e41747ca55e13c 100644 (file)
--- a/libjava/java/rmi/MarshalledObject.java
+++ b/libjava/java/rmi/MarshalledObject.java
@@ -76,7 +76,7 @@ public final class MarshalledObject
   
   public boolean equals(Object obj) 
   {
-    if(obj == null || !(obj instanceof MarshalledObject) )
+    if (! (obj instanceof MarshalledObject))
       return false;
 
     // hashCode even differs, don't do the time-consuming comparisons

diff --git a/libjava/java/rmi/server/RMIClassLoader.java b/libjava/java/rmi/server/RMIClassLoader.java
index 57e52a363bae26d934146e88d9c3f387def096f7..e6af682a4526ceaf05da79ae470069a17bc92da5 100644 (file)
--- a/libjava/java/rmi/server/RMIClassLoader.java
+++ b/libjava/java/rmi/server/RMIClassLoader.java
@@ -113,8 +113,7 @@ public class RMIClassLoader
      */
     public boolean equals (Object theOther)
     {
-      if (theOther != null
-          && theOther instanceof CacheKey)
+      if (theOther instanceof CacheKey)
       {
        CacheKey key = (CacheKey) theOther;
        

diff --git a/libjava/java/security/cert/CertStore.java b/libjava/java/security/cert/CertStore.java
index 44143c5ad6c9f9673caa72a70b18f0256132eaf7..55326a4b2c95af1ef32710c0a39753a181b8a0fc 100644 (file)
--- a/libjava/java/security/cert/CertStore.java
+++ b/libjava/java/security/cert/CertStore.java
@@ -215,8 +215,7 @@ public class CertStore
     catch (java.lang.reflect.InvocationTargetException ite)
       {
         Throwable cause = ite.getCause();
-        if (cause != null &&
-           (cause instanceof InvalidAlgorithmParameterException))
+        if (cause instanceof InvalidAlgorithmParameterException)
           throw (InvalidAlgorithmParameterException) cause;
         else
           throw new NoSuchAlgorithmException(type);

diff --git a/libjava/java/sql/Timestamp.java b/libjava/java/sql/Timestamp.java
index 5ec75da61c17bbed8a789c2a7e131467ec258090..22108f58f93c313bbbf92f8e42be657578183dad 100644 (file)
--- a/libjava/java/sql/Timestamp.java
+++ b/libjava/java/sql/Timestamp.java
@@ -224,9 +224,6 @@ public class Timestamp extends java.util.Date
    */
   public boolean equals(Object obj)
   {
-    if (obj == null)
-      return false;
-
     if (!(obj instanceof Timestamp))
       return false;
 

diff --git a/libjava/java/text/SimpleDateFormat.java b/libjava/java/text/SimpleDateFormat.java
index 3ad71ee89ede3a58842fc015714920a9ca354807..88aaf41f9bda9e4e0a5b1354179b947bdab5d4e4 100644 (file)
--- a/libjava/java/text/SimpleDateFormat.java
+++ b/libjava/java/text/SimpleDateFormat.java
@@ -374,9 +374,6 @@ public class SimpleDateFormat extends DateFormat
    */
   public boolean equals(Object o)
   {
-    if (o == null)
-      return false;
-
     if (!super.equals(o))
       return false;
 

diff --git a/libjava/javax/naming/CompoundName.java b/libjava/javax/naming/CompoundName.java
index 20396398d101011849d3241362e4ee48dd36e9af..4df89e9af95127672b7e322ef10adccd79550a5a 100644 (file)
--- a/libjava/javax/naming/CompoundName.java
+++ b/libjava/javax/naming/CompoundName.java
@@ -240,7 +240,7 @@ public class CompoundName implements Name, Cloneable, Serializable
 
   public int compareTo (Object obj)
   {
-    if (obj == null || ! (obj instanceof CompoundName))
+    if (! (obj instanceof CompoundName))
       throw new ClassCastException ("CompoundName.compareTo() expected CompoundName");
     CompoundName cn = (CompoundName) obj;
     int last = Math.min (cn.elts.size (), elts.size ());