CVSROOT: /sources/classpath
Module name: classpath
Changes by: David Gilbert <trebligd> 06/06/19 09:43:17
Modified files:
. : ChangeLog
javax/swing/plaf: IconUIResource.java
Log message:
2006-06-19 David Gilbert <[EMAIL PROTECTED]>
* javax/swing/plaf/IconUIResource.java
(IconUIResource): Throw IllegalArgumentException for null icon.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7872&r2=1.7873
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/IconUIResource.java?cvsroot=classpath&r1=1.8&r2=1.9
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7872
retrieving revision 1.7873
diff -u -b -r1.7872 -r1.7873
--- ChangeLog 18 Jun 2006 20:57:43 -0000 1.7872
+++ ChangeLog 19 Jun 2006 09:43:16 -0000 1.7873
@@ -1,3 +1,8 @@
+2006-06-19 David Gilbert <[EMAIL PROTECTED]>
+
+ * javax/swing/plaf/IconUIResource.java
+ (IconUIResource): Throw IllegalArgumentException for null icon.
+
2006-06-18 Audrius Meskauskas <[EMAIL PROTECTED]>
PR 28035
Index: javax/swing/plaf/IconUIResource.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/plaf/IconUIResource.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- javax/swing/plaf/IconUIResource.java 19 Oct 2005 14:20:10 -0000
1.8
+++ javax/swing/plaf/IconUIResource.java 19 Jun 2006 09:43:17 -0000
1.9
@@ -1,5 +1,5 @@
/* IconUIResource.java --
- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2006, Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -63,7 +63,8 @@
/**
- * The icon that is wrapped by this <code>IconUIResource</code>.
+ * The icon that is wrapped by this <code>IconUIResource</code> (never
+ * <code>null</code>).
*/
private Icon delegate;
@@ -73,10 +74,12 @@
* icon. All messages are forwarded to the delegate icon.
*
* @param delegate the icon that is wrapped by this
- * <code>IconUIResource</code>.
+ * <code>IconUIResource</code> (<code>null</code> not permitted).
*/
public IconUIResource(Icon delegate)
{
+ if (delegate == null)
+ throw new IllegalArgumentException("Null 'delegate' argument.");
this.delegate = delegate;
}