harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r465156 - /incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java
Date Wed, 18 Oct 2006 06:23:54 GMT
Author: mloenko
Date: Tue Oct 17 23:23:52 2006
New Revision: 465156

URL: http://svn.apache.org/viewvc?view=rev&rev=465156
Log:
applied patch from HARMONY-1515
[classlib][beans] EventSetDescriptor(.., Method) throws IntrospectionException on Harmony
end creates object on RI

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java?view=diff&rev=465156&r1=465155&r2=465156
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java
Tue Oct 17 23:23:52 2006
@@ -175,13 +175,8 @@
             }
         }
 
-        this.addListenerMethod = checkRegistrationMethod(listenerType,
-                addListenerMethod);
-        this.removeListenerMethod = checkRegistrationMethod(listenerType,
-                removeListenerMethod);
-        this.getListenerMethod = null;
-
-        this.unicast = isUnicastByDefault(addListenerMethod);
+        this.addListenerMethod = addListenerMethod;
+        this.removeListenerMethod = removeListenerMethod;
     }
 
     public EventSetDescriptor(String eventSetName, Class<?> listenerType,
@@ -208,13 +203,9 @@
             }
         }
 
-        this.addListenerMethod = checkRegistrationMethod(listenerType,
-                addListenerMethod);
-        this.removeListenerMethod = checkRegistrationMethod(listenerType,
-                removeListenerMethod);
-        this.getListenerMethod = checkGetListenerMethod(listenerType,
-                getListenerMethod);
-
+        this.addListenerMethod = addListenerMethod;
+        this.removeListenerMethod = removeListenerMethod;
+        this.getListenerMethod = getListenerMethod;
         this.unicast = isUnicastByDefault(addListenerMethod);
     }
 
@@ -232,20 +223,18 @@
 
         this.listenerType = listenerType;
 
-        for (MethodDescriptor element : listenerMethodDescriptors) {
-            Method listenerMethod = element.getMethod();
+        if (listenerMethodDescriptors != null) {
+            for (MethodDescriptor element : listenerMethodDescriptors) {
+                Method listenerMethod = element.getMethod();
 
-            if (checkMethod(listenerType, listenerMethod)) {
-                this.listenerMethodDescriptors.add(element);
+                if (checkMethod(listenerType, listenerMethod)) {
+                    this.listenerMethodDescriptors.add(element);
+                }
             }
         }
-
-        this.addListenerMethod = checkRegistrationMethod(listenerType,
-                addListenerMethod);
-        this.removeListenerMethod = checkRegistrationMethod(listenerType,
-                removeListenerMethod);
+        this.addListenerMethod = addListenerMethod;
+        this.removeListenerMethod = removeListenerMethod;
         this.getListenerMethod = null;
-
         this.unicast = isUnicastByDefault(addListenerMethod);
     }
 



Mime
View raw message