Author: gvanmatre
Date: Sat Feb 4 06:56:54 2006
New Revision: 374876
URL: http://svn.apache.org/viewcvs?rev=374876&view=rev
Log:
Fixes for Bug 38493 and 38492 reported by Hermod Opstvedt.
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/PropertyActionCommand.java
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java?rev=374876&r1=374875&r2=374876&view=diff
==============================================================================
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/Clay.java
Sat Feb 4 06:56:54 2006
@@ -373,15 +373,17 @@
Iterator ci = child.getChildren().iterator();
while (ci.hasNext()) {
UIComponent c = (UIComponent) ci.next();
- c.encodeBegin(context);
-
- if (!c.getRendersChildren())
- recursiveRenderChildren(c, context);
- else
- c.encodeChildren(context);
-
- c.encodeEnd(context);
- c = null;
+ if (c.isRendered()) {
+ c.encodeBegin(context);
+
+ if (!c.getRendersChildren())
+ recursiveRenderChildren(c,
context);
+ else
+ c.encodeChildren(context);
+
+ c.encodeEnd(context);
+ c = null;
+ }
}
} else {
// let the component handle iterating over the children
Modified:
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/PropertyActionCommand.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/PropertyActionCommand.java?rev=374876&r1=374875&r2=374876&view=diff
==============================================================================
---
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/PropertyActionCommand.java
(original)
+++
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/PropertyActionCommand.java
Sat Feb 4 06:56:54 2006
@@ -97,12 +97,7 @@
if (child instanceof ActionSource) {
String expr = null;
-
- if (UIComponentTag.isValueReference(attributeBean.getValue()))
- expr = replaceMnemonic(clayContext);
- else
- expr = attributeBean.getValue();
-
+ expr = replaceMnemonic(clayContext);
tagUtils.setAction(child, expr);
} else {
log.error(messages.getMessage("property.action.error", new
Object[] {attributeBean}));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
