svn commit: r480227 - in /tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components: ElseBean.java IfBean.java

[jkuhnert]

Author: jkuhnert
Date: Tue Nov 28 13:53:15 2006
New Revision: 480227

URL: http://svn.apache.org/viewvc?view=rev&rev=480227
Log:
Resolves TAPESTRY-1166 . If/else weren't using the old element parameter.

Modified:
    
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ElseBean.java
    
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/IfBean.java

Modified: 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ElseBean.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ElseBean.java?view=diff&rev=480227&r1=480226&r2=480227
==============================================================================
--- 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ElseBean.java
 (original)
+++ 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ElseBean.java
 Tue Nov 28 13:53:15 2006
@@ -36,7 +36,7 @@
         {
             String element = HiveMind.isNonBlank(getElement()) ? getElement() 
: getTemplateTagName();
             
-            boolean render = !cycle.isRewinding() && getRenderTag();
+            boolean render = !cycle.isRewinding() && (getRenderTag() || 
HiveMind.isNonBlank(getElement()));
             
             if (render)
             {

Modified: 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/IfBean.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/IfBean.java?view=diff&rev=480227&r1=480226&r2=480227
==============================================================================
--- 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/IfBean.java
 (original)
+++ 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/IfBean.java
 Tue Nov 28 13:53:15 2006
@@ -85,7 +85,7 @@
             {
                 String element = HiveMind.isNonBlank(getElement()) ? 
getElement() : getTemplateTagName();
                 
-                boolean render = !cycleRewinding && getRenderTag();
+                boolean render = !cycleRewinding && (getRenderTag() || 
HiveMind.isNonBlank(getElement()));
                 
                 if (render)
                 {