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 2007/02/11 06:52:59 UTC
svn commit: r505855 - in /incubator/adffaces/trunk/trinidad:
trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/includes/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
trinidad...
Author: awiner
Date: Sat Feb 10 22:52:58 2007
New Revision: 505855
URL: http://svn.apache.org/viewvc?view=rev&rev=505855
Log:
ADFFACES-356: <tr:inputText readOnly="true" contentStyle="..." does not render the style attribute.
Fixed this, added a golden file test for this scenario, and while in fixed up the
wording of the inlineStyle and contentStyle attribute documentation
Modified:
incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/includes/CommonAttrs.xml
incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/includes/CommonFormControls.xml
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/SimpleInputTextRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalScrRdr-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/inputText.xml
Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/includes/CommonAttrs.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/includes/CommonAttrs.xml?view=diff&rev=505855&r1=505854&r2=505855
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/includes/CommonAttrs.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/includes/CommonAttrs.xml Sat Feb 10 22:52:58 2007
@@ -23,7 +23,7 @@
xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin">
<component>
<property>
- <description><![CDATA[Specifies CSS styles to use for this component.]]></description>
+ <description><![CDATA[the CSS styles to use for this component.]]></description>
<property-name>inlineStyle</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/includes/CommonFormControls.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/includes/CommonFormControls.xml?view=diff&rev=505855&r1=505854&r2=505855
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/includes/CommonFormControls.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/includes/CommonFormControls.xml Sat Feb 10 22:52:58 2007
@@ -32,8 +32,7 @@
</facet-extension>
</facet>
<property>
- <description><![CDATA[Style the content piece of the component. You can style width by setting this attribute like this:
- width: 100px.]]> </description>
+ <description><![CDATA[the CSS styles to attach to the content of the component. For example, you can set the width of that portion to 100 pixels by setting this attribute to "width: 100px".]]> </description>
<property-name>contentStyle</property-name>
<property-class>java.lang.String</property-class>
<property-extension>
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=505855&r1=505854&r2=505855
==============================================================================
--- 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 Sat Feb 10 22:52:58 2007
@@ -205,14 +205,13 @@
return toString(bean.getProperty(_labelKey));
}
- protected String getContentStyle(FacesBean bean)
- {
-
- if (_contentStyleKey == null)
- return null;
-
- return toString(bean.getProperty(_contentStyleKey));
- }
+ protected String getContentStyle(FacesBean bean)
+ {
+ if (_contentStyleKey == null)
+ return null;
+
+ return toString(bean.getProperty(_contentStyleKey));
+ }
protected String getOnblur(FacesBean bean)
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java?view=diff&rev=505855&r1=505854&r2=505855
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java Sat Feb 10 22:52:58 2007
@@ -331,6 +331,7 @@
renderId(context, component);
renderStyleClass(context, arc, getContentStyleClass(bean));
+ renderInlineStyleAttribute(context, arc, getContentStyle(bean));
rw.writeAttribute("title", getShortDesc(bean), "shortDesc");
/* renderAsElement == false, isTextArea == false */
renderContent(context, arc, component, bean, false, false);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimal-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimal-golden.xml?view=diff&rev=505855&r1=505854&r2=505855
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimal-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimal-golden.xml Sat Feb 10 22:52:58 2007
@@ -1013,6 +1013,240 @@
</td>
</tr>
</table>
+<!--AttributeTest[readOnly,false]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[contentStyle,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ style="test-contentStyle"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[shortDesc,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ title="test-shortDesc"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId"
+ >
+ test-shortDesc
+ </label>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[contentStyle,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ style="test-contentStyle"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[shortDesc,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
<!--AttributeTest[autoSubmit,false]-->
<table
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalIE-golden.xml?view=diff&rev=505855&r1=505854&r2=505855
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalIE-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalIE-golden.xml Sat Feb 10 22:52:58 2007
@@ -1013,6 +1013,240 @@
</td>
</tr>
</table>
+<!--AttributeTest[readOnly,false]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[contentStyle,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ style="test-contentStyle"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[shortDesc,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ title="test-shortDesc"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId"
+ >
+ test-shortDesc
+ </label>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[contentStyle,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ style="test-contentStyle"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[shortDesc,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
<!--AttributeTest[autoSubmit,false]-->
<table
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalIERtl-golden.xml?view=diff&rev=505855&r1=505854&r2=505855
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalIERtl-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalIERtl-golden.xml Sat Feb 10 22:52:58 2007
@@ -1013,6 +1013,240 @@
</td>
</tr>
</table>
+<!--AttributeTest[readOnly,false]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[contentStyle,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ style="test-contentStyle"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[shortDesc,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ title="test-shortDesc"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId"
+ >
+ test-shortDesc
+ </label>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[contentStyle,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ style="test-contentStyle"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[shortDesc,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
<!--AttributeTest[autoSubmit,false]-->
<table
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalInacc-golden.xml?view=diff&rev=505855&r1=505854&r2=505855
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalInacc-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalInacc-golden.xml Sat Feb 10 22:52:58 2007
@@ -977,6 +977,228 @@
</td>
</tr>
</table>
+<!--AttributeTest[readOnly,false]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[contentStyle,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ style="test-contentStyle"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[shortDesc,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ title="test-shortDesc"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[contentStyle,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ style="test-contentStyle"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[shortDesc,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
<!--AttributeTest[autoSubmit,false]-->
<table
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalPPC-golden.xml?view=diff&rev=505855&r1=505854&r2=505855
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalPPC-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalPPC-golden.xml Sat Feb 10 22:52:58 2007
@@ -1276,6 +1276,300 @@
</td>
</tr>
</table>
+<!--AttributeTest[readOnly,false]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="11"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ <div
+ >
+
+ <img
+ alt=""
+ height="0"
+ width="1"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[contentStyle,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="11"
+ style="test-contentStyle"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ <div
+ >
+
+ <img
+ alt=""
+ height="0"
+ width="1"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[shortDesc,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="11"
+ title="test-shortDesc"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ <div
+ >
+
+ <img
+ alt=""
+ height="0"
+ width="1"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ >
+ Text
+ </div>
+ <div
+ >
+
+ <img
+ alt=""
+ height="0"
+ width="1"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[contentStyle,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ style="test-contentStyle"
+ >
+ Text
+ </div>
+ <div
+ >
+
+ <img
+ alt=""
+ height="0"
+ width="1"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[shortDesc,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ Text
+ </div>
+ <div
+ >
+
+ <img
+ alt=""
+ height="0"
+ width="1"
+ src="uri-attr:encoded-resource-url:/test-context-path/adf/images/t.gif"
+ >
+
+ </img>
+ </div>
+ </td>
+ </tr>
+ </table>
<!--AttributeTest[autoSubmit,false]-->
<table
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalSaf-golden.xml?view=diff&rev=505855&r1=505854&r2=505855
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalSaf-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalSaf-golden.xml Sat Feb 10 22:52:58 2007
@@ -1007,6 +1007,234 @@
</td>
</tr>
</table>
+<!--AttributeTest[readOnly,false]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[contentStyle,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ style="test-contentStyle"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[shortDesc,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ title="test-shortDesc"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[contentStyle,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ style="test-contentStyle"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[shortDesc,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
<!--AttributeTest[autoSubmit,false]-->
<table
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalScrRdr-golden.xml?view=diff&rev=505855&r1=505854&r2=505855
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalScrRdr-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/inputText-minimalScrRdr-golden.xml Sat Feb 10 22:52:58 2007
@@ -1007,6 +1007,240 @@
</td>
</tr>
</table>
+<!--AttributeTest[readOnly,false]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[contentStyle,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ style="test-contentStyle"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[shortDesc,null]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText"
+ id="mainId__xc_"
+ summary=""
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <input
+ class="af_inputText_content"
+ id="mainId"
+ name="mainId"
+ size="30"
+ title="test-shortDesc"
+ type="text"
+ value="Text"
+ >
+
+ </input>
+ <label
+ class="p_OraHiddenLabel"
+ for="mainId"
+ >
+ test-shortDesc
+ </label>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[contentStyle,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ style="test-contentStyle"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
+<!--AttributeTest[readOnly,true,AttributeTest[shortDesc,null]]-->
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="af_inputText p_AFReadOnly"
+ id="mainId__xc_"
+ summary=""
+ title="test-shortDesc"
+ >
+
+ <tr
+ >
+
+ <td
+ class="af_inputText_label"
+ nowrap="nowrap"
+ >
+
+ </td>
+ <td
+ class="AFContentCell"
+ nowrap="nowrap"
+ valign="top"
+ >
+
+ <div
+ class="af_inputText_content"
+ id="mainId"
+ title="test-shortDesc"
+ >
+ Text
+ </div>
+ </td>
+ </tr>
+ </table>
<!--AttributeTest[autoSubmit,false]-->
<table
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/inputText.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/inputText.xml?view=diff&rev=505855&r1=505854&r2=505855
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/inputText.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/inputText.xml Sat Feb 10 22:52:58 2007
@@ -24,6 +24,11 @@
<attribute-test name="shortDesc" value="shortDesc_val"/>
<attribute-test name="styleClass" value="styleClass_val"/>
<attribute-test name="contentStyle" value="contentStyle_val"/>
+
+ <boolean-test name="readOnly">
+ <attribute-test name="contentStyle"/>
+ <attribute-test name="shortDesc"/>
+ </boolean-test>
<boolean-test name="autoSubmit"/>