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

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

Author: pgolawski
Date: 2008-12-18 03:09:12 -0500 (Thu, 18 Dec 2008)
New Revision: 11862

Modified:
   trunk/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java
Log:
support for locale-aware sorting and filtering according to request https://jira.jboss.org/jira/browse/RF-5008

Modified: trunk/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java
===================================================================
--- trunk/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java	2008-12-18 07:08:12 UTC (rev 11861)
+++ trunk/ui/extendedDataTable/src/main/java/org/richfaces/component/UIExtendedDataTable.java	2008-12-18 08:09:12 UTC (rev 11862)
@@ -27,9 +27,11 @@
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 import javax.faces.event.AbortProcessingException;
 import javax.faces.event.FacesEvent;
@@ -37,6 +39,7 @@
 import javax.faces.model.DataModel;
 
 import org.ajax4jsf.context.AjaxContext;
+import org.ajax4jsf.context.ContextInitParameters;
 import org.ajax4jsf.event.AjaxEvent;
 import org.ajax4jsf.model.ExtendedDataModel;
 import org.apache.commons.collections.iterators.IteratorChain;
@@ -48,6 +51,7 @@
 import org.richfaces.model.ExtendedTableDataModel;
 import org.richfaces.model.ExtendedTableDataModifiableModel;
 import org.richfaces.model.FilterField;
+import org.richfaces.model.LocaleAware;
 import org.richfaces.model.Modifiable;
 import org.richfaces.model.ModifiableModel;
 import org.richfaces.model.Ordering;
@@ -321,7 +325,7 @@
 		return count;
 	}// getVisibleColumnnCount
 
-	// @Override
+	@Override
 	@SuppressWarnings("unchecked")
 	protected ExtendedDataModel createDataModel() {
 		List<FilterField> filterFields = new LinkedList<FilterField>();
@@ -383,6 +387,15 @@
 				dataModel = modifiableModel;
 				modifiable = modifiableModel;	
 			}
+			
+			if (dataModel instanceof LocaleAware) {
+				FacesContext facesContext = getFacesContext();
+				if (ContextInitParameters.isDatatableUsesViewLocale(facesContext)) {
+					UIViewRoot viewRoot = facesContext.getViewRoot();
+					((LocaleAware) dataModel).setLocale(viewRoot.getLocale());
+				}
+			}
+			
 			modifiable.modify(filterFields, sortFields);
 		}
 		return dataModel;