From adffaces-commits-return-532-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Tue Aug 01 23:32:03 2006 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 4929 invoked from network); 1 Aug 2006 23:32:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Aug 2006 23:32:03 -0000 Received: (qmail 61827 invoked by uid 500); 1 Aug 2006 23:32:01 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 61778 invoked by uid 500); 1 Aug 2006 23:32:01 -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 61705 invoked by uid 99); 1 Aug 2006 23:32:01 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Aug 2006 16:32:01 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Aug 2006 16:31:57 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D85D71A981A; Tue, 1 Aug 2006 16:31:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r427790 [1/4] - in /incubator/adffaces/branches/matzew-component-renaming/trinidad: trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/ trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trini... Date: Tue, 01 Aug 2006 23:31:33 -0000 To: adffaces-commits@incubator.apache.org From: matzew@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060801233136.D85D71A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: matzew Date: Tue Aug 1 16:31:31 2006 New Revision: 427790 URL: http://svn.apache.org/viewvc?rev=427790&view=rev Log: panelAccording (merge from showOne/showManyAccordion) (just the renaming); faces-major is following Added: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelAccordionTest.java - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowOneAccordionTest.java incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowOneAccordion.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelAccordion.xml - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ShowOneAccordion.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneAccordionRenderer.java incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimal-golden.xml - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimal-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalIE-golden.xml - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimalIE-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalIERtl-golden.xml - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimalIERtl-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalInacc-golden.xml - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimalInacc-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalPPC-golden.xml - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimalPPC-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalSaf-golden.xml - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimalSaf-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimalScrRdr-golden.xml - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimalScrRdr-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelAccordion.xml - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/showOneAccordion.xml Removed: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowManyAccordionTest.java incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowOneAccordionTest.java incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowManyAccordion.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowOneAccordion.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ShowManyAccordion.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ShowOneAccordion.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowManyAccordionRenderer.java incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneAccordionRenderer.java incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showManyAccordion-minimal-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showManyAccordion-minimalIE-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showManyAccordion-minimalIERtl-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showManyAccordion-minimalInacc-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showManyAccordion-minimalPPC-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showManyAccordion-minimalSaf-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showManyAccordion-minimalScrRdr-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimal-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimalIE-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimalIERtl-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimalInacc-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimalPPC-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimalSaf-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimalScrRdr-golden.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/showManyAccordion.xml incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/showOneAccordion.xml Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showManyAccordion.jspx incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneAccordion.jspx incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/renderkit/core/resource/CoreBundle.xrts Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelAccordionTest.java (from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowOneAccordionTest.java) URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelAccordionTest.java?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelAccordionTest.java&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowOneAccordionTest.java&r1=426992&r2=427790&rev=427790&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowOneAccordionTest.java (original) +++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelAccordionTest.java Tue Aug 1 16:31:31 2006 @@ -23,19 +23,19 @@ import org.apache.myfaces.trinidad.component.UIComponentTestCase; /** - * Unit tests for CoreShowOneAccordion + * Unit tests for CorePanelAccordion * * @author Nidhi Shrotriya */ -public class CoreShowOneAccordionTest extends UIComponentTestCase +public class CorePanelAccordionTest extends UIComponentTestCase { /** - * Creates a new CoreShowOneAccordion. + * Creates a new CorePanelAccordion. * * @param testName the unit test name */ - public CoreShowOneAccordionTest(String testName) + public CorePanelAccordionTest(String testName) { super(testName); } @@ -52,7 +52,7 @@ public static Test suite() { - return new TestSuite(CoreShowOneAccordionTest.class); + return new TestSuite(CorePanelAccordionTest.class); } /** @@ -60,7 +60,7 @@ */ public void testInitialAttributeValues() { - CoreShowOneAccordion component = new CoreShowOneAccordion(); + CorePanelAccordion component = new CorePanelAccordion(); assertEquals(true, component.isRendered()); } @@ -69,8 +69,8 @@ */ public void testgetAttributeValues() { - CoreShowOneAccordion component = new CoreShowOneAccordion(); - assertEquals("org.apache.myfaces.trinidad.ShowOne",component.getFamily()); + CorePanelAccordion component = new CorePanelAccordion(); + assertEquals("org.apache.myfaces.trinidad.Panel",component.getFamily()); } /** @@ -81,7 +81,7 @@ */ public void testAttributeTransparency() { - CoreShowOneAccordion component= new CoreShowOneAccordion(); + CorePanelAccordion component= new CorePanelAccordion(); doTestAttributeTransparency(component, "rendered", Boolean.TRUE, Boolean.FALSE); @@ -92,12 +92,12 @@ */ public void testApplyRequestValues() { - CoreShowOneAccordion component= new CoreShowOneAccordion(); + CorePanelAccordion component= new CorePanelAccordion(); doTestApplyRequestValues(component); - component= new CoreShowOneAccordion(); + component= new CorePanelAccordion(); component.setRendered(false); doTestApplyRequestValues(component); - component= new CoreShowOneAccordion(); + component= new CorePanelAccordion(); } /** @@ -105,7 +105,7 @@ */ public void testProcessValidations() { - CoreShowOneAccordion component= new CoreShowOneAccordion(); + CorePanelAccordion component= new CorePanelAccordion(); doTestProcessValidations(component); } @@ -114,7 +114,7 @@ */ public void testUpdateModelValues() { - CoreShowOneAccordion component= new CoreShowOneAccordion(); + CorePanelAccordion component= new CorePanelAccordion(); doTestUpdateModelValues(component); } @@ -123,7 +123,7 @@ */ public void testInvokeApplication() { - CoreShowOneAccordion component= new CoreShowOneAccordion(); + CorePanelAccordion component= new CorePanelAccordion(); doTestInvokeApplication(component, null); } /** @@ -133,7 +133,7 @@ */ public void testRenderResponse() throws IOException { - CoreShowOneAccordion component= new CoreShowOneAccordion(); + CorePanelAccordion component= new CorePanelAccordion(); doTestRenderResponse(component); } } Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml (from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowOneAccordion.xml) URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowOneAccordion.xml&r1=426992&r2=427790&rev=427790&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowOneAccordion.xml (original) +++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelAccordion.xml Tue Aug 1 16:31:31 2006 @@ -20,13 +20,13 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xhtml="http://www.w3.org/1999/xhtml"> - + - /org/apache/myfaces/trinidad/metadata/icons/showOneAccordion.png + /org/apache/myfaces/trinidad/metadata/icons/panelAccordion.png - org.apache.myfaces.trinidad.CoreShowOneAccordion - org.apache.myfaces.trinidad.component.core.layout.CoreShowOneAccordion + org.apache.myfaces.trinidad.CorePanelAccordion + org.apache.myfaces.trinidad.component.core.layout.CorePanelAccordion @@ -40,22 +40,33 @@ false + + + + Indicates whether more than one detail item may be disclosed at a time. Use "false" (the default) to keep a maximum of one detail item disclosed at all times. Use "true" to make it possible for multiple detail items to be disclosed. + + discloseMany + boolean + false + + false + - org.apache.myfaces.trinidad.ShowOne + org.apache.myfaces.trinidad.Panel org.apache.myfaces.trinidad.Accordion - tr:showOneAccordion - org.apache.myfaces.trinidadinternal.taglib.core.layout.CoreShowOneAccordionTag - tr:panelAccordion + org.apache.myfaces.trinidadinternal.taglib.core.layout.CorePanelAccordionTag + - The following is an example of showOneAccordion. - + The following is an example of panelAccordion. + @@ -68,7 +79,7 @@ - ]]> + ]]> Ravi Baranwal @@ -77,7 +88,7 @@ ${md:getTranslatedString("PALETTE_LAYOUT")} tr:showDetailItem - showOnePanel + panelPanel pda phone voice Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelAccordion.xml (from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ShowOneAccordion.xml) URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelAccordion.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelAccordion.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ShowOneAccordion.xml&r1=426992&r2=427790&rev=427790&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ShowOneAccordion.xml (original) +++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelAccordion.xml Tue Aug 1 16:31:31 2006 @@ -19,11 +19,11 @@ org.apache.myfaces.trinidadinternal.core - org.apache.myfaces.trinidad.ShowOne + org.apache.myfaces.trinidad.Panel org.apache.myfaces.trinidad.Accordion - org.apache.myfaces.trinidadinternal.renderkit.html.layout.CoreShowOneAccordionRenderer + org.apache.myfaces.trinidadinternal.renderkit.html.layout.CorePanelAccordionRenderer - org.apache.myfaces.trinidad.CoreShowOneAccordion + org.apache.myfaces.trinidad.CorePanelAccordion pda phone voice Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showManyAccordion.jspx URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showManyAccordion.jspx?rev=427790&r1=427789&r2=427790&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showManyAccordion.jspx (original) +++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showManyAccordion.jspx Tue Aug 1 16:31:31 2006 @@ -21,7 +21,7 @@ xmlns:tr="http://myfaces.apache.org/trinidad" > - + @@ -33,8 +33,8 @@ action="guide"/> - + value="<b> A panelAccordion component - takes default selection among showDetailItem children</b>"/> + @@ -105,7 +105,7 @@ - + - + value="<b>A standard panelAccordion component - Update its properties from the table below </b>"/> + @@ -186,7 +186,7 @@ - + Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneAccordion.jspx URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneAccordion.jspx?rev=427790&r1=427789&r2=427790&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneAccordion.jspx (original) +++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneAccordion.jspx Tue Aug 1 16:31:31 2006 @@ -21,7 +21,7 @@ xmlns:tr="http://myfaces.apache.org/trinidad" > - + @@ -33,8 +33,8 @@ action="guide"/> - + value="<b> A panelAccordion component - takes default selection among showDetailItem children</b>"/> + @@ -105,7 +105,7 @@ - + - + value="<b>A standard panelAccordion component - Update its properties from the table below </b>"/> + @@ -186,7 +186,7 @@ - + Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java (from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneAccordionRenderer.java) URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneAccordionRenderer.java&r1=426992&r2=427790&rev=427790&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneAccordionRenderer.java (original) +++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java Tue Aug 1 16:31:31 2006 @@ -38,12 +38,12 @@ import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase; /** - * Renderer for ShowOneAccordion + * Renderer for PanelAccordion * * @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/renderkit/html/layout/CoreShowOneAccordionRenderer.java#0 $) $Date: 10-nov-2005.19:01:13 $ * @author The Oracle ADF Faces Team */ -public class CoreShowOneAccordionRenderer extends UINodeRendererBase +public class CorePanelAccordionRenderer extends UINodeRendererBase { /** * If nothing is disclosed, makes the first child disclosed. @@ -58,7 +58,7 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOException { - _LOG.finer("Entering CoreShowOneAccordionRenderer.encodeBegin()"); + _LOG.finer("Entering CorePanelAccordionRenderer.encodeBegin()"); List children = component.getChildren(); int numChildren = children.size(); UIComponent disclosedChild = null; @@ -105,7 +105,7 @@ renderableChild.setDisclosed(true); } - _LOG.finer("Exiting CoreShowOneAccordionRenderer.encodeBegin()"); + _LOG.finer("Exiting CorePanelAccordionRenderer.encodeBegin()"); } /** @@ -146,7 +146,7 @@ // This will only render UIXShowDetail children. // Non UIXShowDetail children are ignored. - _LOG.finest("CoreShowOneAccordionRenderer.encodeChildren: compId: {0}", + _LOG.finest("CorePanelAccordionRenderer.encodeChildren: compId: {0}", compId); out.startElement("div", component); @@ -168,7 +168,7 @@ String formName = RenderUtils.getFormId(context, component); - boolean discloseMany = isDiscloseMany(); + boolean discloseMany = _isDiscloseMany(component); boolean discloseNone = _isDiscloseNone(component); boolean disclosedFixed = false; if (discloseMany && !discloseNone) // must keep at least one item disclosed @@ -333,7 +333,7 @@ } } out.endElement("div"); - _LOG.finest("Exited CoreShowOneAccordionRenderer.encodeChildren"); + _LOG.finest("Exited CorePanelAccordionRenderer.encodeChildren"); } /** @@ -353,37 +353,37 @@ String getContainerStyleClass() { - return XhtmlLafConstants.AF_SHOWONEACCORDION_CONTAINER_STYLE_CLASS; + return XhtmlLafConstants.AF_PANELACCORDION_CONTAINER_STYLE_CLASS; } String getContentStyleClass() { - return XhtmlLafConstants.AF_SHOWONEACCORDION_CONTENT_STYLE_CLASS; + return XhtmlLafConstants.AF_PANELACCORDION_CONTENT_STYLE_CLASS; } String getHeaderDisabledStyleClass() { - return XhtmlLafConstants.AF_SHOWONEACCORDION_HEADER_DISABLED_STYLE_CLASS; + return XhtmlLafConstants.AF_PANELACCORDION_HEADER_DISABLED_STYLE_CLASS; } String getHeaderExpanedStyleClass() { - return XhtmlLafConstants.AF_SHOWONEACCORDION_HEADER_EXPANDED_STYLE_CLASS; + return XhtmlLafConstants.AF_PANELACCORDION_HEADER_EXPANDED_STYLE_CLASS; } String getHeaderCollapsedStyleClass() { - return XhtmlLafConstants.AF_SHOWONEACCORDION_HEADER_COLLAPSED_STYLE_CLASS; + return XhtmlLafConstants.AF_PANELACCORDION_HEADER_COLLAPSED_STYLE_CLASS; } String getLinkDisabledStyleClass() { - return XhtmlLafConstants.AF_SHOWONEACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS; + return XhtmlLafConstants.AF_PANELACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS; } String getLinkEnabledStyleClass() { - return XhtmlLafConstants.AF_SHOWONEACCORDION_TITLE_LINK_STYLE_CLASS; + return XhtmlLafConstants.AF_PANELACCORDION_TITLE_LINK_STYLE_CLASS; } String getDisclosedTipKey() @@ -396,11 +396,6 @@ return _UNDISCLOSED_TIP_KEY; } - boolean isDiscloseMany() - { - return false; - } - /** * Encodes the disclosed child. * @@ -445,7 +440,7 @@ * @param rCtx the ADF Faces rendering context object * @param detailItemId Id of the item that will be disclosed * @param formName id of the containing form - * @param compId id of the showOneAccordion component + * @param compId id of the panelAccordion component * @param isImmediate the value of immediate attribute on child component */ private String _getFormSubmitScript(UIComponent component, @@ -516,6 +511,19 @@ return discloseNone; } + private boolean _isDiscloseMany(UIComponent component) + { + Boolean discloseNoneObj = + (Boolean) component.getAttributes().get( + UIConstants.DISCLOSE_MANY_ATTR.getAttributeName()); + boolean discloseNone = false; // default is that at least 1 is disclosed. + if (discloseNoneObj != null) + { + discloseNone = discloseNoneObj.booleanValue(); + } + return discloseNone; + } + private UIXShowDetail _getNextShowDetailChild(ListIterator iter) { UIComponent child = (UIComponent)iter.next(); @@ -534,11 +542,11 @@ private static final TrinidadLogger _LOG = - TrinidadLogger.createTrinidadLogger(CoreShowOneAccordionRenderer.class); + TrinidadLogger.createTrinidadLogger(CorePanelAccordionRenderer.class); private static final String _DISCLOSED_TIP_KEY = - "af_showOneAccordion.DISCLOSED_TIP"; + "af_panelAccordion.DISCLOSED_TIP"; private static final String _UNDISCLOSED_TIP_KEY = - "af_showOneAccordion.UNDISCLOSED_TIP"; + "af_panelAccordion.UNDISCLOSED_TIP"; } Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java?rev=427790&r1=427789&r2=427790&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java (original) +++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java Tue Aug 1 16:31:31 2006 @@ -1516,6 +1516,13 @@ XhtmlLafConstants.AF_SHOWONEACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS, "A.af|showOneAccordion::title-disabled-link"); + _STYLE_KEY_MAP.put( + XhtmlLafConstants.AF_PANELACCORDION_TITLE_LINK_STYLE_CLASS, + "A.af|panelAccordion::title-link"); + _STYLE_KEY_MAP.put( + XhtmlLafConstants.AF_PANELACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS, + "A.af|panelAccordion::title-disabled-link"); + _STYLE_KEY_MAP.put("af|panelTabbed::tab-link", "af|panelTabbed::tab A"); _STYLE_KEY_MAP.put("af|panelTabbed::tab-selected-link", Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java?rev=427790&r1=427789&r2=427790&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java (original) +++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java Tue Aug 1 16:31:31 2006 @@ -103,6 +103,7 @@ public static final AttributeKey READ_ONLY_ATTR = new AttributeKey("readOnly", 12); public static final AttributeKey RENDERED_ATTR = new AttributeKey("rendered", 13); public static final AttributeKey DISCLOSE_NONE_ATTR = new AttributeKey("discloseNone"); + public static final AttributeKey DISCLOSE_MANY_ATTR = new AttributeKey("discloseMany"); public static final AttributeKey DISCLOSED_ATTR = new AttributeKey("disclosed"); public static final AttributeKey USES_UPLOAD_ATTR = new AttributeKey("usesUpload"); public static final AttributeKey DEFAULT_COMMAND_ATTR = new AttributeKey("defaultCommand"); Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java?rev=427790&r1=427789&r2=427790&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java (original) +++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java Tue Aug 1 16:31:31 2006 @@ -825,25 +825,25 @@ // tr:panelAccordion styles public static final String AF_PANELACCORDION_CONTAINER_STYLE_CLASS = - "af|showOneAccordion::container"; + "af|panelAccordion::container"; public static final String AF_PANELACCORDION_HEADER_EXPANDED_STYLE_CLASS = - "af|showOneAccordion::header-expanded"; + "af|panelAccordion::header-expanded"; public static final String AF_PANELACCORDION_HEADER_COLLAPSED_STYLE_CLASS = - "af|showOneAccordion::header-collapsed"; + "af|panelAccordion::header-collapsed"; public static final String AF_PANELACCORDION_HEADER_DISABLED_STYLE_CLASS = - "af|showOneAccordion::header-disabled"; + "af|panelAccordion::header-disabled"; public static final String AF_PANELACCORDION_CONTENT_STYLE_CLASS = - "af|showOneAccordion::content"; + "af|panelAccordion::content"; public static final String AF_PANELACCORDION_TITLE_LINK_STYLE_CLASS = - "af|showOneAccordion::title-link"; + "af|panelAccordion::title-link"; public static final String AF_PANELACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS = - "af|showOneAccordion::title-disabled-link"; + "af|panelAccordion::title-disabled-link"; // =============PROPERTY NAMES================ Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/renderkit/core/resource/CoreBundle.xrts URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/renderkit/core/resource/CoreBundle.xrts?rev=427790&r1=427789&r2=427790&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/renderkit/core/resource/CoreBundle.xrts (original) +++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/renderkit/core/resource/CoreBundle.xrts Tue Aug 1 16:31:31 2006 @@ -279,6 +279,10 @@ Shown information Select to show information + + Shown information + Select to show information + Move selected items to top of list Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimal-golden.xml (from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimal-golden.xml) URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimal-golden.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimal-golden.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimal-golden.xml&r1=426992&r2=427790&rev=427790&view=diff ============================================================================== --- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneAccordion-minimal-golden.xml (original) +++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelAccordion-minimal-golden.xml Tue Aug 1 16:31:31 2006 @@ -1,16 +1,16 @@