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

Fixes bug #10908

Browse Source 
2004-11-07  Robert Schuster  <theBohemian@gmx.net>

       Fixes bug #10908
       * gnu/java/beans/IntrospectionIncubator.java:
       (addMethod): static methods are discarded now, too.

From-SVN: r90230
This commit is contained in:
Robert Schuster 2004-11-07 12:38:03 +00:00 committed by Mark Wielaard
parent 32890afef4
commit c2914ce5bf
2 changed files with 13 additions and 4 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-11-07 Robert Schuster <theBohemian@gmx.net>
Fixes bug #10908
* gnu/java/beans/IntrospectionIncubator.java:
(addMethod): static methods are discarded now, too.
2004-11-07 Andrew John Hughes <gnu_andrew@member.fsf.org> 2004-11-07 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/GregorianCalendar.java * java/util/GregorianCalendar.java

11
libjava/gnu/java/beans/IntrospectionIncubator.java
View File

@ -1,5 +1,5 @@
/* gnu.java.beans.IntrospectionIncubator /* gnu.java.beans.IntrospectionIncubator
Copyright (C) 1998 Free Software Foundation, Inc. Copyright (C) 1998, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -57,10 +57,12 @@ import java.util.Vector;
/** /**
** IntrospectionIncubator takes in a bunch of Methods, and ** IntrospectionIncubator takes in a bunch of Methods, and
** Introspects only those Methods you give it. ** Introspects only those Methods you give it.
** Note that non-public and static methods are silently
** discarded.
** **
** @author John Keiser ** @author John Keiser
** @version 1.1.0, 30 Jul 1998 ** @author Robert Schuster
** @see gnu.java.beans.ExplicitBeanInfo ** @see gnu.java.beans.ExplicitBeanInfo
** @see java.beans.BeanInfo ** @see java.beans.BeanInfo
**/ **/
@ -79,7 +81,8 @@ public class IntrospectionIncubator {
/* Paving the way for automatic Introspection */ /* Paving the way for automatic Introspection */
public void addMethod(Method method) { public void addMethod(Method method) {
if(Modifier.isPublic(method.getModifiers())) { if(Modifier.isPublic(method.getModifiers()) &&
!Modifier.isStatic(method.getModifiers())) {
String name = ClassHelper.getTruncatedName(method.getName()); String name = ClassHelper.getTruncatedName(method.getName());
Class retType = method.getReturnType(); Class retType = method.getReturnType();
Class[] params = method.getParameterTypes(); Class[] params = method.getParameterTypes();