From: Tom Tromey <tromey@redhat.com>
Date: Tue, 18 Feb 2003 00:57:26 +0000 (+0000)
Subject: ColorModel.java: Re-merged with Classpath.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=59ac5a1725b2e1184c83ac7dcd755fd33d06f696;p=gcc.git

ColorModel.java: Re-merged with Classpath.

	* java/awt/image/ColorModel.java: Re-merged with Classpath.
	* java/awt/image/ImageFilter.java: Likewise.

From-SVN: r63024
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c8c62cbbb35..a4e1719712a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-17  Tom Tromey  <tromey@redhat.com>
+
+	* java/awt/image/ColorModel.java: Re-merged with Classpath.
+	* java/awt/image/ImageFilter.java: Likewise.
+
 2003-02-17  Raif S. Naffah <raif@fl.net.au>
 
 	* java/math/BigInteger.java (euclidInv): Return array of
diff --git a/libjava/java/awt/image/ColorModel.java b/libjava/java/awt/image/ColorModel.java
index fab51667edb..f798ee2c861 100644
--- a/libjava/java/awt/image/ColorModel.java
+++ b/libjava/java/awt/image/ColorModel.java
@@ -142,7 +142,7 @@ public abstract class ColorModel implements Transparency
         bits_sum |= bits [i];
       }
     
-    if ((bits.length < cspace.numComponents)
+    if ((bits.length < cspace.getNumComponents())
         || (bits_sum < 1))
       throw new IllegalArgumentException ();
 
diff --git a/libjava/java/awt/image/ImageFilter.java b/libjava/java/awt/image/ImageFilter.java
index 86bc0210a4b..f58e5381df6 100644
--- a/libjava/java/awt/image/ImageFilter.java
+++ b/libjava/java/awt/image/ImageFilter.java
@@ -108,15 +108,9 @@ public class ImageFilter implements ImageConsumer, Cloneable
 	    throw new IllegalArgumentException("null argument for ImageFilter.getFilterInstance(ImageConsumer)");
 
 	consumer = ic;
-	try { 
-	    ImageFilter f = (ImageFilter)clone();
-	    consumer = null;
-	    return f;
-	} catch ( CloneNotSupportedException cnse ) {
-	    cnse.printStackTrace();
-	    consumer = null;
-	    return null;
-	}
+	ImageFilter f = (ImageFilter)clone();
+	consumer = null;
+	return f;
     }
 
     /**