[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small
cleanup in ExplicitBeanInfo
Kaffe CVS
cvs-commits at kaffe.org
Fri Oct 15 02:59:23 PDT 2004
PatchSet 5292
Date: 2004/10/15 09:55:34
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: small cleanup in ExplicitBeanInfo
2004-10-15 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java:
Resynced with GNU Classpath.
2004-10-13 Michael Koch <konqueror at gmx.de>
* gnu/java/beans/ExplicitBeanInfo.java:
Explicitely import java.awt.Image.
(getIcon): Fixed off-by-one error.
Members:
ChangeLog:1.2844->1.2845
libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2844 kaffe/ChangeLog:1.2845
--- kaffe/ChangeLog:1.2844 Thu Oct 14 23:35:35 2004
+++ kaffe/ChangeLog Fri Oct 15 09:55:34 2004
@@ -1,3 +1,14 @@
+2004-10-15 Dalibor Topic <robilad at kaffe.org>
+
+ * libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-13 Michael Koch <konqueror at gmx.de>
+
+ * gnu/java/beans/ExplicitBeanInfo.java:
+ Explicitely import java.awt.Image.
+ (getIcon): Fixed off-by-one error.
+
2004-10-14 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/java/awt/image/DataBufferByte.java,
Index: kaffe/libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java
diff -u kaffe/libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java:1.3 kaffe/libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java:1.4
--- kaffe/libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java:1.3 Mon Mar 22 11:24:10 2004
+++ kaffe/libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java Fri Oct 15 09:55:37 2004
@@ -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 @@
package gnu.java.beans;
+import java.awt.Image;
import java.beans.BeanDescriptor;
import java.beans.BeanInfo;
import java.beans.EventSetDescriptor;
@@ -84,7 +85,7 @@
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 @@
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 @@
/** 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;
}
}
More information about the kaffe
mailing list