Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 74735 invoked from network); 1 Aug 2007 16:39:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Aug 2007 16:39:43 -0000 Received: (qmail 359 invoked by uid 500); 1 Aug 2007 16:39:43 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 257 invoked by uid 500); 1 Aug 2007 16:39:43 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 239 invoked by uid 99); 1 Aug 2007 16:39:43 -0000 Received: from igron-1.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2007 09:39:43 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2007 16:38:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 605E51A981A; Wed, 1 Aug 2007 09:37:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r561865 - in /harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans: BeanInfoImpl.java EventSetDescriptor.java StandardBeanInfo.java Date: Wed, 01 Aug 2007 16:37:24 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070801163725.605E51A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Wed Aug 1 09:37:16 2007 New Revision: 561865 URL: http://svn.apache.org/viewvc?view=rev&rev=561865 Log: Restore throws declaration on EventSetDescriptor constructors, as required by spec. (second attempt) Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/BeanInfoImpl.java harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/StandardBeanInfo.java Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/BeanInfoImpl.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/BeanInfoImpl.java?view=diff&rev=561865&r1=561864&r2=561865 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/BeanInfoImpl.java (original) +++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/BeanInfoImpl.java Wed Aug 1 09:37:16 2007 @@ -250,13 +250,18 @@ // in event set descriptor pattern } - listenerCoreName = Introspector - .decapitalize(listenerCoreName); - EventSetDescriptor esd = new EventSetDescriptor( - listenerCoreName, listenerType, - listenerMethods, addListenerMethod, - removeListenerMethod, getListenerMethod); - result.put(listenerCoreName, esd); + try { + listenerCoreName = Introspector + .decapitalize(listenerCoreName); + EventSetDescriptor esd = new EventSetDescriptor( + listenerCoreName, listenerType, + listenerMethods, addListenerMethod, + removeListenerMethod, getListenerMethod); + result.put(listenerCoreName, esd); + } catch (IntrospectionException ie) { + System.out.println(Messages.getString( + "beans.39", listenerCoreName)); //$NON-NLS-1$ + } } // if length of parameters list equals to 1 } // if no descriptors for given listener name yet Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java?view=diff&rev=561865&r1=561864&r2=561865 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java (original) +++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/EventSetDescriptor.java Wed Aug 1 09:37:16 2007 @@ -131,14 +131,16 @@ public EventSetDescriptor(String eventSetName, Class listenerType, Method[] listenerMethods, Method addListenerMethod, - Method removeListenerMethod) { + Method removeListenerMethod) throws IntrospectionException { + this(eventSetName, listenerType, listenerMethods, addListenerMethod, removeListenerMethod, null); } public EventSetDescriptor(String eventSetName, Class listenerType, Method[] listenerMethods, Method addListenerMethod, - Method removeListenerMethod, Method getListenerMethod) { + Method removeListenerMethod, Method getListenerMethod) + throws IntrospectionException { setName(eventSetName); this.listenerType = listenerType; @@ -165,7 +167,9 @@ public EventSetDescriptor(String eventSetName, Class listenerType, MethodDescriptor[] listenerMethodDescriptors, - Method addListenerMethod, Method removeListenerMethod) { + Method addListenerMethod, Method removeListenerMethod) + throws IntrospectionException { + this(eventSetName, listenerType, null, addListenerMethod, removeListenerMethod, null); Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/StandardBeanInfo.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/StandardBeanInfo.java?view=diff&rev=561865&r1=561864&r2=561865 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/StandardBeanInfo.java (original) +++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/StandardBeanInfo.java Wed Aug 1 09:37:16 2007 @@ -823,7 +823,7 @@ * @throws IntrospectionException */ @SuppressWarnings("unchecked") - private EventSetDescriptor[] introspectEvents() { + private EventSetDescriptor[] introspectEvents() throws IntrospectionException { // Get descriptors for the public methods // FIXME: performance MethodDescriptor[] theMethods = introspectMethods();