[richfaces-svn-commits] JBoss Rich Faces SVN: r4670 - in branches/3.1.x: ui/calendar/src/main/java/org/richfaces/renderkit and 1 other directory.

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

Author: nbelaevski
Date: 2007-12-10 13:52:28 -0500 (Mon, 10 Dec 2007)
New Revision: 4670

Modified:
   branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
   branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
http://jira.jboss.com/jira/browse/RF-1573

Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java	2007-12-10 18:48:52 UTC (rev 4669)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java	2007-12-10 18:52:28 UTC (rev 4670)
@@ -28,6 +28,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -84,7 +85,7 @@
 
 	Set ajaxAreasToRender = new HashSet();
 
-	Set ajaxRenderedAreas = new HashSet();
+	Set ajaxRenderedAreas = new LinkedHashSet();
 
 	boolean ajaxRequest = false;
 
@@ -119,7 +120,7 @@
 		
 		ajaxAreasToRender = new HashSet();
 
-		ajaxRenderedAreas = new HashSet();
+		ajaxRenderedAreas = new LinkedHashSet();
 
 		ajaxRequest = false;
 

Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java	2007-12-10 18:48:52 UTC (rev 4669)
+++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java	2007-12-10 18:52:28 UTC (rev 4670)
@@ -33,6 +33,7 @@
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
@@ -87,9 +88,10 @@
 			UICalendar component) {
 
 		AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
-		if (ajaxContext.isAjaxRequest()) {
-			String clientId = component.getClientId(context);
-
+		Set ajaxRenderedAreas = ajaxContext.getAjaxRenderedAreas();
+		String clientId = component.getClientId(context);
+		
+		if (ajaxContext.isAjaxRequest() && ajaxRenderedAreas.contains(clientId)) {
 			ajaxContext.getAjaxRenderedAreas().add(
 					clientId + "Popup");