Return-Path: Delivered-To: apmail-myfaces-commits-archive@www.apache.org Received: (qmail 26616 invoked from network); 17 Dec 2009 02:33:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Dec 2009 02:33:55 -0000 Received: (qmail 71980 invoked by uid 500); 17 Dec 2009 02:33:55 -0000 Delivered-To: apmail-myfaces-commits-archive@myfaces.apache.org Received: (qmail 71872 invoked by uid 500); 17 Dec 2009 02:33:54 -0000 Mailing-List: contact commits-help@myfaces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "MyFaces Development" Delivered-To: mailing list commits@myfaces.apache.org Received: (qmail 71863 invoked by uid 99); 17 Dec 2009 02:33:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Dec 2009 02:33:54 +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, 17 Dec 2009 02:33:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 274B32388A19; Thu, 17 Dec 2009 02:33:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r891522 [3/28] - in /myfaces/trinidad/branches/trinidad-2.0.x: ./ trinidad-api/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/util/ trinidad-api/src/main/java/org/ap... Date: Thu, 17 Dec 2009 02:33:11 -0000 To: commits@myfaces.apache.org From: arobinson74@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091217023320.274B32388A19@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectBooleanRadio.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectBooleanRadio.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectBooleanRadio.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectBooleanRadio.xml Thu Dec 17 02:33:05 2009 @@ -215,6 +215,9 @@ Brian Albers selectBooleanRadio + change + change click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup focus blur valueChange NONE true Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyCheckbox.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyCheckbox.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyCheckbox.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyCheckbox.xml Thu Dec 17 02:33:05 2009 @@ -216,6 +216,9 @@ Adam Winer selectManyCheckbox + change + change click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup focus blur valueChange label org.apache.myfaces.trinidad.CoreSelectItem Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyListbox.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyListbox.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyListbox.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyListbox.xml Thu Dec 17 02:33:05 2009 @@ -219,6 +219,9 @@ name listbox + change + change click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup focus blur valueChange label org.apache.myfaces.trinidad.CoreSelectItem Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml Thu Dec 17 02:33:05 2009 @@ -355,6 +355,9 @@ Marissa Treinen + change + change click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup focus blur valueChange pda phone voice Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneChoice.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneChoice.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneChoice.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneChoice.xml Thu Dec 17 02:33:05 2009 @@ -215,6 +215,9 @@ Andy Schwartz selectOneChoice + change + change click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup focus blur valueChange label org.apache.myfaces.trinidad.CoreSelectItem Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneListbox.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneListbox.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneListbox.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneListbox.xml Thu Dec 17 02:33:05 2009 @@ -228,6 +228,9 @@ Andy Schwartz listbox + change + change click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup focus blur valueChange label org.apache.myfaces.trinidad.CoreSelectItem Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneRadio.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneRadio.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneRadio.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOneRadio.xml Thu Dec 17 02:33:05 2009 @@ -232,6 +232,9 @@ John Fallows selectOneRadio + change + change click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup focus blur valueChange label org.apache.myfaces.trinidad.CoreSelectItem Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml Thu Dec 17 02:33:05 2009 @@ -208,6 +208,9 @@ Marissa Treinen + change + change click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup focus blur valueChange pda phone voice Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectRangeChoiceBar.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectRangeChoiceBar.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectRangeChoiceBar.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectRangeChoiceBar.xml Thu Dec 17 02:33:05 2009 @@ -98,6 +98,9 @@ selectRangeChoiceBar phone voice + change + change click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup focus blur NONE Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetail.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetail.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetail.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetail.xml Thu Dec 17 02:33:05 2009 @@ -178,6 +178,9 @@ ]]> + click + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup hideShow Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailHeader.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailHeader.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailHeader.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailHeader.xml Thu Dec 17 02:33:05 2009 @@ -83,6 +83,9 @@ disclosed hideShowHeader + click + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup text Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailItem.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailItem.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailItem.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowDetailItem.xml Thu Dec 17 02:33:05 2009 @@ -179,6 +179,9 @@ Scott O'Bryan showItem + click + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup text Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSingleStepButtonBar.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSingleStepButtonBar.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSingleStepButtonBar.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSingleStepButtonBar.xml Thu Dec 17 02:33:05 2009 @@ -100,6 +100,9 @@ pda phone voice + click + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup NONE selectedStep Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml Thu Dec 17 02:33:05 2009 @@ -84,6 +84,9 @@ pda phone voice + click + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup NONE Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml Thu Dec 17 02:33:05 2009 @@ -248,6 +248,9 @@ Brian Albers table + click + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup id org.apache.myfaces.trinidad.CoreColumn Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTrain.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTrain.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTrain.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTrain.xml Thu Dec 17 02:33:05 2009 @@ -110,6 +110,9 @@ Jeanne Waldman + click + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup train Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTree.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTree.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTree.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTree.xml Thu Dec 17 02:33:05 2009 @@ -76,6 +76,9 @@ tree phone voice + click + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup NONE value Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml Thu Dec 17 02:33:05 2009 @@ -136,6 +136,9 @@ pda phone voice hGrid + click + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup id org.apache.myfaces.trinidad.CoreColumn Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlBody.xml Thu Dec 17 02:33:05 2009 @@ -79,7 +79,7 @@ true - + @@ -279,6 +279,9 @@ Blake Sullivan body + load + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup load unload org.apache.myfaces.trinidad.CorePanelPage org.apache.myfaces.trinidad.CoreForm org-apache-myfaces-trinidad-htmlbody-holder Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlCellFormat.xml Thu Dec 17 02:33:05 2009 @@ -109,7 +109,7 @@ false - + true - + @@ -319,6 +319,9 @@ vAlign + click + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup org-apache-myfaces-trinidad-htmlcellformat-holder Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrameBorderLayout.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrameBorderLayout.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrameBorderLayout.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlFrameBorderLayout.xml Thu Dec 17 02:33:05 2009 @@ -307,7 +307,7 @@ true - + @@ -368,6 +368,8 @@ frameBorderLayout pda phone voice + load + load unload org.apache.myfaces.trinidad.HtmlFrame org-apache-myfaces-trinidad-htmlframeborderlayout-holder Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlRowLayout.xml Thu Dec 17 02:33:05 2009 @@ -266,6 +266,9 @@ width + click + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup org.apache.myfaces.trinidad.HtmlCellFormat org-apache-myfaces-trinidad-htmlrowlayout-holder Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlTableLayout.xml Thu Dec 17 02:33:05 2009 @@ -102,7 +102,7 @@ true - + @@ -277,6 +277,9 @@ width + click + click dblclick mousedown mouseup mouseover mousemove mouseout + keypress keydown keyup org.apache.myfaces.trinidad.HtmlRowLayout org-apache-myfaces-trinidad-htmlrowlayout-holder Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml Thu Dec 17 02:33:05 2009 @@ -69,6 +69,16 @@ + + + + + invoke-function + org.apache.myfaces.trinidaddemo.behaviors.InvokeFunctionBehavior + + + + org.apache.myfaces.trinidaddemo.DateField org.apache.myfaces.trinidaddemo.composite.DateField @@ -80,6 +90,13 @@ org.apache.myfaces.trinidaddemo.DateField org.apache.myfaces.trinidaddemo.composite.DateFieldAsRenderer + + + invoke-function + + org.apache.myfaces.trinidaddemo.behaviors.render.InvokeFunctionBehaviorRenderer + + Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml Thu Dec 17 02:33:05 2009 @@ -88,20 +88,24 @@ false - javax.faces.FACELETS_VIEW_MAPPINGS *.xhtml - + javax.faces.FACELETS_SKIP_COMMENTS true - --> + + javax.faces.FACELETS_LIBRARIES + /WEB-INF/tr-demo.taglib.xml + + - + Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/pom.xml URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/pom.xml?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/pom.xml (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/pom.xml Thu Dec 17 02:33:05 2009 @@ -141,6 +141,10 @@ src/main/javascript/ + true + + ${project.basedir}/src/test + Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/GlobalConfiguratorImpl.java Thu Dec 17 02:33:05 2009 @@ -22,15 +22,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import java.util.concurrent.atomic.AtomicReference; import javax.faces.context.ExternalContext; import javax.servlet.ServletRequest; - import javax.servlet.ServletRequestWrapper; - import javax.servlet.http.HttpServletRequest; import org.apache.myfaces.trinidad.config.Configurator; @@ -40,6 +37,9 @@ import org.apache.myfaces.trinidad.logging.TrinidadLogger; import org.apache.myfaces.trinidad.skin.SkinFactory; import org.apache.myfaces.trinidad.util.ClassLoaderUtils; +import org.apache.myfaces.trinidad.util.ExternalContextUtils; +import org.apache.myfaces.trinidad.util.RequestStateMap; +import org.apache.myfaces.trinidad.util.RequestType; import org.apache.myfaces.trinidadinternal.context.RequestContextFactoryImpl; import org.apache.myfaces.trinidadinternal.context.external.ServletCookieMap; import org.apache.myfaces.trinidadinternal.context.external.ServletRequestHeaderMap; @@ -49,9 +49,7 @@ import org.apache.myfaces.trinidadinternal.context.external.ServletRequestParameterValuesMap; import org.apache.myfaces.trinidadinternal.skin.SkinFactoryImpl; import org.apache.myfaces.trinidadinternal.skin.SkinUtils; -import org.apache.myfaces.trinidad.util.ExternalContextUtils; -import org.apache.myfaces.trinidad.util.RequestStateMap; -import org.apache.myfaces.trinidad.util.RequestType; + /** * This is the implementation of the Trinidad's Global configurator. It provides the entry point for @@ -410,7 +408,7 @@ finally { - //Do cleanup of anything which may have use the thread local manager durring + //Do cleanup of anything which may have use the thread local manager during //init. _releaseManagedThreadLocals(); } Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueExpression.java URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueExpression.java?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueExpression.java (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/LazyValueExpression.java Thu Dec 17 02:33:05 2009 @@ -20,25 +20,26 @@ import javax.el.ELContext; import javax.el.ELResolver; +import javax.el.ExpressionFactory; import javax.el.FunctionMapper; +import javax.el.ValueExpression; +import javax.el.VariableMapper; import javax.faces.FactoryFinder; import javax.faces.application.Application; import javax.faces.application.ApplicationFactory; import javax.faces.context.FacesContext; -import javax.el.ValueExpression; - -import javax.el.VariableMapper; import org.apache.myfaces.trinidad.logging.TrinidadLogger; - /** - * A ValueExpression class that lazily parses the underlying EL expression - * (in case the Application object is not yet available). Unfortunately, - * this implementation means that errors in the syntax of the EL - * expression won't get detected until use. - * - */ + +/** + * A ValueExpression class that lazily parses the underlying EL expression + * (in case the Application object is not yet available). Unfortunately, + * this implementation means that errors in the syntax of the EL + * expression won't get detected until use. + * + */ public class LazyValueExpression extends ValueExpression { @@ -175,10 +176,11 @@ { ELContext elContext = _getELContext(application); - return - application.getExpressionFactory(). - createValueExpression(elContext, expression, expectedType); - + ExpressionFactory expressionFactory = application.getExpressionFactory(); + if (expressionFactory != null) + { + return expressionFactory.createValueExpression(elContext, expression, expectedType); + } } } Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitDecorator.java URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitDecorator.java?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitDecorator.java (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitDecorator.java Thu Dec 17 02:33:05 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -21,19 +21,24 @@ import java.io.OutputStream; import java.io.Writer; +import java.util.Iterator; import java.util.concurrent.ConcurrentMap; import javax.faces.FactoryFinder; +import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.context.ResponseStream; import javax.faces.context.ResponseWriter; +import javax.faces.render.ClientBehaviorRenderer; import javax.faces.render.RenderKit; import javax.faces.render.RenderKitFactory; import javax.faces.render.Renderer; import javax.faces.render.ResponseStateManager; import org.apache.myfaces.trinidad.context.RequestContext; +import org.apache.myfaces.trinidad.context.RequestContextFactory; import org.apache.myfaces.trinidad.util.Service; +import org.apache.myfaces.trinidadinternal.config.GlobalConfiguratorImpl; abstract public class RenderKitDecorator extends RenderKitBase @@ -70,6 +75,21 @@ return getRenderKit().getResponseStateManager(); } + public void addClientBehaviorRenderer(String type, ClientBehaviorRenderer renderer) + { + getRenderKit().addClientBehaviorRenderer(type, renderer); + } + + public ClientBehaviorRenderer getClientBehaviorRenderer(String type) + { + return getRenderKit().getClientBehaviorRenderer(type); + } + + public Iterator getClientBehaviorRendererTypes() + { + return getRenderKit().getClientBehaviorRendererTypes(); + } + protected ResponseWriter createDecoratedResponseWriter( ResponseWriter delegate) { @@ -88,14 +108,14 @@ if (renderer == null) { RenderKit renderKit = getRenderKit(); - + // Use findRenderer() to avoid "not found" warning messages if (renderKit instanceof RenderKitBase) renderer = ((RenderKitBase) renderKit).findRenderer( componentFamily, rendererType); else renderer = renderKit.getRenderer(componentFamily, rendererType); - + // copy-on-read if (renderer != null) addRenderer(componentFamily, rendererType, renderer); @@ -107,28 +127,38 @@ protected RenderKit getRenderKit() { FacesContext context = FacesContext.getCurrentInstance(); - + // There's only one RenderKitFactory per app. The javadoc for RenderKitFactory says: - // "There must be one RenderKitFactory instance per web + // "There must be one RenderKitFactory instance per web // application that is utilizing JavaServer Faces" // The call to FactoryFinder.getFactory is doing locking, Issue 688 was filed with the RI // to try to remove the locking there: // https://javaserverfaces.dev.java.net/issues/show_bug.cgi?id=688 - // However they were not able to remove the locking. + // However they were not able to remove the locking. // Therefore save off the factory on the app map. - ConcurrentMap appMap = - RequestContext.getCurrentInstance().getApplicationScopedConcurrentMap(); - + RequestContext requestContext = RequestContext.getCurrentInstance(); + if (requestContext == null) + { + // In JSF 2, this method may be called be before the global configurator has been initialized and if that + // is the case, then the request context needs to be built + ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext(); + GlobalConfiguratorImpl.getInstance().init(externalContext); + requestContext = RequestContextFactory.getFactory().createContext(externalContext); + } + + ConcurrentMap appMap = + requestContext.getApplicationScopedConcurrentMap(); + RenderKitFactory factory = (RenderKitFactory)appMap.get(_RENDER_KIT_FACTORY_KEY); - + if (factory == null) { - factory = (RenderKitFactory)FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY); - RenderKitFactory oldFactory = + factory = (RenderKitFactory)FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY); + RenderKitFactory oldFactory = (RenderKitFactory) appMap.putIfAbsent(_RENDER_KIT_FACTORY_KEY, factory); - + if (oldFactory != null) - factory = oldFactory; + factory = oldFactory; } RenderKit renderKit = factory.getRenderKit(context, getDecoratedRenderKitId()); @@ -137,6 +167,6 @@ } abstract protected String getDecoratedRenderKitId(); - private static final String _RENDER_KIT_FACTORY_KEY = + private static final String _RENDER_KIT_FACTORY_KEY = "org.apache.myfaces.trinidadinternal.renderkit.RenderKitDecorator.RENDER_KIT_FACTORY_KEY"; } Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java?rev=891522&r1=891521&r2=891522&view=diff ============================================================================== --- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java (original) +++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/ChartRenderer.java Thu Dec 17 02:33:05 2009 @@ -80,8 +80,6 @@ _maxPrecisionKey = type.findKey("maxPrecision"); } - - /** * @todo Decode the chart drill down event * @@ -166,7 +164,7 @@ @Override protected boolean shouldRenderId( FacesContext context, - UIComponent component) + UIComponent component) { return true; } @@ -176,42 +174,44 @@ */ @Override protected void encodeAll( - FacesContext context, - RenderingContext arc, - UIComponent component, - FacesBean bean) throws IOException + FacesContext context, + RenderingContext rc, + UIComponent component, + FacesBean bean + ) throws IOException { - if (canSkipRendering(context, arc, component)) + if (canSkipRendering(context, rc, component)) return; ResponseWriter rw = context.getResponseWriter(); rw.startElement(XhtmlConstants.DIV_ELEMENT, component); renderId(context, component); - renderStyleAttributes(context, arc, bean, SkinSelectors.AF_CHART_STYLE_CLASS); + renderStyleAttributes(context, rc, component, bean, SkinSelectors.AF_CHART_STYLE_CLASS); // We need the number convertor so that we can format numbers on the client - XhtmlUtils.addLib(context, arc, _NUMBER_CONVERTER_SCRIPTLET); + XhtmlUtils.addLib(context, rc, _NUMBER_CONVERTER_SCRIPTLET); // output the chart javascript library - chartLib.outputScriptlet(context, arc); + chartLib.outputScriptlet(context, rc); // We will render the chart using JavaScript StringWriter sw = new StringWriter(5000); _outputSVGDocumentCreate(context, sw, component, bean); _outputJSChartModel(sw, component); - _outputJSChartObject(context, arc, sw, component, bean); + _outputJSChartObject(context, rc, sw, component, bean); // Output the script to the response rw.startElement(XhtmlConstants.SCRIPT_ELEMENT, null); - renderScriptDeferAttribute(context, arc); - renderScriptTypeAttribute(context, arc); + renderScriptDeferAttribute(context, rc); + renderScriptTypeAttribute(context, rc); rw.write(sw.toString()); rw.endElement(XhtmlConstants.SCRIPT_ELEMENT); rw.endElement(XhtmlConstants.DIV_ELEMENT); } protected void _outputSVGDocumentCreate( - FacesContext context, + FacesContext context, StringWriter sw, - UIComponent component, - FacesBean bean) throws IOException + UIComponent component, + FacesBean bean + ) throws IOException { sw.append("ApacheChart.createSVG(\""); String clientId = component.getClientId(context); @@ -219,7 +219,7 @@ sw.append("\",\"svgChart"); sw.append(clientId); sw.append("\",\""); - String templateURL = getTemplateSource(bean); + String templateURL = getTemplateSource(component, bean); templateURL = context.getExternalContext().encodeResourceURL(templateURL); sw.append(templateURL); sw.append("\",\"width:100%; height:100%;\""); @@ -228,7 +228,8 @@ protected void _outputJSChartModel( StringWriter sw, - UIComponent component) throws IOException + UIComponent component + ) throws IOException { CoreChart chart = (CoreChart)component; ChartModel model = (ChartModel)chart.getValue(); @@ -279,11 +280,12 @@ } protected void _outputJSChartObject( - FacesContext context, - RenderingContext arc, - StringWriter sw, - UIComponent component, - FacesBean bean) throws IOException + FacesContext context, + RenderingContext rc, + StringWriter sw, + UIComponent component, + FacesBean bean + ) throws IOException { Integer type = _typeToJSTypeMap.get(getType(bean)); if(type == null) @@ -298,45 +300,45 @@ sw.append(";\n"); sw.append("var isPerspective = "); - _writeJSObject(sw, isPerspective(bean)); + _writeJSObject(sw, isPerspective(component, bean)); sw.append(";\n"); sw.append("var legendPosition = "); - _writeJSObject(sw, getLegendPosition(bean)); + _writeJSObject(sw, getLegendPosition(component, bean)); sw.append(";\n"); sw.append("var apacheChart = ApacheChart.createChart(type, model, chartId, isPerspective, legendPosition);"); sw.append("apacheChart.setYMajorGridLineCount("); - _writeJSObject(sw, getYMajorGridLineCount (bean)); + _writeJSObject(sw, getYMajorGridLineCount(component, bean)); sw.append(");\n"); sw.append("apacheChart.setYMinorGridLineCount("); - _writeJSObject(sw, getYMinorGridLineCount(bean)); + _writeJSObject(sw, getYMinorGridLineCount(component, bean)); sw.append(");\n"); sw.append("apacheChart.setXMajorGridLineCount("); - _writeJSObject(sw, getXMajorGridLineCount(bean)); + _writeJSObject(sw, getXMajorGridLineCount(component, bean)); sw.append(");\n"); sw.append("apacheChart.setGradientsUsed("); - _writeJSObject(sw, isGradientsUsed(bean)); + _writeJSObject(sw, isGradientsUsed(component, bean)); sw.append(");\n"); sw.append("apacheChart.setAnimationDuration("); - _writeJSObject(sw, getAnimationDuration(bean)); + _writeJSObject(sw, getAnimationDuration(component, bean)); sw.append(");\n"); sw.append("apacheChart.setTooltipsVisible("); - _writeJSObject(sw, isTooltipsVisible(bean)); + _writeJSObject(sw, isTooltipsVisible(component, bean)); sw.append(");\n"); sw.append("apacheChart.setMaxPrecision("); - _writeJSObject(sw, getMaxPrecision(bean)); + _writeJSObject(sw, getMaxPrecision(component, bean)); sw.append(");\n"); String formName; - FormData fData = arc.getFormData(); + FormData fData = rc.getFormData(); if (fData == null) formName = null; else @@ -356,21 +358,21 @@ sw.append(");\n"); } - if(TrinidadAgent.AGENT_IE.equals(arc.getAgent().getAgentName())) + if(TrinidadAgent.AGENT_IE.equals(rc.getAgent().getAgentName())) { sw.append("apacheChart.setErrorHtml("); - _writeJSObject(sw, arc.getTranslatedString("af_chart.IE_SVG_PLUGIN_ERROR_HTML")); + _writeJSObject(sw, rc.getTranslatedString("af_chart.IE_SVG_PLUGIN_ERROR_HTML")); sw.append(");\n"); } else { sw.append("apacheChart.setErrorHtml("); - _writeJSObject(sw, arc.getTranslatedString("af_chart.SVG_ENABLED_BROWSER_ERROR_HTML")); + _writeJSObject(sw, rc.getTranslatedString("af_chart.SVG_ENABLED_BROWSER_ERROR_HTML")); sw.append(");\n"); } sw.append("apacheChart.setStatusHtml("); - _writeJSObject(sw, arc.getTranslatedString("af_chart.SVG_LOADING_STATUS_HTML")); + _writeJSObject(sw, rc.getTranslatedString("af_chart.SVG_LOADING_STATUS_HTML")); sw.append(");\n"); // finally draw the chart @@ -380,7 +382,8 @@ @SuppressWarnings("unchecked") static private void _writeJSObject( StringWriter sw, - Object attrValue) throws IOException + Object attrValue + ) throws IOException { if (attrValue == null) { @@ -425,7 +428,8 @@ */ static private void _writeJSString( StringWriter sw, - String value) throws IOException + String value + ) throws IOException { if (value == null) { @@ -535,7 +539,8 @@ */ static public void _writeJSInt( StringWriter sw, - Integer value) throws IOException + Integer value + ) throws IOException { sw.append(String.valueOf(value)); } @@ -548,7 +553,8 @@ */ static private void _writeJSBoolean( StringWriter sw, - Boolean value) throws IOException + Boolean value + ) throws IOException { sw.append(String.valueOf(value)); } @@ -562,7 +568,8 @@ */ static private void _writeJSDouble( StringWriter sw, - Double value) throws IOException + Double value + ) throws IOException { sw.append(String.valueOf(value)); } @@ -573,7 +580,10 @@ * @param sw the StringWriter * @param color the color value */ - static private void _writeJSColor(StringWriter sw, Color color) throws IOException + static private void _writeJSColor( + StringWriter sw, + Color color + ) throws IOException { sw.append("\"RGB("); sw.append(String.valueOf(color.getRed())); @@ -592,7 +602,8 @@ */ static private void _writeJSCollection( StringWriter sw, - Collection value) throws IOException + Collection value + ) throws IOException { if (value == null) { @@ -618,7 +629,9 @@ } } - private static Object _getProperty(FacesBean bean, PropertyKey key) + private static Object _getProperty( + FacesBean bean, + PropertyKey key) { Object ret = bean.getProperty(key); if (ret==null) @@ -626,18 +639,21 @@ return ret; } - protected String getType(FacesBean bean) + protected String getType( + FacesBean bean) { return toString(_getProperty(bean, _typeKey)); } - protected String getTemplateSource(FacesBean bean) + protected String getTemplateSource( + UIComponent component, + FacesBean bean) { Object ret = bean.getProperty(_templateSourceKey); String uri; if (ret==null) { - if(isGradientsUsed(bean)) + if (isGradientsUsed(component, bean)) uri = _TEMPLATE_DOC; else uri = _TEMPLATE_DOC_NOGRADIENT; @@ -649,47 +665,65 @@ return toResourceUri(FacesContext.getCurrentInstance(), uri); } - protected boolean isPerspective(FacesBean bean) + protected boolean isPerspective( + UIComponent component, + FacesBean bean) { return Boolean.TRUE.equals(_getProperty(bean, _perspectiveKey)); } - protected String getLegendPosition(FacesBean bean) + protected String getLegendPosition( + UIComponent component, + FacesBean bean) { return toString(_getProperty(bean, _legendPositionKey)); } - protected Integer getAnimationDuration(FacesBean bean) + protected Integer getAnimationDuration( + UIComponent component, + FacesBean bean) { return (Integer)_getProperty(bean, _animationDurationKey); } - protected boolean isGradientsUsed(FacesBean bean) + protected boolean isGradientsUsed( + UIComponent component, + FacesBean bean) { return Boolean.TRUE.equals(_getProperty(bean, _gradientsUsedKey)); } - protected boolean isTooltipsVisible(FacesBean bean) + protected boolean isTooltipsVisible( + UIComponent component, + FacesBean bean) { return Boolean.TRUE.equals(_getProperty(bean, _tooltipsVisibleKey)); } - protected Integer getYMajorGridLineCount(FacesBean bean) + protected Integer getYMajorGridLineCount( + UIComponent component, + FacesBean bean) { return (Integer)_getProperty(bean, _YMajorGridLineCountKey); } - protected Integer getXMajorGridLineCount(FacesBean bean) + protected Integer getXMajorGridLineCount( + UIComponent component, + FacesBean bean) { return (Integer)_getProperty(bean, _XMajorGridLineCountKey); } - protected Integer getYMinorGridLineCount(FacesBean bean) + protected Integer getYMinorGridLineCount( + UIComponent component, + FacesBean bean) { return (Integer)_getProperty(bean, _YMinorGridLineCountKey); } - protected Integer getMaxPrecision(FacesBean bean) + protected Integer getMaxPrecision( + UIComponent component, + FacesBean bean) { return (Integer)_getProperty(bean, _maxPrecisionKey); }