[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui ...
Gavin King
gavin.king at jboss.com
Sat Mar 17 12:55:12 EDT 2007
User: gavin
Date: 07/03/17 12:55:12
Modified: src/ui/org/jboss/seam/ui UIDecorate.java
Log:
fix for attribute on label facet in s:layoutForm
Revision Changes Path
1.12 +11 -15 jboss-seam/src/ui/org/jboss/seam/ui/UIDecorate.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIDecorate.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UIDecorate.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- UIDecorate.java 17 Mar 2007 05:04:01 -0000 1.11
+++ UIDecorate.java 17 Mar 2007 16:55:12 -0000 1.12
@@ -28,17 +28,13 @@
*/
protected static UIComponent getEditableValueHolder(UIComponent component)
{
- for (Object child: component.getChildren())
- {
- if (child instanceof EditableValueHolder)
- {
- UIComponent evh =(UIComponent) child;
- if ( evh.isRendered() )
+ if (component instanceof EditableValueHolder)
{
- return evh;
+ return component.isRendered() ? component : null;
}
- }
- else if (child instanceof UIComponent)
+ for (Object child: component.getChildren())
+ {
+ if (child instanceof UIComponent)
{
UIComponent evh = getEditableValueHolder( (UIComponent) child );
if (evh!=null) return evh;
@@ -47,6 +43,12 @@
return null;
}
+ protected static String getInputClientId(UIComponent cmp, FacesContext facesContext)
+ {
+ UIComponent input = getInput(cmp, facesContext);
+ return input == null ? null : input.getClientId(facesContext);
+ }
+
protected static String getInputId(UIComponent cmp)
{
String forId = cmp instanceof UIDecorate ?
@@ -62,12 +64,6 @@
}
}
- protected static String getInputClientId(UIComponent cmp, FacesContext facesContext)
- {
- UIComponent input = getInput(cmp, facesContext);
- return input == null ? null : input.getClientId(facesContext);
- }
-
protected static UIComponent getInput(UIComponent cmp, FacesContext facesContext)
{
String forId = cmp instanceof UIDecorate ?
More information about the jboss-cvs-commits
mailing list