You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/07/30 03:57:13 UTC
svn commit: r426862 - 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/trinidad/co...
Author: matzew
Date: Sat Jul 29 20:57:11 2006
New Revision: 426862
URL: http://svn.apache.org/viewvc?rev=426862&view=rev
Log:
panelChoice + fixing wrong headlines in demo
Added:
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelChoiceTest.java
- copied, changed from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowOneChoiceTest.java
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml
- copied, changed from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowOneChoice.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelChoice.xml
- copied, changed from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ShowOneChoice.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/panelChoice.jspx
- copied, changed from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneChoice.jspx
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelChoiceRenderer.java
- copied, changed from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelChoice-minimal-golden.xml
- copied unchanged from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimal-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelChoice-minimalIE-golden.xml
- copied unchanged from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimalIE-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelChoice-minimalIERtl-golden.xml
- copied unchanged from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimalIERtl-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelChoice-minimalInacc-golden.xml
- copied unchanged from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimalInacc-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelChoice-minimalPPC-golden.xml
- copied unchanged from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimalPPC-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelChoice-minimalSaf-golden.xml
- copied unchanged from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimalSaf-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelChoice-minimalScrRdr-golden.xml
- copied unchanged from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimalScrRdr-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelChoice.xml
- copied, changed from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/showOneChoice.xml
Removed:
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowOneChoiceTest.java
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowOneChoice.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ShowOneChoice.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneChoice.jspx
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimal-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimalIE-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimalIERtl-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimalInacc-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimalPPC-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimalSaf-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/showOneChoice-minimalScrRdr-golden.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/showOneChoice.xml
Modified:
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/image.jspx
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/inputColor.jspx
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/inputDate.jspx
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/media.jspx
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/spacer.jspx
incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/conf/uix-renderer-properties.base
Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelChoiceTest.java (from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowOneChoiceTest.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/CorePanelChoiceTest.java?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelChoiceTest.java&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowOneChoiceTest.java&r1=426858&r2=426862&rev=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CoreShowOneChoiceTest.java (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/CorePanelChoiceTest.java Sat Jul 29 20:57:11 2006
@@ -23,20 +23,20 @@
import org.apache.myfaces.trinidad.component.UIComponentTestCase;
/**
- * Unit tests for CoreShowOneChoice
+ * Unit tests for CorePanelChoice
*
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-api/src/test/java/oracle/adf/view/faces/component/core/layout/CoreShowOneChoiceTest.java#1 $) $Date: 16-aug-2005.15:12:21 $
* @author Nidhi Shrotriya
*/
-public class CoreShowOneChoiceTest extends UIComponentTestCase
+public class CorePanelChoiceTest extends UIComponentTestCase
{
/**
- * Creates a new CoreShowOneChoice.
+ * Creates a new CorePanelChoice.
*
* @param testName the unit test name
*/
- public CoreShowOneChoiceTest(String testName)
+ public CorePanelChoiceTest(String testName)
{
super(testName);
}
@@ -53,7 +53,7 @@
public static Test suite()
{
- return new TestSuite(CoreShowOneChoiceTest.class);
+ return new TestSuite(CorePanelChoiceTest.class);
}
/**
@@ -61,7 +61,7 @@
*/
public void testInitialAttributeValues()
{
- CoreShowOneChoice component = new CoreShowOneChoice();
+ CorePanelChoice component = new CorePanelChoice();
assertEquals(true, component.isRendered());
assertNull(component.getLabel());
assertEquals("start",component.getPosition());
@@ -73,7 +73,7 @@
*/
public void testgetAttributeValues()
{
- CoreShowOneChoice component = new CoreShowOneChoice();
+ CorePanelChoice component = new CorePanelChoice();
assertEquals("org.apache.myfaces.trinidad.ShowOne",component.getFamily());
}
@@ -84,7 +84,7 @@
*/
public void testAttributeTransparency()
{
- CoreShowOneChoice component= new CoreShowOneChoice();
+ CorePanelChoice component= new CorePanelChoice();
doTestAttributeTransparency(component, "rendered",
Boolean.TRUE, Boolean.FALSE);
doTestAttributeTransparency(component, "label", "foo", "bar");
@@ -97,9 +97,9 @@
*/
public void testApplyRequestValues()
{
- CoreShowOneChoice component= new CoreShowOneChoice();
+ CorePanelChoice component= new CorePanelChoice();
doTestApplyRequestValues(component);
- component= new CoreShowOneChoice();
+ component= new CorePanelChoice();
component.setRendered(false);
doTestApplyRequestValues(component);
}
@@ -109,7 +109,7 @@
*/
public void testProcessValidations()
{
- CoreShowOneChoice component= new CoreShowOneChoice();
+ CorePanelChoice component= new CorePanelChoice();
doTestProcessValidations(component);
}
@@ -118,7 +118,7 @@
*/
public void testUpdateModelValues()
{
- CoreShowOneChoice component= new CoreShowOneChoice();
+ CorePanelChoice component= new CorePanelChoice();
doTestUpdateModelValues(component);
}
@@ -127,7 +127,7 @@
*/
public void testInvokeApplication()
{
- CoreShowOneChoice component= new CoreShowOneChoice();
+ CorePanelChoice component= new CorePanelChoice();
doTestInvokeApplication(component, null);
}
@@ -138,7 +138,7 @@
*/
public void testRenderResponse() throws IOException
{
- CoreShowOneChoice component= new CoreShowOneChoice();
+ CorePanelChoice component= new CorePanelChoice();
doTestRenderResponse(component);
}
Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml (from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowOneChoice.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/CorePanelChoice.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowOneChoice.xml&r1=426858&r2=426862&rev=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreShowOneChoice.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml Sat Jul 29 20:57:11 2006
@@ -20,13 +20,13 @@
xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
xmlns:xhtml="http://www.w3.org/1999/xhtml">
<component>
- <description><![CDATA[The showOneChoice control creates, contains and shows a series of items defined by showDetailItem nodes.]]>
+ <description><![CDATA[The panelChoice control creates, contains and shows a series of items defined by showDetailItem nodes.]]>
</description>
<icon>
- <small-icon>/org/apache/myfaces/trinidad/metadata/icons/showOneChoice.png</small-icon>
+ <small-icon>/org/apache/myfaces/trinidad/metadata/icons/panelChoice.png</small-icon>
</icon>
- <component-type>org.apache.myfaces.trinidad.CoreShowOneChoice</component-type>
- <component-class>org.apache.myfaces.trinidad.component.core.layout.CoreShowOneChoice</component-class>
+ <component-type>org.apache.myfaces.trinidad.CorePanelChoice</component-type>
+ <component-class>org.apache.myfaces.trinidad.component.core.layout.CorePanelChoice</component-class>
<property>
<description><![CDATA[the user-visible text of the item]]></description>
<property-name>label</property-name>
@@ -253,17 +253,17 @@
<component-extension>
<mfp:component-supertype>org.apache.myfaces.trinidad.ShowOne</mfp:component-supertype>
<mfp:renderer-type>org.apache.myfaces.trinidad.Choice</mfp:renderer-type>
- <mfp:tag-name>tr:showOneChoice</mfp:tag-name>
- <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.layout.CoreShowOneChoiceTag</mfp:tag-class>
- <mfp:long-description><![CDATA[The showOneChoice control can be used to display a group of contents belonging to a showDetailItem.
+ <mfp:tag-name>tr:panelChoice</mfp:tag-name>
+ <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.layout.CorePanelChoiceTag</mfp:tag-class>
+ <mfp:long-description><![CDATA[The panelChoice control can be used to display a group of contents belonging to a showDetailItem.
A choice control with each individual option representing a showDetailItem child is displayed.
An option within choice control corresponding to showDetailItem that is disclosed is shown as
selected and contents of selected showDetailItem is displayed. If none of the showDetailItem
children are selected, the first showDetailItem that is enabled is considered to be selected.]]>
</mfp:long-description>
<mfp:example>
- <xhtml:p>The following is an example of showOneChoice.</xhtml:p>
- <mfp:source-code><![CDATA[<tr:showOneChoice labelAndAccessKey="Current &Bug Status" position="top" alignment="end">
+ <xhtml:p>The following is an example of panelChoice.</xhtml:p>
+ <mfp:source-code><![CDATA[<tr:panelChoice labelAndAccessKey="Current &Bug Status" position="top" alignment="end">
<tr:showDetailItem text="10.1.3">
<tr:panelHeader text="10.1.3 Open Bugs"/>
</tr:showDetailItem>
@@ -273,7 +273,7 @@
<tr:showDetailItem text="Untriaged Bugs">
<tr:panelHeader text="Untriaged Bugs per component"/>
</tr:showDetailItem>
- </tr:showOneChoice>]]>
+ </tr:panelChoice>]]>
</mfp:source-code>
</mfp:example>
<mfp:author>Ravi Baranwal</mfp:author>
@@ -282,7 +282,7 @@
<mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
<mfp:preferred-children>tr:showDetailItem</mfp:preferred-children>
</mfp:component-metadata>
- <mfp:uix2-local-name>showOneChoice</mfp:uix2-local-name>
+ <mfp:uix2-local-name>panelChoice</mfp:uix2-local-name>
<mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</component-extension>
</component>
Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelChoice.xml (from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ShowOneChoice.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/PanelChoice.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelChoice.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ShowOneChoice.xml&r1=426858&r2=426862&rev=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ShowOneChoice.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/PanelChoice.xml Sat Jul 29 20:57:11 2006
@@ -21,9 +21,9 @@
<renderer>
<component-family>org.apache.myfaces.trinidad.ShowOne</component-family>
<renderer-type>org.apache.myfaces.trinidad.Choice</renderer-type>
- <renderer-class>org.apache.myfaces.trinidadinternal.renderkit.html.layout.CoreShowOneChoiceRenderer</renderer-class>
+ <renderer-class>org.apache.myfaces.trinidadinternal.renderkit.html.layout.CorePanelChoiceRenderer</renderer-class>
<renderer-extension>
- <mfp:component-type>org.apache.myfaces.trinidad.CoreShowOneChoice</mfp:component-type>
+ <mfp:component-type>org.apache.myfaces.trinidad.CorePanelChoice</mfp:component-type>
<mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</renderer-extension>
</renderer>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=426862&r1=426861&r2=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml Sat Jul 29 20:57:11 2006
@@ -820,7 +820,7 @@
<value>showDetailItem.jspx</value>
<value>showManyAccordion.jspx</value>
<value>showOneAccordion.jspx</value>
- <value>showOneChoice.jspx</value>
+ <value>panelChoice.jspx</value>
<value>showOneRadio.jspx</value>
<value>showOneTab.jspx</value>
<value>singleStepButtonBar.jspx</value>
@@ -2413,8 +2413,8 @@
</navigation-case>
<navigation-case>
- <from-outcome>guide.showOneChoice</from-outcome>
- <to-view-id>/components/showOneChoice.jspx</to-view-id>
+ <from-outcome>guide.panelChoice</from-outcome>
+ <to-view-id>/components/panelChoice.jspx</to-view-id>
<redirect/>
</navigation-case>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/image.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/image.jspx?rev=426862&r1=426861&r2=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/image.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/image.jspx Sat Jul 29 20:57:11 2006
@@ -21,7 +21,7 @@
xmlns:tr="http://myfaces.apache.org/trinidad">
<jsp:directive.page contentType="text/html;charset=utf-8"/>
<f:view>
- <tr:document title="ObjectImage Demo">
+ <tr:document title="Image Demo">
<tr:form>
<tr:panelGroup layout="vertical">
<f:facet name="separator">
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/inputColor.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/inputColor.jspx?rev=426862&r1=426861&r2=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/inputColor.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/inputColor.jspx Sat Jul 29 20:57:11 2006
@@ -19,7 +19,7 @@
xmlns:tr="http://myfaces.apache.org/trinidad" >
<jsp:directive.page contentType="text/html;charset=utf-8"/>
<f:view>
- <tr:document title="SelectInputColor Demo">
+ <tr:document title="InputColor Demo">
<tr:form>
<tr:panelGroup layout="vertical">
<f:facet name="separator">
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/inputDate.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/inputDate.jspx?rev=426862&r1=426861&r2=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/inputDate.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/inputDate.jspx Sat Jul 29 20:57:11 2006
@@ -19,7 +19,7 @@
xmlns:tr="http://myfaces.apache.org/trinidad" >
<jsp:directive.page contentType="text/html;charset=utf-8"/>
<f:view>
- <tr:document title="SelectInputDate Demo">
+ <tr:document title="InputDate Demo">
<tr:form>
<tr:commandLink immediate="true" text="Component Guide"
action="guide"/>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/media.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/media.jspx?rev=426862&r1=426861&r2=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/media.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/media.jspx Sat Jul 29 20:57:11 2006
@@ -21,7 +21,7 @@
xmlns:tr="http://myfaces.apache.org/trinidad" >
<jsp:directive.page contentType="text/html;charset=utf-8"/>
<f:view>
- <tr:document title="ObjectMedia Demo">
+ <tr:document title="Media Demo">
<tr:form>
<tr:panelGroup layout="vertical">
<f:facet name="separator">
Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/panelChoice.jspx (from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneChoice.jspx)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/panelChoice.jspx?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/panelChoice.jspx&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneChoice.jspx&r1=426858&r2=426862&rev=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/showOneChoice.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/panelChoice.jspx Sat Jul 29 20:57:11 2006
@@ -21,7 +21,7 @@
xmlns:tr="http://myfaces.apache.org/trinidad" >
<jsp:directive.page contentType="text/html;charset=utf-8"/>
<f:view>
- <tr:document title="showOneChoice Demo">
+ <tr:document title="panelChoice Demo">
<tr:form>
<tr:panelGroup layout="vertical">
@@ -35,7 +35,7 @@
<tr:outputFormatted styleUsage="instruction"
value="<b> A showOneChoice component - takes default selection among showDetailItem children</b>"/>
- <tr:showOneChoice binding="#{editor.component}"
+ <tr:panelChoice binding="#{editor.component}"
alignment="center"
position="start"
id="someId"
@@ -87,7 +87,7 @@
</tr:panelHeader>
</tr:showDetailItem>
- </tr:showOneChoice>
+ </tr:panelChoice>
<tr:outputFormatted styleUsage="instruction"
value="<b>A standard showOneChoice component - Update its properties from the table below </b>"/>
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/spacer.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/spacer.jspx?rev=426862&r1=426861&r2=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/spacer.jspx (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/spacer.jspx Sat Jul 29 20:57:11 2006
@@ -21,7 +21,7 @@
xmlns:tr="http://myfaces.apache.org/trinidad" >
<jsp:directive.page contentType="text/html;charset=utf-8"/>
<f:view>
- <tr:document title="ObjectSpacer Demo">
+ <tr:document title="Spacer Demo">
<tr:form >
<tr:panelGroup layout="vertical">
<f:facet name="separator">
Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/conf/uix-renderer-properties.base
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/conf/uix-renderer-properties.base?rev=426862&r1=426861&r2=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/conf/uix-renderer-properties.base (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/conf/uix-renderer-properties.base Sat Jul 29 20:57:11 2006
@@ -43,7 +43,7 @@
org.apache.myfaces.trinidad.Subform|*=org.apache.myfaces.trinidadinternal.renderkit.uix.SubformRenderer
org.apache.myfaces.trinidad.ShowOne|org.apache.myfaces.trinidad.Tab=org.apache.myfaces.trinidadinternal.renderkit.uix.ShowOneTabRenderer
org.apache.myfaces.trinidad.ShowOne|org.apache.myfaces.trinidad.Radio=org.apache.myfaces.trinidadinternal.renderkit.html.layout.CoreShowOneRadioRenderer
-org.apache.myfaces.trinidad.ShowOne|org.apache.myfaces.trinidad.Choice=org.apache.myfaces.trinidadinternal.renderkit.html.layout.CoreShowOneChoiceRenderer
+org.apache.myfaces.trinidad.ShowOne|org.apache.myfaces.trinidad.Choice=org.apache.myfaces.trinidadinternal.renderkit.html.layout.CorePanelChoiceRenderer
org.apache.myfaces.trinidad.ShowOne|org.apache.myfaces.trinidad.Panel=org.apache.myfaces.trinidadinternal.renderkit.html.layout.CoreShowOnePanelRenderer
org.apache.myfaces.trinidad.Messages|org.apache.myfaces.trinidad.Messages=org.apache.myfaces.trinidadinternal.renderkit.uix.MessageBoxRenderer
org.apache.myfaces.trinidad.SingleStep|org.apache.myfaces.trinidad.ButtonBar=org.apache.myfaces.trinidadinternal.renderkit.uix.SingleStepRenderer
Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelChoiceRenderer.java (from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.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/CorePanelChoiceRenderer.java?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelChoiceRenderer.java&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java&r1=426858&r2=426862&rev=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelChoiceRenderer.java Sat Jul 29 20:57:11 2006
@@ -40,7 +40,7 @@
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/renderkit/html/layout/CoreShowOneChoiceRenderer.java#0 $) $Date: 10-nov-2005.19:00:41 $
* @author The Oracle ADF Faces Team
*/
-public class CoreShowOneChoiceRenderer extends ShowOneListRendererBase
+public class CorePanelChoiceRenderer extends ShowOneListRendererBase
{
/**
* {@inheritDoc}
Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelChoice.xml (from r426858, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/showOneChoice.xml)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelChoice.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelChoice.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/showOneChoice.xml&r1=426858&r2=426862&rev=426862&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/showOneChoice.xml (original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelChoice.xml Sat Jul 29 20:57:11 2006
@@ -1,6 +1,6 @@
<test xmlns="http://myfaces.apache.org/trinidad/test"
xmlns:tr="http://myfaces.apache.org/trinidad">
- <base-component tr:type="org.apache.myfaces.trinidad.CoreShowOneChoice">
+ <base-component tr:type="org.apache.myfaces.trinidad.CorePanelChoice">
<component tr:type="org.apache.myfaces.trinidad.CoreShowDetailItem" text="1">
</component>