* java/awt/image/ColorModel.java (ColorModel): Call getNumComponents().

	* java/awt/image/ImageFilter.java (getFilterInstance): Calling clone()
	doesn't throw exception.

3 files changed, 10 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 591003c9f..e0a998601 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2003-01-16  Mark Wielaard  <mark@klomp.org>
 
+	* java/awt/image/ColorModel.java (ColorModel): Call getNumComponents().
+	* java/awt/image/ImageFilter.java (getFilterInstance): Calling clone()
+	doesn't throw exception.
+
+2003-01-16  Mark Wielaard  <mark@klomp.org>
+
 	* java/net/SocketImpl.java (toString): Don't explicitly call
 	toString() on possible null address.
 
diff --git a/java/awt/image/ColorModel.java b/java/awt/image/ColorModel.java
index fab51667e..f798ee2c8 100644
--- a/java/awt/image/ColorModel.java
+++ b/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/java/awt/image/ImageFilter.java b/java/awt/image/ImageFilter.java
index 86bc0210a..f58e5381d 100644
--- a/java/awt/image/ImageFilter.java
+++ b/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;
     }
 
     /**