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 aw...@apache.org on 2006/10/11 23:30:01 UTC
svn commit: r463063 [1/14] - in /incubator/adffaces/trunk/trinidad:
trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/
trinidad-impl/src/main/ja...
Author: awiner
Date: Wed Oct 11 16:29:53 2006
New Revision: 463063
URL: http://svn.apache.org/viewvc?view=rev&rev=463063
Log:
Introduce Faces-major renderers for goButton and commandButton.
A number of skinning changes happen with this checkin:
- A getDefaultStyleClass(FacesBean) API has been added to XhtmlRenderer.
- goButton and commandButton now use proper af|goButton and af|commandButton selectors,
not just OraLink!
- disabled state happens with a disabled state selector, not OraLinkDisabled
- user-specified styles get properly prepended, instead of replacing the base selector
A new feature: virtual targetFrame names, like _new, _parent, _top, _blank, and _self all now work on goButton.
Added:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java
Removed:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/uinode/
Modified:
incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/CommandButton.xml
incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/GoButton.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SeparatorRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandLink-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goButton-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/goLink-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelButtonBar-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyCheckbox-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListBox-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListBox-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListBox-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListBox-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListBox-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListBox-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListBox-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyListbox-simple-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneChoice-simple-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneListbox-simple-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-simple-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-simple-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-simple-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-simple-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-simple-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-simple-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOneRadio-simple-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalScrRdr-golden.xml
Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/CommandButton.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/CommandButton.xml?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/CommandButton.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/CommandButton.xml Wed Oct 11 16:29:53 2006
@@ -21,7 +21,7 @@
<renderer>
<component-family>org.apache.myfaces.trinidad.Command</component-family>
<renderer-type>org.apache.myfaces.trinidad.Button</renderer-type>
- <renderer-class>org.apache.myfaces.trinidadinternal.renderkit.uix.CommandRenderer</renderer-class>
+ <renderer-class>org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.CommandButtonRenderer</renderer-class>
<renderer-extension>
<mfp:component-type>org.apache.myfaces.trinidad.CoreCommandButton</mfp:component-type>
</renderer-extension>
Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/GoButton.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/GoButton.xml?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/GoButton.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/GoButton.xml Wed Oct 11 16:29:53 2006
@@ -21,7 +21,7 @@
<renderer>
<component-family>org.apache.myfaces.trinidad.Go</component-family>
<renderer-type>org.apache.myfaces.trinidad.Button</renderer-type>
- <renderer-class>org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase</renderer-class>
+ <renderer-class>org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.GoButtonRenderer</renderer-class>
<renderer-extension>
<mfp:component-type>org.apache.myfaces.trinidad.CoreGoButton</mfp:component-type>
</renderer-extension>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Wed Oct 11 16:29:53 2006
@@ -839,7 +839,7 @@
// because "root"'s child List is being mutated as the List
// is traversed.
List<UIComponent> temp = new ArrayList<UIComponent>(root.getChildCount());
- temp.addAll(root.getChildren());
+ temp.addAll(((List<UIComponent>) root.getChildren()));
newRoot.getChildren().addAll(temp);
return newRoot;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderUtils.java Wed Oct 11 16:29:53 2006
@@ -24,7 +24,7 @@
* Stub for temporary backwards compatibility.
*
* @author The Oracle ADF Faces Team
- * @deprecated
+ * @deprecated use public API
*/
public class RenderUtils
{
Added: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java?view=auto&rev=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java (added)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java Wed Oct 11 16:29:53 2006
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2005,2006 The Apache Software Foundation.
+ *
+ * Licensed 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
+
+import java.io.IOException;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.apache.myfaces.trinidad.bean.FacesBean;
+import org.apache.myfaces.trinidad.bean.PropertyKey;
+import org.apache.myfaces.trinidad.component.core.nav.CoreCommandButton;
+import org.apache.myfaces.trinidad.context.RenderingContext;
+
+public class CommandButtonRenderer extends CommandLinkRenderer
+{
+ public CommandButtonRenderer()
+ {
+ this(CoreCommandButton.TYPE);
+ }
+
+ protected CommandButtonRenderer(FacesBean.Type type)
+ {
+ super(type);
+ }
+
+
+ @Override
+ public boolean getRendersChildren()
+ {
+ return true;
+ }
+
+ @Override
+ protected void encodeAll(
+ FacesContext context,
+ RenderingContext arc,
+ UIComponent component,
+ FacesBean bean) throws IOException
+ {
+ if (getPartialSubmit(bean))
+ {
+ AutoSubmitUtils.writeDependencies(context, arc);
+ }
+
+ String clientId = component.getClientId(context);
+ // Make sure we don't have anything to save
+ assert(arc.getCurrentClientId() == null);
+ arc.setCurrentClientId(clientId);
+
+ boolean useButtonTag = useButtonTags(arc);
+ String element = useButtonTag ? "button" : "input";
+ ResponseWriter rw = context.getResponseWriter();
+ rw.startElement(element, component);
+ renderId(context, component);
+ rw.writeAttribute("type", useButtonTag ? "button" : "submit", null);
+ if (getDisabled(bean))
+ {
+ rw.writeAttribute("disabled", Boolean.TRUE, "disabled");
+ // Skip over event attributes when disabled
+ renderStyleAttributes(context, arc, bean);
+ }
+ else
+ {
+ renderAllAttributes(context, arc, bean);
+ }
+
+ // Write the text and access key
+ String text = getText(bean);
+ char accessKey;
+ if (supportsAccessKeys(arc))
+ {
+ accessKey = getAccessKey(bean);
+ if (accessKey != CHAR_UNDEFINED)
+ {
+ rw.writeAttribute("accesskey",
+ new Character(accessKey),
+ "accessKey");
+ }
+ }
+ else
+ {
+ accessKey = CHAR_UNDEFINED;
+ }
+
+ if (useButtonTag)
+ {
+ AccessKeyUtils.renderAccessKeyText(context,
+ getText(bean),
+ accessKey,
+ SkinSelectors.AF_ACCESSKEY_STYLE_CLASS);
+ }
+ else
+ {
+ rw.writeAttribute("value", text, "text");
+ }
+
+ rw.endElement(element);
+ }
+
+
+ protected boolean useButtonTags(RenderingContext arc)
+ {
+ return (supportsScripting(arc) &&
+ supportsAdvancedForms(arc) &&
+ supportsIntrinsicEvents(arc));
+
+ }
+
+ /**
+ * Override to return any state-based (selected, disabled, etc.)
+ * CSS style markers. HINT: use an immutable, cached List<String>
+ * for better performance.
+ */
+ protected List<String> getStateStyleClasses(
+ FacesContext context,
+ RenderingContext arc,
+ FacesBean bean)
+ {
+ if (getDisabled(bean))
+ return _DISABLED_STATE_LIST;
+ return null;
+ }
+
+ // FIXME: move this implementation to XhtmlRenderer
+ protected void renderStyleAttributes(
+ FacesContext context,
+ RenderingContext arc,
+ FacesBean bean,
+ String defaultStyleClass) throws IOException
+ {
+ String styleClass = getStyleClass(bean);
+ String inlineStyle = getInlineStyle(bean);
+ List<String> stateStyleClasses = getStateStyleClasses(context, arc, bean);
+
+ if ((styleClass==null) &&
+ (defaultStyleClass != null) &&
+ (stateStyleClasses == null))
+ {
+ renderStyleClass(context, arc, defaultStyleClass);
+ }
+ else
+ {
+ int numStates = ((stateStyleClasses != null) ?
+ stateStyleClasses.size() : 0);
+ int numClasses = ((styleClass != null) ? 1 : 0) +
+ ((defaultStyleClass != null) ? 1 : 0) +
+ numStates;
+ if (numClasses > 0)
+ {
+ // set all the styleClasses in one array so we can pass it to
+ // renderStyleClasses
+ String[] styleClasses = new String[numClasses];
+
+ int i=0;
+ if (styleClass != null)
+ styleClasses[i++] = styleClass;
+ if (defaultStyleClass != null)
+ styleClasses[i++] = defaultStyleClass;
+
+ for (int j=0; j < numStates; j++, i++)
+ {
+ styleClasses[i] = stateStyleClasses.get(j);
+ }
+
+ renderStyleClasses(context, arc, styleClasses);
+ }
+ }
+
+ String style = getInlineStyle(bean);
+ if (style != null)
+ {
+ context.getResponseWriter().writeAttribute("style",
+ style,
+ "inlineStyle");
+ }
+ }
+
+ protected String getDefaultStyleClass(FacesBean bean)
+ {
+ return SkinSelectors.AF_COMMAND_BUTTON_STYLE_CLASS;
+ }
+
+ static private final List<String> _DISABLED_STATE_LIST =
+ Collections.singletonList(SkinSelectors.STATE_DISABLED);
+}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java Wed Oct 11 16:29:53 2006
@@ -36,7 +36,12 @@
{
public CommandLinkRenderer()
{
- super(CoreCommandLink.TYPE);
+ this(CoreCommandLink.TYPE);
+ }
+
+ protected CommandLinkRenderer(FacesBean.Type type)
+ {
+ super(type);
}
@Override
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormElementRenderer.java Wed Oct 11 16:29:53 2006
@@ -241,10 +241,11 @@
return SkinSelectors.AF_FIELD_TEXT_STYLE_CLASS;
}
+ /* FIXME: this method is never called
protected String getDefaultDisabledStyleClass(FacesBean bean)
{
return SkinSelectors.AF_FIELD_TEXT_DISABLED_STYLE_CLASS;
- }
+ }*/
/**
* Tells whether or not the autoSubmit attribute is set on the bean
Added: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java?view=auto&rev=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java (added)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoButtonRenderer.java Wed Oct 11 16:29:53 2006
@@ -0,0 +1,284 @@
+/*
+ * Copyright 2005,2006 The Apache Software Foundation.
+ *
+ * Licensed 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
+
+import java.io.IOException;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.apache.myfaces.trinidad.bean.FacesBean;
+import org.apache.myfaces.trinidad.bean.PropertyKey;
+import org.apache.myfaces.trinidad.component.core.nav.CoreGoButton;
+import org.apache.myfaces.trinidad.context.RenderingContext;
+
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
+
+/**
+ * FIXME: the inheritance hierarchy is a bit annoying: should
+ * we extend CommandButtonRenderer or GoLinkRenderer? Either
+ * way, there's a fair bit of duplicated code
+ */
+public class GoButtonRenderer extends GoLinkRenderer
+{
+ public GoButtonRenderer()
+ {
+ this(CoreGoButton.TYPE);
+ }
+
+ protected GoButtonRenderer(FacesBean.Type type)
+ {
+ super(type);
+ }
+
+
+ @Override
+ public boolean getRendersChildren()
+ {
+ return true;
+ }
+
+ @Override
+ protected void encodeAll(
+ FacesContext context,
+ RenderingContext arc,
+ UIComponent component,
+ FacesBean bean) throws IOException
+ {
+ String clientId = component.getClientId(context);
+ // Make sure we don't have anything to save
+ assert(arc.getCurrentClientId() == null);
+ arc.setCurrentClientId(clientId);
+
+ boolean useButtonTag = useButtonTags(arc);
+ String element = useButtonTag ? "button" : "a";
+ ResponseWriter rw = context.getResponseWriter();
+ rw.startElement(element, component);
+ renderId(context, component);
+ boolean disabled = getDisabled(bean);
+ if (useButtonTag)
+ {
+ rw.writeAttribute("type", "button", null);
+ if (disabled)
+ rw.writeAttribute("disabled", Boolean.TRUE, "disabled");
+ }
+ else
+ {
+ renderEncodedActionURI(context, "href", getDestination(bean));
+ }
+
+ if (disabled || !supportsNavigation(arc))
+ {
+ // Skip over event attributes when disabled
+ renderStyleAttributes(context, arc, bean);
+ }
+ else
+ {
+ renderAllAttributes(context, arc, bean);
+ if (useButtonTag)
+ {
+ rw.writeAttribute("onclick", getButtonOnclick(bean), null);
+ }
+ else
+ {
+ renderEncodedActionURI(context, "href", getDestination(bean));
+ if (!Boolean.FALSE.equals(arc.getAgent().getCapabilities().get(
+ TrinidadAgent.CAP_TARGET)))
+ {
+ rw.writeAttribute("target", getTargetFrame(bean), null);
+ }
+ }
+ }
+
+ // Write the text and access key
+ String text = getText(bean);
+ char accessKey;
+ if (supportsAccessKeys(arc))
+ {
+ accessKey = getAccessKey(bean);
+ if (accessKey != CHAR_UNDEFINED)
+ {
+ rw.writeAttribute("accesskey",
+ new Character(accessKey),
+ "accessKey");
+ }
+ }
+ else
+ {
+ accessKey = CHAR_UNDEFINED;
+ }
+
+ AccessKeyUtils.renderAccessKeyText(context,
+ getText(bean),
+ accessKey,
+ SkinSelectors.AF_ACCESSKEY_STYLE_CLASS);
+
+ rw.endElement(element);
+ }
+
+
+ protected boolean useButtonTags(RenderingContext arc)
+ {
+ return (supportsScripting(arc) &&
+ supportsAdvancedForms(arc) &&
+ supportsIntrinsicEvents(arc));
+
+ }
+
+ /**
+ * Override to return any state-based (selected, disabled, etc.)
+ * CSS style markers. HINT: use an immutable, cached List<String>
+ * for better performance.
+ */
+ protected List<String> getStateStyleClasses(
+ FacesContext context,
+ RenderingContext arc,
+ FacesBean bean)
+ {
+ if (getDisabled(bean))
+ return _DISABLED_STATE_LIST;
+ return null;
+ }
+
+ // FIXME: move this implementation to XhtmlRenderer
+ protected void renderStyleAttributes(
+ FacesContext context,
+ RenderingContext arc,
+ FacesBean bean,
+ String defaultStyleClass) throws IOException
+ {
+ String styleClass = getStyleClass(bean);
+ String inlineStyle = getInlineStyle(bean);
+ List<String> stateStyleClasses = getStateStyleClasses(context, arc, bean);
+
+ if ((styleClass==null) &&
+ (defaultStyleClass != null) &&
+ (stateStyleClasses == null))
+ {
+ renderStyleClass(context, arc, defaultStyleClass);
+ }
+ else
+ {
+ int numStates = ((stateStyleClasses != null) ?
+ stateStyleClasses.size() : 0);
+ int numClasses = ((styleClass != null) ? 1 : 0) +
+ ((defaultStyleClass != null) ? 1 : 0) +
+ numStates;
+ if (numClasses > 0)
+ {
+ // set all the styleClasses in one array so we can pass it to
+ // renderStyleClasses
+ String[] styleClasses = new String[numClasses];
+
+ int i=0;
+ if (styleClass != null)
+ styleClasses[i++] = styleClass;
+ if (defaultStyleClass != null)
+ styleClasses[i++] = defaultStyleClass;
+
+ for (int j=0; j < numStates; j++, i++)
+ {
+ styleClasses[i] = stateStyleClasses.get(j);
+ }
+
+ renderStyleClasses(context, arc, styleClasses);
+ }
+ }
+
+ String style = getInlineStyle(bean);
+ if (style != null)
+ {
+ context.getResponseWriter().writeAttribute("style",
+ style,
+ "inlineStyle");
+ }
+ }
+
+ @Override
+ protected String getOnclick(FacesBean bean)
+ {
+ return null;
+ }
+
+ protected String getButtonOnclick(FacesBean bean)
+ {
+ String base = super.getOnclick(bean);
+ String destination = getDestination(bean);
+ if (destination == null)
+ return base;
+
+ destination = FacesContext.getCurrentInstance().
+ getExternalContext().encodeActionURL(destination);
+ String onclickJS = null;
+
+ if ((destination.length()) > 11 &&
+ "javascript:".equalsIgnoreCase(destination.substring(0,11)))
+ {
+ onclickJS = destination.substring(11);
+ }
+ else
+ {
+ // Escape the destination in case there's any quotes
+ destination = destination.replace("'", "\\'");
+
+ String targetFrame = getTargetFrame(bean);
+ // Look for target frames with well-known names, like
+ // _self, _top, _parent, _blank, and _new. (_new
+ / is actually non-standard, but often used for _blank)
+ if (targetFrame != null && !"_self".equals(targetFrame))
+ {
+ if ("_top".equals(targetFrame))
+ {
+ onclickJS = "top.location='" + destination + "'";
+ }
+ else if ("_parent".equals(targetFrame))
+ {
+ onclickJS = "parent.location='" + destination + "'";
+ }
+ else if ("_blank".equals(targetFrame) || "_new".equals(targetFrame))
+ {
+ onclickJS = "window.open('" + destination + "')";
+ }
+ else
+ {
+ onclickJS = "top[" +
+ targetFrame +
+ "].location='" +
+ destination +
+ "'";
+ }
+ }
+ else
+ {
+ onclickJS = "document.location='" + destination + "'";
+ }
+ }
+
+ return XhtmlUtils.getChainedJS(base, onclickJS, true);
+ }
+
+ protected String getDefaultStyleClass(FacesBean bean)
+ {
+ return SkinSelectors.AF_GO_BUTTON_STYLE_CLASS;
+ }
+
+ static private final List<String> _DISABLED_STATE_LIST =
+ Collections.singletonList(SkinSelectors.STATE_DISABLED);
+}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java Wed Oct 11 16:29:53 2006
@@ -205,22 +205,12 @@
return toString(bean.getProperty(_textKey));
}
- @Override
- protected String getStyleClass(FacesBean bean)
- {
- String styleClass = super.getStyleClass(bean);
- if (styleClass == null)
- {
- RenderingContext arc = RenderingContext.getCurrentInstance();
- if (!((CoreRenderingContext) arc).isDefaultLinkStyleDisabled())
- styleClass = getDefaultStyleClass(bean);
- }
-
- return styleClass;
- }
-
protected String getDefaultStyleClass(FacesBean bean)
{
+ RenderingContext arc = RenderingContext.getCurrentInstance();
+ if (((CoreRenderingContext) arc).isDefaultLinkStyleDisabled())
+ return null;
+
if (getDisabled(bean))
return SkinSelectors.LINK_DISABLED_STYLE_CLASS;
else
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java Wed Oct 11 16:29:53 2006
@@ -275,18 +275,7 @@
//
// OVERRIDES
//
-
- @Override
- protected void renderAllAttributes(
- FacesContext context,
- RenderingContext arc,
- FacesBean bean) throws IOException
- {
- renderAllAttributes(context, arc, bean, false);
- renderStyleAttributes(context, arc, bean, getDefaultStyleClass());
- }
-
- protected String getDefaultStyleClass()
+ protected String getDefaultStyleClass(FacesBean bean)
{
return "af|outputLabel";
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java Wed Oct 11 16:29:53 2006
@@ -123,7 +123,7 @@
return false;
}
- protected String getDefaultStyleClass()
+ protected String getDefaultStyleClass(FacesBean bean)
{
return SkinSelectors.AF_LABEL_TEXT_STYLE_CLASS;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SeparatorRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SeparatorRenderer.java?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SeparatorRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SeparatorRenderer.java Wed Oct 11 16:29:53 2006
@@ -59,14 +59,14 @@
ResponseWriter rw = context.getResponseWriter();
renderAllAttributes(context, arc, bean, false);
- renderStyleAttributes(context, arc, bean, getDefaultStyleClass());
+ renderStyleAttributes(context, arc, bean);
// Old PDA renderer rule
if (isPDA(arc))
rw.writeAttribute("size", "1", null);
}
- protected String getDefaultStyleClass()
+ protected String getDefaultStyleClass(FacesBean bean)
{
return SkinSelectors.AF_SEPARATOR_STYLE_CLASS;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java Wed Oct 11 16:29:53 2006
@@ -306,7 +306,27 @@
public static final String AF_COLUMN_UNSORTED_ICON_NAME =
"af|column::unsorted-icon";
+ // //
+ // //
+ // ============================ tr:commandButton ========================= //
+ // //
+ // //
+
+ // ============================ Style classes ============================ //
+ public static final String AF_COMMAND_BUTTON_STYLE_CLASS =
+ "af|commandButton";
+
+ // //
+ // //
+ // ============================ tr:goButton ========================= //
+ // //
+ // //
+
+ // ============================ Style classes ============================ //
+ public static final String AF_GO_BUTTON_STYLE_CLASS =
+ "af|goButton";
+
// //
// //
// ============================ tr:inputColor ============================ //
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java Wed Oct 11 16:29:53 2006
@@ -87,6 +87,11 @@
_partialTriggersKey = type.findKey("partialTriggers");
}
+ /**
+ * Returns true if the agent supports the Script module.
+ * <p>
+ * See section 5.16 of xhtml modularization
+ */
static public boolean supportsScripting(RenderingContext arc)
{
Object scriptingSpeed = arc.getAgent().getCapabilities().get(
@@ -96,6 +101,7 @@
(TrinidadAgent.SCRIPTING_SPEED_CAP_NONE != scriptingSpeed));
}
+
static public boolean supportsEditing(RenderingContext arc)
{
Object cap = arc.getAgent().getCapabilities().get(
@@ -103,6 +109,25 @@
return !Boolean.FALSE.equals(cap);
}
+ public static boolean supportsAdvancedForms(
+ RenderingContext arc)
+ {
+ Object cap = arc.getAgent().getCapabilities().get(
+ TrinidadAgent.CAP_ADVANCED_FORMS);
+ return !Boolean.FALSE.equals(cap);
+ }
+
+ /**
+ * See section 5.14 of xhtml modularization.
+ */
+ public static boolean supportsIntrinsicEvents(
+ RenderingContext arc)
+ {
+ Object cap = arc.getAgent().getCapabilities().get(
+ TrinidadAgent.CAP_INTRINSIC_EVENTS);
+ return !Boolean.FALSE.equals(cap);
+ }
+
/**
* Returns true if the style attributes should be rendered for this node.
* <p>
@@ -339,7 +364,12 @@
RenderingContext arc,
FacesBean bean) throws IOException
{
- renderStyleAttributes(context, arc, bean, null);
+ renderStyleAttributes(context, arc, bean, getDefaultStyleClass(bean));
+ }
+
+ protected String getDefaultStyleClass(FacesBean bean)
+ {
+ return null;
}
/**
@@ -347,7 +377,7 @@
*/
protected void renderStyleAttributes(
FacesContext context,
- RenderingContext arc,
+ RenderingContext arc,
FacesBean bean,
String defaultStyleClass) throws IOException
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java Wed Oct 11 16:29:53 2006
@@ -368,10 +368,6 @@
public static final AttributeKey FIRST_CLICK_PASSED_ATTR =
new AttributeKey("firstClickPassed");
- // ER 4014884: block on every submit if requested.
- public static final AttributeKey BLOCK_ON_EVERY_SUBMIT_ATTR =
- new AttributeKey("blockOnEverySubmit");
-
/** @deprecated Do not use this attribute */
@Deprecated
public static final AttributeKey ANCESTOR_ID_ATTR = new AttributeKey("ancestorID");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss Wed Oct 11 16:29:53 2006
@@ -2286,6 +2286,14 @@
<property name="vertical-align">baseline</property>
</style>
+ <style selector="af|commandButton">
+ <includeStyle name="AFDefaultFont"/>
+ </style>
+
+ <style selector="af|goButton">
+ <includeStyle name="AFDefaultFont"/>
+ </style>
+
<style selector="af|column::cell-text">
<includeStyle name="AFTableCellDataText"/>
<includeStyle name="AFTableCellDataVerticalAlign"/>
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/faces-bean.properties Wed Oct 11 16:29:53 2006
@@ -27,7 +27,6 @@
org.apache.myfaces.trinidad.component.html.HtmlTableLayout=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.html.HtmlScript=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.input.CoreChooseColor=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
-org.apache.myfaces.trinidad.component.core.nav.CoreGoButton=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.CoreImportScript=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.CorePoll=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
org.apache.myfaces.trinidad.component.core.CoreSubform=org.apache.myfaces.trinidadinternal.uinode.UINodeFacesBean
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimal-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimal-golden.xml?view=diff&rev=463063&r1=463062&r2=463063
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimal-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/commandButton-minimal-golden.xml Wed Oct 11 16:29:53 2006
@@ -1,271 +1,296 @@
-<results>
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[accessKey,u]-->
-
- <button
- accesskey="u"
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
- id="uri-attr:mainId"
- >
- B
- <span
- class="AFAccessKeyStyle"
- >
- u
- </span>ttonText
- </button>
-<!--AttributeTest[disabled,false]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[disabled,true]-->
-
- <button
- class="OraLinkDisabled"
- disabled="disabled"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[immediate,false]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[immediate,true]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',0,{source:'mainId'});return false;"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[partialSubmit,false]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[partialSubmit,true]-->
-
- <button
- class="OraLink"
- onclick="_uixspu('formId',1,0,'mainId',0,1,0);return false;"
- type="button"
- id="uri-attr:mainId"
- >
-
- <script
- >
- var _pprUpdateMode=false;function _uixspu(f,v,e,s,pt,p,o){_pprUpdateMode=true;if(!o)o=new Object();o.event=(e)?e:'update';if(s)o.source=s;if(p){o.partial='true';if(pt)o.partialTargets=pt;_submitPartialChange(f,v,o);}else submitForm(f,v,o);}
- </script>ButtonText
- </button>
-<!--AttributeTest[textAndAccessKey,B&uttonText]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[windowHeight,100]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[windowWidth,200]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[id,myid]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'myid'});return false;"
- type="button"
- id="uri-attr:myid"
- >
- ButtonText
- </button>
-<!--AttributeTest[inlineStyle,background-color:red]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- style="background-color:red"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[shortDesc,my button]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- title="my button"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[styleClass,mystyle]-->
-
- <button
- class="mystyle"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[onclick,null]-->
-
- <button
- class="OraLink"
- onclick="return _chain('test-onclick','submitForm(\'formId\',1,{source:\'mainId\'});return false;',this,event,true)"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[ondblclick,null]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- ondblclick="test-ondblclick"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[onkeydown,null]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- onkeydown="test-onkeydown"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[onkeypress,null]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- onkeypress="test-onkeypress"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[onkeyup,null]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- onkeyup="test-onkeyup"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[onmousedown,null]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- onmousedown="test-onmousedown"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[onmousemove,null]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- onmousemove="test-onmousemove"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[onmouseout,null]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- onmouseout="test-onmouseout"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[onmouseover,null]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- onmouseover="test-onmouseover"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-<!--AttributeTest[onmouseup,null]-->
-
- <button
- class="OraLink"
- onclick="submitForm('formId',1,{source:'mainId'});return false;"
- onmouseup="test-onmouseup"
- type="button"
- id="uri-attr:mainId"
- >
- ButtonText
- </button>
-</results>
+<results>
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[accessKey,u]-->
+
+ <button
+ accesskey="u"
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ B
+ <span
+ class="AFAccessKeyStyle"
+ >
+ u
+ </span>ttonText
+ </button>
+<!--AttributeTest[disabled,false]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[disabled,true]-->
+
+ <button
+ class="af_commandButton p_AFDisabled"
+ disabled="disabled"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[immediate,false]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[immediate,true]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',0,{source:'mainId'});return false;"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[partialSubmit,false]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[partialSubmit,true]-->
+
+ <script
+ >
+ var _pprUpdateMode=false;function _adfspu(f,v,e,s,o){_pprUpdateMode=true;if(!o)o=new Object();o.event=(e)?e:'update';if(s)o.source=s;_submitPartialChange(f,v,o);}
+ </script>
+ <button
+ class="af_commandButton"
+ onclick="_adfspu('formId',1,0,'mainId');return false;"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[textAndAccessKey,B&uttonText]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[windowHeight,100]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[windowWidth,200]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[id,myid]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'myid'});return false;"
+ type="button"
+ id="uri-attr:myid"
+ name="uri-attr:myid"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[inlineStyle,background-color:red]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ style="background-color:red"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[shortDesc,my button]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ title="my button"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[styleClass,mystyle]-->
+
+ <button
+ class="mystyle af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[onclick,null]-->
+
+ <button
+ class="af_commandButton"
+ onclick="return _chain('test-onclick','submitForm(\'formId\',1,{source:\'mainId\'});return false;',this,event,true)"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[ondblclick,null]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ ondblclick="test-ondblclick"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[onkeydown,null]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ onkeydown="test-onkeydown"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[onkeypress,null]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ onkeypress="test-onkeypress"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[onkeyup,null]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ onkeyup="test-onkeyup"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[onmousedown,null]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ onmousedown="test-onmousedown"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[onmousemove,null]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ onmousemove="test-onmousemove"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[onmouseout,null]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ onmouseout="test-onmouseout"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[onmouseover,null]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ onmouseover="test-onmouseover"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+<!--AttributeTest[onmouseup,null]-->
+
+ <button
+ class="af_commandButton"
+ onclick="submitForm('formId',1,{source:'mainId'});return false;"
+ onmouseup="test-onmouseup"
+ type="button"
+ id="uri-attr:mainId"
+ name="uri-attr:mainId"
+ >
+ ButtonText
+ </button>
+</results>