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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5600321cb234b7876c8e80011c84501f8f63555f..74f876a826de977968dea0c8a201f6db21dd451e 100644 (file)
--- 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 410be70cd2cd0777e14014d524d9ccb7a833d1fe..6746bd8ccaed16f7bbc0566dcfe621365e84a407 100644 (file)
--- 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;
        }
 }