diff options
author | Mark Wielaard <mark@klomp.org> | 2003-01-16 21:37:42 +0000 |
---|---|---|
committer | Mark Wielaard <mark@klomp.org> | 2003-01-16 21:37:42 +0000 |
commit | 985a77778ff0977e531db5fb471ef2865a8b271c (patch) | |
tree | 094cddd25cd4b319fe08711f54199dcc8f801a6a | |
parent | 37df2e1a65a451c1a41e3dc41d6b00d4dfae53c2 (diff) | |
download | classpath-985a77778ff0977e531db5fb471ef2865a8b271c.tar.gz |
* java/awt/image/ColorModel.java (ColorModel): Call getNumComponents().
* java/awt/image/ImageFilter.java (getFilterInstance): Calling clone()
doesn't throw exception.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | java/awt/image/ColorModel.java | 2 | ||||
-rw-r--r-- | java/awt/image/ImageFilter.java | 12 |
3 files changed, 10 insertions, 10 deletions
@@ -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; } /** |