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 c8c62cbbb3544bb248f1e7347ca98fe1fcbeb3c1..a4e1719712aace6dbec78de4dd7f34ea0fcf85cc 100644 (file)
--- 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 fab51667edba3f71a385b32bc5beaf510fe67c20..f798ee2c86166cb75981880e7298053e2f8db9bb 100644 (file)
--- 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 86bc0210a4bb0a9f95c6d0c915869d6e09ec41e1..f58e5381df63abd779ffab661904fa6cad088cc5 100644 (file)
--- 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;
     }
 
     /**