Scarab commit: svn commit: r10396 - trunk: . src/java/org/tigris/scarab/notification src/java/org/tigris/scarab/om

Author: ronvoe122
Date: 2006-12-28 06:59:53-0800
New Revision: 10396

Modified:
   trunk/   (props changed)
   trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
   trunk/src/java/org/tigris/scarab/om/ActivitySet.java

Log:
Merged revisions 10360 via svnmerge from 
http://scarab.tigris.org/svn/scarab/branches/release/b21

........
  r10360 | ronvoe122 | 2006-11-15 13:17:21 +0100 (Mi, 15 Nov 2006) | 2 lines
  
  [SCB2144] add all users, which are removed from an issue in a specific activity-set to the notification queue.
  So this users will also be notified about their removal from the issue.
........


Modified: trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java?view=diff&rev=10396&p1=trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&p2=trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&r1=10395&r2=10396
==============================================================================
--- trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java	(original)
+++ trunk/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java	2006-12-28 06:59:53-0800
@@ -158,6 +158,7 @@
                     Issue actIssue = act.getIssue();
                     Set users = issue.getAllUsersToEmail(AttributePeer.EMAIL_TO);
                     users.addAll(actIssue.getAllUsersToEmail(AttributePeer.CC_TO));
+                    users.addAll(activitySet.getRemovedUsers(issue));
                     
                     // FIXME: Should we still make difference between CC & TO? If so...
                     // ...do we need this info in the notification_status table??

Modified: trunk/src/java/org/tigris/scarab/om/ActivitySet.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/ActivitySet.java?view=diff&rev=10396&p1=trunk/src/java/org/tigris/scarab/om/ActivitySet.java&p2=trunk/src/java/org/tigris/scarab/om/ActivitySet.java&r1=10395&r2=10396
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/ActivitySet.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/ActivitySet.java	2006-12-28 06:59:53-0800
@@ -48,12 +48,16 @@
 
 import java.util.List;
 import java.util.Iterator;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.torque.TorqueException;
 import org.apache.torque.util.Criteria; 
 
 import org.apache.torque.om.Persistent;
 
+import org.tigris.scarab.om.ScarabUser;
+import org.tigris.scarab.om.ScarabUserManager;
 import org.tigris.scarab.tools.ScarabLocalizationTool;
 import org.tigris.scarab.tools.localization.L10NKeySet;
 import org.tigris.scarab.util.ScarabException;
@@ -163,4 +167,23 @@
         }
         return reason;
     }
+
+    /**
+     * Returns a set of ScarabUsers which are removed from changedIssue
+     * in this ActivitySet
+     */
+    public Set getRemovedUsers(Issue changedIssue) throws TorqueException
+    {
+        Set removedUsers = new HashSet();
+        for (Iterator it = getActivityListForIssue(changedIssue).iterator(); it.hasNext(); )
+        {
+            Activity act = (Activity)it.next();
+            if(act.getOldUserId() != null && act.getNewUserId() == null)
+            {
+                ScarabUser removedUser = ScarabUserManager.getInstance(act.getOldUserId());
+                removedUsers.add(removedUser);
+            }
+        }
+        return removedUsers;
+    }
 }