From 176fca0eb498e718a192125eb08992ff145bbfb7 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 18 Feb 2003 00:57:26 +0000
Subject: 	* java/awt/image/ColorModel.java: Re-merged with Classpath. 
 * java/awt/image/ImageFilter.java: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@63024 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/java/awt/image/ColorModel.java  |  2 +-
 libjava/java/awt/image/ImageFilter.java | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'libjava/java')

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;
     }
 
     /**
-- 
cgit v1.2.3