Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 68713 invoked from network); 17 Jul 2007 06:49:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Jul 2007 06:48:38 -0000 Received: (qmail 17496 invoked by uid 500); 17 Jul 2007 06:46:59 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 17474 invoked by uid 500); 17 Jul 2007 06:46:59 -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 17464 invoked by uid 99); 17 Jul 2007 06:46:59 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jul 2007 23:46:59 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Mon, 16 Jul 2007 23:46:56 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0A21E1A981A; Mon, 16 Jul 2007 23:46:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r556830 - in /harmony/enhanced/classlib/trunk/modules/beans/src/main/java: java/beans/IndexedPropertyDescriptor.java org/apache/harmony/beans/internal/nls/messages.properties Date: Tue, 17 Jul 2007 06:46:35 -0000 To: commits@harmony.apache.org From: tonywu@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070717064636.0A21E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tonywu Date: Mon Jul 16 23:46:33 2007 New Revision: 556830 URL: http://svn.apache.org/viewvc?view=rev&rev=556830 Log: change the nls message id to hexdecimal Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/IndexedPropertyDescriptor.java harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/IndexedPropertyDescriptor.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/IndexedPropertyDescriptor.java?view=diff&rev=556830&r1=556829&r2=556830 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/IndexedPropertyDescriptor.java (original) +++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/IndexedPropertyDescriptor.java Mon Jul 16 23:46:33 2007 @@ -255,9 +255,9 @@ if (indexedGetter == null) { if (indexedSetter == null) { if (getPropertyType() != null) { - // beans.60=Indexed method is not compatible with non indexed method + // beans.5A=Indexed method is not compatible with non indexed method throw new IntrospectionException(Messages - .getString("beans.60")); + .getString("beans.5A")); } indexedPropertyType = null; } @@ -267,18 +267,18 @@ // Validate the indexed getter. if ((indexedGetter.getParameterTypes().length != 1) || (indexedGetter.getParameterTypes()[0] != Integer.TYPE)) { - // beans.61=Indexed read method must take a single int argument - throw new IntrospectionException(Messages.getString("beans.61")); //$NON-NLS-1$ + // beans.5B=Indexed read method must take a single int argument + throw new IntrospectionException(Messages.getString("beans.5B")); //$NON-NLS-1$ } Class indexedReadType = indexedGetter.getReturnType(); if (indexedReadType == Void.TYPE) { - // beans.61=Indexed read method must take a single int argument - throw new IntrospectionException(Messages.getString("beans.61")); //$NON-NLS-1$ + // beans.5B=Indexed read method must take a single int argument + throw new IntrospectionException(Messages.getString("beans.5B")); //$NON-NLS-1$ } else if (indexedSetter != null && indexedGetter.getReturnType() != indexedSetter .getParameterTypes()[1]) { - // beans.60=Indexed read method is not compatible with indexed write method - throw new IntrospectionException(Messages.getString("beans.60")); //$NON-NLS-1$ + // beans.5A=Indexed read method is not compatible with indexed write method + throw new IntrospectionException(Messages.getString("beans.5A")); //$NON-NLS-1$ } // Set the indexed property type if not already set, confirm validity if @@ -287,8 +287,8 @@ indexedPropertyType = indexedReadType; } else { if (indexedPropertyType != indexedReadType) { - // beans.60=Indexed read method is not compatible with indexed write method - throw new IntrospectionException(Messages.getString("beans.60")); //$NON-NLS-1$ + // beans.5A=Indexed read method is not compatible with indexed write method + throw new IntrospectionException(Messages.getString("beans.5A")); //$NON-NLS-1$ } } @@ -303,11 +303,11 @@ setter = beanClass.getMethod(indexedSetterName, new Class[] { Integer.TYPE, getPropertyType().getComponentType() }); } catch (SecurityException e) { - // beans.62=Security violation accessing indexed write method - throw new IntrospectionException(Messages.getString("beans.62")); //$NON-NLS-1$ + // beans.5C=Security violation accessing indexed write method + throw new IntrospectionException(Messages.getString("beans.5C")); //$NON-NLS-1$ } catch (NoSuchMethodException e) { - // beans.63=No such indexed write method - throw new IntrospectionException(Messages.getString("beans.63")); //$NON-NLS-1$ + // beans.5D=No such indexed write method + throw new IntrospectionException(Messages.getString("beans.5D")); //$NON-NLS-1$ } internalSetIndexedWriteMethod(setter, true); } @@ -320,11 +320,11 @@ Integer.TYPE, argType }); internalSetIndexedWriteMethod(setter, true); } catch (NoSuchMethodException exception) { - // beans.63=No such indexed write method - throw new IntrospectionException(Messages.getString("beans.63")); //$NON-NLS-1$ + // beans.5D=No such indexed write method + throw new IntrospectionException(Messages.getString("beans.5D")); //$NON-NLS-1$ } catch (SecurityException exception) { - // beans.62=Security violation accessing indexed write method - throw new IntrospectionException(Messages.getString("beans.62")); //$NON-NLS-1$ + // beans.5C=Security violation accessing indexed write method + throw new IntrospectionException(Messages.getString("beans.5C")); //$NON-NLS-1$ } } @@ -334,9 +334,9 @@ if (indexedSetter == null) { if (indexedGetter == null) { if (getPropertyType() != null) { - // beans.64=Indexed method is not compatible with non indexed method + // beans.5E=Indexed method is not compatible with non indexed method throw new IntrospectionException(Messages - .getString("beans.64")); + .getString("beans.5E")); } indexedPropertyType = null; } @@ -347,12 +347,12 @@ // Validate the indexed write method. Class[] indexedSetterArgs = indexedSetter.getParameterTypes(); if (indexedSetterArgs.length != 2) { - // beans.65=Indexed write method must take two arguments - throw new IntrospectionException(Messages.getString("beans.65")); //$NON-NLS-1$ + // beans.5F=Indexed write method must take two arguments + throw new IntrospectionException(Messages.getString("beans.5F")); //$NON-NLS-1$ } if (indexedSetterArgs[0] != Integer.TYPE) { - // beans.66=Indexed write method must take an int as its first argument - throw new IntrospectionException(Messages.getString("beans.66")); //$NON-NLS-1$ + // beans.60=Indexed write method must take an int as its first argument + throw new IntrospectionException(Messages.getString("beans.60")); //$NON-NLS-1$ } // Set the indexed property type if not already set, confirm validity if @@ -362,8 +362,8 @@ indexedPropertyType = indexedWriteType; } else { if (indexedPropertyType != indexedWriteType) { - // beans.67=Indexed write method is not compatible with indexed read method - throw new IntrospectionException(Messages.getString("beans.67")); //$NON-NLS-1$ + // beans.61=Indexed write method is not compatible with indexed read method + throw new IntrospectionException(Messages.getString("beans.61")); //$NON-NLS-1$ } } Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties?view=diff&rev=556830&r1=556829&r2=556830 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties (original) +++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties Mon Jul 16 23:46:33 2007 @@ -105,11 +105,11 @@ beans.57=Property type is incompatible with the indexed property type beans.58=No such indexed read method beans.59=Security violation accessing indexed read method -beans.60=Indexed read method is not compatible with indexed write method -beans.61=Indexed read method must take a single int argument -beans.62=Security violation accessing indexed write method -beans.63=No such indexed write method -beans.64=Indexed method is not compatible with non indexed method -beans.65=Indexed write method must take a two arguments -beans.66=Indexed write method must take an int as its first argument -beans.67=Indexed write method is not compatible with indexed read method +beans.5A=Indexed read method is not compatible with indexed write method +beans.5B=Indexed read method must take a single int argument +beans.5C=Security violation accessing indexed write method +beans.5D=No such indexed write method +beans.5E=Indexed method is not compatible with non indexed method +beans.5F=Indexed write method must take a two arguments +beans.60=Indexed write method must take an int as its first argument +beans.61=Indexed write method is not compatible with indexed read method