[richfaces-svn-commits] JBoss Rich Faces SVN: r12002 - trunk/ui/core/src/main/java/org/ajax4jsf/component.

[richfaces-svn-commits at lists.jboss.org]

Author: abelevich
Date: 2008-12-23 13:52:44 -0500 (Tue, 23 Dec 2008)
New Revision: 12002

Modified:
   trunk/ui/core/src/main/java/org/ajax4jsf/component/UIInclude.java
Log:
https://jira.jboss.org/jira/browse/RF-4553

Modified: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIInclude.java
===================================================================
--- trunk/ui/core/src/main/java/org/ajax4jsf/component/UIInclude.java	2008-12-23 18:36:09 UTC (rev 12001)
+++ trunk/ui/core/src/main/java/org/ajax4jsf/component/UIInclude.java	2008-12-23 18:52:44 UTC (rev 12002)
@@ -51,7 +51,7 @@
 	public static final String LAYOUT_BLOCK ="block";
 	public static final String LAYOUT_INLINE ="inline";
 	
-	private boolean _ajaxRendered = true;
+	private boolean _ajaxRendered = false;
 	private boolean _ajaxRenderedSet = false;
 	
 	private boolean wasNavigation = false;
@@ -63,7 +63,7 @@
 	 * @see org.ajax4jsf.framework.ajax.ViewIdHolder#skipNavigation(java.lang.String)
 	 */
 	public boolean skipNavigation(String ViewId) {
-//		wasNavigation = true;
+		wasNavigation = true;
 		return true;
 	}
 
@@ -126,8 +126,12 @@
 	
 	public boolean isAjaxRendered() {
 	    Boolean value = null;
-	    if(!this._ajaxRenderedSet) {
-		ValueExpression ve = getValueExpression("ajaxRendered");
+	    
+	    if(this._ajaxRenderedSet) {
+	    	return this._ajaxRendered;
+	    }	
+	    	
+	    ValueExpression ve = getValueExpression("ajaxRendered");
 		if (ve != null) {
 		    try {
 			value = (Boolean) ve.getValue(getFacesContext().getELContext());
@@ -135,10 +139,11 @@
 			throw new FacesException(e);
 		    }
 		} 
-	    } 
+	     
 	    
 	    if (null == value) {
-		value = this._ajaxRendered;
+//			value = this._ajaxRendered;
+	    	value = isWasNavigation();
 	    } 
 
 	    return (!LAYOUT_NONE.equals(getLayout())) && value;