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

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

Author: nbelaevski
Date: 2008-12-14 17:03:12 -0500 (Sun, 14 Dec 2008)
New Revision: 11764

Modified:
   trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
Log:
https://jira.jboss.org/jira/browse/RF-5008

Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java	2008-12-14 21:55:32 UTC (rev 11763)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java	2008-12-14 22:03:12 UTC (rev 11764)
@@ -27,7 +27,6 @@
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 import javax.el.ELContext;
@@ -42,6 +41,7 @@
 import org.ajax4jsf.context.ContextInitParameters;
 import org.ajax4jsf.model.ExtendedDataModel;
 import org.richfaces.model.FilterField;
+import org.richfaces.model.LocaleAware;
 import org.richfaces.model.Modifiable;
 import org.richfaces.model.ModifiableModel;
 import org.richfaces.model.SortField2;
@@ -129,18 +129,19 @@
 			if (dataModel instanceof Modifiable) {
 				modifiable = (Modifiable) dataModel;
 			} else {
-				Locale locale = null;
-
+				ModifiableModel modifiableModel = new ModifiableModel(dataModel, getVar());
+				dataModel = modifiableModel;
+				modifiable = modifiableModel;
+			}
+			
+			if (dataModel instanceof LocaleAware) {
 				FacesContext facesContext = getFacesContext();
 				if (ContextInitParameters.isDatatableUsesViewLocale(facesContext)) {
 					UIViewRoot viewRoot = facesContext.getViewRoot();
-					locale = viewRoot.getLocale();
+					((LocaleAware) dataModel).setLocale(viewRoot.getLocale());
 				}
-				
-				ModifiableModel modifiableModel = new ModifiableModel(dataModel, getVar(), locale);
-				dataModel = modifiableModel;
-				modifiable = modifiableModel;
 			}
+			
 			modifiable.modify(filterFields, sortFields);
 		}
 		return dataModel;