Return-Path: Delivered-To: apmail-labs-commits-archive@minotaur.apache.org Received: (qmail 87655 invoked from network); 11 Nov 2009 11:17:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Nov 2009 11:17:42 -0000 Received: (qmail 49970 invoked by uid 500); 11 Nov 2009 11:17:42 -0000 Delivered-To: apmail-labs-commits-archive@labs.apache.org Received: (qmail 49837 invoked by uid 500); 11 Nov 2009 11:17:42 -0000 Mailing-List: contact commits-help@labs.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: labs@labs.apache.org Delivered-To: mailing list commits@labs.apache.org Received: (qmail 49828 invoked by uid 99); 11 Nov 2009 11:17:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Nov 2009 11:17:42 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Nov 2009 11:17:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DB6A62388962; Wed, 11 Nov 2009 11:17:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r834841 - in /labs/magma/trunk: foundation-beans/src/main/java/org/apache/magma/conversion/AddConversionInHandler.aj foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormattingInHandler.aj Date: Wed, 11 Nov 2009 11:17:15 -0000 To: commits@labs.apache.org From: simoneg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091111111716.DB6A62388962@eris.apache.org> Author: simoneg Date: Wed Nov 11 11:17:13 2009 New Revision: 834841 URL: http://svn.apache.org/viewvc?rev=834841&view=rev Log: LABS-495: optimizing also string based handling Modified: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/AddConversionInHandler.aj labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormattingInHandler.aj Modified: labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/AddConversionInHandler.aj URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/AddConversionInHandler.aj?rev=834841&r1=834840&r2=834841&view=diff ============================================================================== --- labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/AddConversionInHandler.aj (original) +++ labs/magma/trunk/foundation-beans/src/main/java/org/apache/magma/conversion/AddConversionInHandler.aj Wed Nov 11 11:17:13 2009 @@ -115,6 +115,7 @@ this.stringValues.clear(); this.explicitlySet.clear(); this.nonConverted.clear(); + /* Set names = this.data.getPropertyNames(); for (String name : names) { PropertyInfo property = this.data.getProperty(name); @@ -122,7 +123,8 @@ Object val = this.values.get(name); loadConverted(property, val); } - } + } + */ } /** Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormattingInHandler.aj URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormattingInHandler.aj?rev=834841&r1=834840&r2=834841&view=diff ============================================================================== --- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormattingInHandler.aj (original) +++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormattingInHandler.aj Wed Nov 11 11:17:13 2009 @@ -25,6 +25,7 @@ import org.apache.magma.beans.BeanHandler; import org.apache.magma.beans.PropertyInfo; import org.apache.magma.conversion.ConversionException; +import org.apache.magma.conversion.Converter; /** * Adds a layer to the {@link BeanHandler} to support formatted values retrieval and parsing. @@ -71,10 +72,15 @@ public String BeanHandler.getFormattedStringValue(String field) { PropertyInfo property = data.getProperty(field); if (property == null) throw new MagmaException("Cannot find a proprty named {0} in class {1}", field, bean.getClass().getName()); - if (property.getFormatter() == null) { + Formatter form = property.getFormatter(); + if (form == null) { return this.getStringValue(field); } if (!property.isReadable()) throw new MagmaException("Property {0} is not readable in class {1}", field, bean.getClass().getName()); + if (!formattedValues.containsKey(field)) { + Object val = getValue(field); + loadFormatted(property, val); + } return formattedValues.get(field); } @@ -83,21 +89,7 @@ */ public void BeanHandler.rollbackFormattedStringValues() { this.formattedValues.clear(); - Set names = this.data.getPropertyNames(); - for (String name : names) { - PropertyInfo property = this.data.getProperty(name); - Object val = this.values.get(name); - if (val != null) { - Formatter form = property.getFormatter(); - if (form != null) { - this.formattedValues.put(name, form.to(val)); - } else { - this.formattedValues.put(name, this.getStringValue(name)); - } - } else { - this.formattedValues.put(name, ""); - } - } + this.formattedExplicitlySet.clear(); } /** @@ -128,4 +120,19 @@ if (exc != null) throw exc; } + private void BeanHandler.loadFormatted(PropertyInfo property, Object val) { + String name = property.getName(); + if (val != null) { + Formatter form = property.getFormatter(); + if (form != null) { + this.formattedValues.put(name, form.to(val)); + } else { + this.formattedValues.put(name, this.getStringValue(name)); + } + } else { + this.formattedValues.put(name, ""); + } + } + + } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org For additional commands, e-mail: commits-help@labs.apache.org