This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: Classpath AWT mergelet
- From: Tom Tromey <tromey at redhat dot com>
- To: java-patches at gcc dot gnu dot org
- Date: 17 Feb 2003 17:29:12 -0700
- Subject: Patch: FYI: Classpath AWT mergelet
- Reply-to: tromey at redhat dot com
I'm checking this in to the trunk.
This copies a couple minor AWT fixes over from Classpath.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* java/awt/image/ColorModel.java: Re-merged with Classpath.
* java/awt/image/ImageFilter.java: Likewise.
Index: java/awt/image/ColorModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/ColorModel.java,v
retrieving revision 1.9
diff -u -r1.9 ColorModel.java
--- java/awt/image/ColorModel.java 14 Jan 2003 21:21:35 -0000 1.9
+++ java/awt/image/ColorModel.java 18 Feb 2003 00:37:57 -0000
@@ -142,7 +142,7 @@
bits_sum |= bits [i];
}
- if ((bits.length < cspace.numComponents)
+ if ((bits.length < cspace.getNumComponents())
|| (bits_sum < 1))
throw new IllegalArgumentException ();
Index: java/awt/image/ImageFilter.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/ImageFilter.java,v
retrieving revision 1.2
diff -u -r1.2 ImageFilter.java
--- java/awt/image/ImageFilter.java 14 Jan 2003 21:21:35 -0000 1.2
+++ java/awt/image/ImageFilter.java 18 Feb 2003 00:37:57 -0000
@@ -108,15 +108,9 @@
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;
}
/**