OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Michael Koch 2004-10-16 17:48:57 +00:00 committed by Michael Koch
parent fce22de5d2
commit f3bf84759c
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -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.

13
libjava/gnu/java/beans/ExplicitBeanInfo.java
View File

@ -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;
}
}