svn commit: r1038014 - in /myfaces/tobago/branches/tobago-1.0.x/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message: MessageFixFacesContext.java MessageFixFacesContextFactoryImpl.java

[lo...@apache.org]

Author: lofwyr
Date: Tue Nov 23 08:26:02 2010
New Revision: 1038014

URL: http://svn.apache.org/viewvc?rev=1038014&view=rev
Log:
TOBAGO-947: FileUpload: Breach uploadMaxFileSize will not diplayed as faces message under certain conditions

Modified:
    myfaces/tobago/branches/tobago-1.0.x/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContext.java
    myfaces/tobago/branches/tobago-1.0.x/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextFactoryImpl.java

Modified: myfaces/tobago/branches/tobago-1.0.x/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContext.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContext.java?rev=1038014&r1=1038013&r2=1038014&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContext.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContext.java Tue Nov 23 08:26:02 2010
@@ -17,24 +17,24 @@ package org.apache.myfaces.tobago.extens
  * limitations under the License.
  */
 
-import javax.faces.context.FacesContext;
+import javax.faces.application.Application;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIViewRoot;
 import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseStream;
 import javax.faces.context.ResponseWriter;
-import javax.faces.application.Application;
-import javax.faces.application.FacesMessage;
 import javax.faces.render.RenderKit;
-import javax.faces.component.UIViewRoot;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Collections;
 import java.util.List;
-import java.util.ArrayList;
+import java.util.Map;
 
-/*
- * Date: Aug 16, 2007
- * Time: 7:41:04 PM
+/**
+ * Alternative faces context which wraps the original.
+ * It fixes a problem with the order of the messages of the RI 1.1.
  */
 public class MessageFixFacesContext extends FacesContext {
   private FacesContext facesContext;
@@ -46,6 +46,17 @@ public class MessageFixFacesContext exte
   MessageFixFacesContext(FacesContext facesContext) {
     this.facesContext = facesContext;
     FacesContext.setCurrentInstance(this);
+
+    // add the messages from the underlying facesContext
+    final Iterator<String> clientIds = this.facesContext.getClientIdsWithMessages();
+    while (clientIds.hasNext()) {
+      String clientId = clientIds.next();
+      Iterator<FacesMessage> i = this.facesContext.getMessages(clientId);
+      while (i.hasNext()) {
+        FacesMessage facesMessage = i.next();
+        addMessage(clientId, facesMessage);
+      }
+    }
   }
 
   public Iterator getMessages() {

Modified: myfaces/tobago/branches/tobago-1.0.x/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextFactoryImpl.java?rev=1038014&r1=1038013&r2=1038014&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextFactoryImpl.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/extension/message-fix/src/main/java/org/apache/myfaces/tobago/extension/fix/message/MessageFixFacesContextFactoryImpl.java Tue Nov 23 08:26:02 2010
@@ -20,14 +20,13 @@ package org.apache.myfaces.tobago.extens
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.faces.context.FacesContextFactory;
+import javax.faces.FacesException;
 import javax.faces.context.FacesContext;
+import javax.faces.context.FacesContextFactory;
 import javax.faces.lifecycle.Lifecycle;
-import javax.faces.FacesException;
 
-/*
- * Date: Aug 16, 2007
- * Time: 7:41:04 PM
+/**
+ * @see MessageFixFacesContext
  */
 public class MessageFixFacesContextFactoryImpl extends FacesContextFactory {
   private static final Log LOG = LogFactory.getLog(MessageFixFacesContextFactoryImpl.class);