From adffaces-commits-return-1735-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Fri Jan 19 21:08:18 2007 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 8685 invoked from network); 19 Jan 2007 21:08:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Jan 2007 21:08:18 -0000 Received: (qmail 45986 invoked by uid 500); 19 Jan 2007 21:08:24 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 45966 invoked by uid 500); 19 Jan 2007 21:08:24 -0000 Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: adffaces-dev@incubator.apache.org Delivered-To: mailing list adffaces-commits@incubator.apache.org Received: (qmail 45953 invoked by uid 99); 19 Jan 2007 21:08:24 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jan 2007 13:08:24 -0800 X-ASF-Spam-Status: No, hits=-8.2 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,WEIRD_QUOTING 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; Fri, 19 Jan 2007 13:08:17 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 4B0F01A981A; Fri, 19 Jan 2007 13:07:12 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r497955 - in /incubator/adffaces/branches/faces-1_2-061113/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces: generator/taglib/MyFacesComponentTagGenerator.java util/Util.java Date: Fri, 19 Jan 2007 21:07:11 -0000 To: adffaces-commits@incubator.apache.org From: baranda@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070119210712.4B0F01A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: baranda Date: Fri Jan 19 13:07:10 2007 New Revision: 497955 URL: http://svn.apache.org/viewvc?view=rev&rev=497955 Log: When the property is a literalOnly, in the setProperties method write the correct setter call for the myfaces generator Modified: incubator/adffaces/branches/faces-1_2-061113/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java incubator/adffaces/branches/faces-1_2-061113/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/Util.java Modified: incubator/adffaces/branches/faces-1_2-061113/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061113/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java?view=diff&rev=497955&r1=497954&r2=497955 ============================================================================== --- incubator/adffaces/branches/faces-1_2-061113/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java (original) +++ incubator/adffaces/branches/faces-1_2-061113/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java Fri Jan 19 13:07:10 2007 @@ -239,6 +239,10 @@ { _writeSetConverter(out, componentClass, propName); } + else if (property.isLiteralOnly()) + { + _writeSetPropertyLiteralOnly(out, property); + } else { _writeSetProperty(out, propName, propVar); @@ -262,6 +266,25 @@ { _writeSetValueBinding(out, propName, propVar); } + out.unindent(); + out.println("}"); + } + + private void _writeSetPropertyLiteralOnly( + PrettyWriter out, + PropertyBean property) + { + String propName = property.getPropertyName(); + String propVar = "_" + propName; + String jspPropName = property.getJspPropertyName(); + String setMethod = Util.getPrefixedPropertyName("set", jspPropName); + + out.println("if (" + propVar + " != null) "); + out.println("{"); + out.indent(); + + out.println("comp."+setMethod+"("+ propVar + ");"); + out.unindent(); out.println("}"); } Modified: incubator/adffaces/branches/faces-1_2-061113/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/Util.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061113/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/Util.java?view=diff&rev=497955&r1=497954&r2=497955 ============================================================================== --- incubator/adffaces/branches/faces-1_2-061113/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/Util.java (original) +++ incubator/adffaces/branches/faces-1_2-061113/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/util/Util.java Fri Jan 19 13:07:10 2007 @@ -316,11 +316,7 @@ if (isPrimitiveClass(propertyFullClass)){ return def; } else if ("java.lang.String".equals(propertyFullClass)){ - if (def.startsWith("\"") && def.endsWith("\"")){ - return def; - } else { - return "\""+def+"\""; - } + return Util.convertStringToLiteral(def); } return null; }