svn commit: r1443349 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/CompositeUploadedFileProcessorImpl.java

[so...@apache.org]

Author: sobryan
Date: Thu Feb  7 08:28:35 2013
New Revision: 1443349

URL: http://svn.apache.org/viewvc?rev=1443349&view=rev
Log:
TRINIDAD-2355 The error message displayed for a large file uploaded is not browser locale dependent

* Thanks for the patch anshu

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/CompositeUploadedFileProcessorImpl.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/CompositeUploadedFileProcessorImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/CompositeUploadedFileProcessorImpl.java?rev=1443349&r1=1443348&r2=1443349&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/CompositeUploadedFileProcessorImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/CompositeUploadedFileProcessorImpl.java Thu Feb  7 08:28:35 2013
@@ -27,12 +27,16 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Collections;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.PortletContext;
 import javax.portlet.PortletRequest;
 
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 
@@ -338,12 +342,12 @@ public class CompositeUploadedFileProces
     
     if(contentLength>_maxDiskSpace)
     {
-      return new ErrorFile(tempFile.getFilename(), _LOG.getMessage("UPLOADED_FILE_LARGE"));
+      return new ErrorFile(tempFile.getFilename(), getLargeFileSizeMsg(request));
     }
     // If the file is too large throw error
     if(_maxFileSize > 0 && contentLength>_maxFileSize)
     {
-      return new ErrorFile(tempFile.getFilename(), _LOG.getMessage("UPLOADED_FILE_LARGE"));
+      return new ErrorFile(tempFile.getFilename(), getLargeFileSizeMsg(request));
     }
     // Process one new file, loading only as much as can fit
     // in the remaining memory and disk space.
@@ -374,6 +378,30 @@ public class CompositeUploadedFileProces
 
     return file;
   }
+  
+  private String getLargeFileSizeMsg(Object request)
+  {    
+    String resourceBundleName = _LOG.getLogger().getResourceBundleName();
+    try
+    {
+      return ResourceBundle.getBundle(resourceBundleName, getLocale(request))
+                      .getString("UPLOADED_FILE_LARGE");      
+    }
+    catch(MissingResourceException mre)
+    {
+      return "UPLOADED_FILE_LARGE";
+    }
+  }
+  
+  private Locale getLocale(Object request)
+  {
+    Locale locale = null;
+    if (_isPortletRequestClass(request))
+      locale = ((PortletRequest)request).getLocale();
+    else
+      locale = ((ServletRequest)request).getLocale();
+    return locale;
+  }
 
   private int getContentLength(Object request)
   {