Return-Path: Delivered-To: apmail-incubator-click-commits-archive@minotaur.apache.org Received: (qmail 11653 invoked from network); 18 Jun 2009 23:22:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Jun 2009 23:22:05 -0000 Received: (qmail 66312 invoked by uid 500); 18 Jun 2009 23:22:16 -0000 Delivered-To: apmail-incubator-click-commits-archive@incubator.apache.org Received: (qmail 66299 invoked by uid 500); 18 Jun 2009 23:22:16 -0000 Mailing-List: contact click-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: click-dev@incubator.apache.org Delivered-To: mailing list click-commits@incubator.apache.org Received: (qmail 66284 invoked by uid 99); 18 Jun 2009 23:22:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jun 2009 23:22:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Thu, 18 Jun 2009 23:22:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2A52E2388873; Thu, 18 Jun 2009 23:21:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r786333 - in /incubator/click/trunk/click/framework/src/org/apache/click/element: CssStyle.java JsScript.java Date: Thu, 18 Jun 2009 23:21:51 -0000 To: click-commits@incubator.apache.org From: sabob@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090618232152.2A52E2388873@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sabob Date: Thu Jun 18 23:21:51 2009 New Revision: 786333 URL: http://svn.apache.org/viewvc?rev=786333&view=rev Log: fixed rendering "null" string, if no content was set Modified: incubator/click/trunk/click/framework/src/org/apache/click/element/CssStyle.java incubator/click/trunk/click/framework/src/org/apache/click/element/JsScript.java Modified: incubator/click/trunk/click/framework/src/org/apache/click/element/CssStyle.java URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/framework/src/org/apache/click/element/CssStyle.java?rev=786333&r1=786332&r2=786333&view=diff ============================================================================== --- incubator/click/trunk/click/framework/src/org/apache/click/element/CssStyle.java (original) +++ incubator/click/trunk/click/framework/src/org/apache/click/element/CssStyle.java Thu Jun 18 23:21:51 2009 @@ -421,7 +421,10 @@ buffer.append(context.renderTemplate(getTemplate(), templateModel)); } - buffer.append(getContent()); + + if (getContent() != null) { + buffer.append(getContent()); + } } // ------------------------------------------------ Package Private Methods Modified: incubator/click/trunk/click/framework/src/org/apache/click/element/JsScript.java URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/framework/src/org/apache/click/element/JsScript.java?rev=786333&r1=786332&r2=786333&view=diff ============================================================================== --- incubator/click/trunk/click/framework/src/org/apache/click/element/JsScript.java (original) +++ incubator/click/trunk/click/framework/src/org/apache/click/element/JsScript.java Thu Jun 18 23:21:51 2009 @@ -479,7 +479,10 @@ buffer.append(context.renderTemplate(getTemplate(), templateModel)); } - buffer.append(getContent()); + + if (getContent() != null) { + buffer.append(getContent()); + } } /**