[cp-patches] gnu.java.beans.IntrospectionIncubator - fix for bug #10908

[Robert Schuster]

hi,
this fixes static methods being treated as a property (e.g. 
java.beans.Beans.isGuiAvailable() ).

cu
Robert

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2732
diff -u -r1.2732 ChangeLog
--- ChangeLog   4 Nov 2004 13:07:30 -0000       1.2732
+++ ChangeLog   5 Nov 2004 12:32:43 -0000
@@ -1,17 +1,23 @@
-2004-11-04  Torsten Rupp  address@hidden
+2004-11-05  Robert Schuster <address@hidden>
+
+       Fixes bug #10908
+       * gnu/java/beans/IntrospectionIncubator.java:
+       (addMethod): static methods are discarded now, too
+
+2004-11-04  Torsten Rupp  <address@hidden>
 
        * native/jni/java-net/gnu_java_net_PlainDatagramSocketImpl.c:
        Replaced 'this' arguments by 'obj' to make source compatible with
        C++ compilers.
 
-2004-11-04  Torsten Rupp  address@hidden
+2004-11-04  Torsten Rupp  <address@hidden>
 
        * native/jni/java-net/gnu_java_net_PlainDatagramSocketImpl.c:
        Add dummy return values for WITHOUT_NETWORK code path.
        (Java_gnu_java_net_PlainDatagramSocketImpl_receive0): Check fid not
        NULL for maxlen field id.
 
-2004-11-04  Torsten Rupp  address@hidden
+2004-11-04  Torsten Rupp  <address@hidden>
 
         * native/jni/java-net/gnu_java_net_PlainSocketImpl.c: Added missing
        return values for WITHOUT_NETWORK code path.
Index: gnu/java/beans/IntrospectionIncubator.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/beans/IntrospectionIncubator.java,v
retrieving revision 1.12
diff -u -r1.12 IntrospectionIncubator.java
--- gnu/java/beans/IntrospectionIncubator.java  25 Jul 2004 17:04:17 -0000      
1.12
+++ gnu/java/beans/IntrospectionIncubator.java  5 Nov 2004 12:32:43 -0000
@@ -1,5 +1,5 @@
 /* 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.
 
@@ -57,10 +57,12 @@
 
 /**
  ** 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
- ** @version 1.1.0, 30 Jul 1998
+ ** @author Robert Schuster
  ** @see gnu.java.beans.ExplicitBeanInfo
  ** @see java.beans.BeanInfo
  **/
@@ -79,7 +81,8 @@
 
        /* Paving the way for automatic Introspection */
        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());
                        Class retType = method.getReturnType();
                        Class[] params = method.getParameterTypes();