diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-10-16 17:48:57 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-10-16 17:48:57 +0000 |
| commit | f3bf84759ca82d0567186e63044a034d887d55ca (patch) | |
| tree | bfe1c97257f1ae4056d3070f59ee9592c29432f0 | |
| parent | fce22de5d29dc5fb01375560db3d4d1bfc11f889 (diff) | |
| download | gcc-f3bf84759ca82d0567186e63044a034d887d55ca.zip gcc-f3bf84759ca82d0567186e63044a034d887d55ca.tar.gz gcc-f3bf84759ca82d0567186e63044a034d887d55ca.tar.bz2 | |
ExplicitBeanInfo.java: Explicitely import java.awt.Image.
2004-10-16 Michael Koch <konqueror@gmx.de>
* gnu/java/beans/ExplicitBeanInfo.java:
Explicitely import java.awt.Image.
(getIcon): Fixed off-by-one error.
From-SVN: r89148
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/java/beans/ExplicitBeanInfo.java | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 5600321..74f876a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2004-10-16 Michael Koch <konqueror@gmx.de> + + * gnu/java/beans/ExplicitBeanInfo.java: + Explicitely import java.awt.Image. + (getIcon): Fixed off-by-one error. + 2004-10-15 Andrew Haley <aph@redhat.com> * Makefile.am (nat_files, xlib_nat_files): New. diff --git a/libjava/gnu/java/beans/ExplicitBeanInfo.java b/libjava/gnu/java/beans/ExplicitBeanInfo.java index 410be70..6746bd8 100644 --- a/libjava/gnu/java/beans/ExplicitBeanInfo.java +++ b/libjava/gnu/java/beans/ExplicitBeanInfo.java @@ -1,5 +1,5 @@ -/* gnu.java.beans.ExplicitBeanInfo - Copyright (C) 1998 Free Software Foundation, Inc. +/* ExplicitBeanInfo.java -- + Copyright (C) 1998, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,6 +38,7 @@ exception statement from your version. */ package gnu.java.beans; +import java.awt.Image; import java.beans.BeanDescriptor; import java.beans.BeanInfo; import java.beans.EventSetDescriptor; @@ -84,7 +85,7 @@ public class ExplicitBeanInfo implements BeanInfo { protected BeanInfo[] additionalBeanInfo; /** The set of icons. **/ - protected java.awt.Image[] icons; + protected Image[] icons; public ExplicitBeanInfo(BeanDescriptor beanDescriptor, BeanInfo[] additionalBeanInfo, @@ -93,7 +94,7 @@ public class ExplicitBeanInfo implements BeanInfo { EventSetDescriptor[] eventSetDescriptors, int defaultEventIndex, MethodDescriptor[] methodDescriptors, - java.awt.Image[] icons) { + Image[] icons) { this.beanDescriptor = beanDescriptor; this.additionalBeanInfo = additionalBeanInfo; this.propertyDescriptors = propertyDescriptors; @@ -142,7 +143,7 @@ public class ExplicitBeanInfo implements BeanInfo { /** Get Bean icons. ** @param iconType the type of icon **/ - public java.awt.Image getIcon(int iconType) { - return icons != null ? icons[iconType] : null; + public Image getIcon(int iconType) { + return icons != null ? icons[iconType - 1] : null; } } |