svn commit: r469851 - /incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java

[jacopoc]

Author: jacopoc
Date: Wed Nov  1 02:44:04 2006
New Revision: 469851

URL: http://svn.apache.org/viewvc?view=rev&rev=469851
Log:
The list of success messages (both single and list messages) is now pulled from the services invoked thru the service-multi handler so that the messages can be shown on screen: duplicated messages are not added to the output list.

Modified:
    incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java

Modified: incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java?view=diff&rev=469851&r1=469850&r2=469851
==============================================================================
--- incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java (original)
+++ incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java Wed Nov  1 02:44:04 2006
@@ -150,8 +150,9 @@
         String messagePrefixStr = UtilProperties.getMessage("DefaultMessages", "service.message.prefix", locale);
         String messageSuffixStr = UtilProperties.getMessage("DefaultMessages", "service.message.suffix", locale);
 
-        // prepare the error message list
+        // prepare the error message and success message lists
         List errorMessages = FastList.newInstance();
+        List successMessages = FastList.newInstance();
 
         // big try/finally to make sure commit or rollback are run
         boolean beganTrans = false;
@@ -296,7 +297,23 @@
                 if (UtilValidate.isNotEmpty(errorMessage)) {
                     errorMessages.add(errorMessage);
                 }
-                
+
+                // get the success messages
+                if (!UtilValidate.isEmpty((String)result.get(ModelService.SUCCESS_MESSAGE))) {
+                    String newSuccessMessage = (String)result.get(ModelService.SUCCESS_MESSAGE);
+                    if (!successMessages.contains(newSuccessMessage)) {
+                        successMessages.add(newSuccessMessage);
+                    }
+                }
+                if (!UtilValidate.isEmpty((List)result.get(ModelService.SUCCESS_MESSAGE_LIST))) {
+                    List newSuccessMessages = (List)result.get(ModelService.SUCCESS_MESSAGE_LIST);
+                    for (int j = 0; j < newSuccessMessages.size(); j++) {
+                        String newSuccessMessage = (String)newSuccessMessages.get(j);
+                        if (!successMessages.contains(newSuccessMessage)) {
+                            successMessages.add(newSuccessMessage);
+                        }
+                    }
+                }
                 // set the results in the request
                 if ((result != null) && (result.entrySet() != null)) {
                     Iterator rmei = result.entrySet().iterator();
@@ -338,6 +355,9 @@
                 } catch (GenericTransactionException e) {
                     Debug.logError(e, "Could not commit transaction", module);
                     throw new EventHandlerException("Commit transaction failed");
+                }
+                if (successMessages.size() > 0) {
+                    request.setAttribute("_EVENT_MESSAGE_LIST_", successMessages);
                 }
                 returnString = "success";
             }