bug[ats_ATS21849]: ATS Notifications are not being immediately sent

Change-Id: Idcabd972350edd732d2cf6259ece5eca70981362

4 files changed, 10 insertions, 14 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionJob.java
index 5fe25cc2ddf..144c25148d3 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionJob.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionJob.java
@@ -30,7 +30,6 @@ import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager;
 
 /**
  * @author Donald G. Dunne
@@ -90,7 +89,6 @@ public class NewActionJob extends Job {
          // Thus, if multiple teams were selected to create, don't popup on openAction or dialog
          // will exception out when it is killed at the end of this job.
          AtsUtil.openATSAction(actionArt, AtsOpenOption.OpenAll);
-         OseeNotificationManager.getInstance().sendNotifications();
       } catch (Exception ex) {
          OseeLog.log(Activator.class, Level.SEVERE, ex);
          return new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, ex.getMessage(), ex);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
index d14c12aa3cb..183c18735b2 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
@@ -61,7 +61,6 @@ import org.eclipse.osee.framework.ui.skynet.AttributesComposite;
 import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
 import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory;
 import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor;
-import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager;
 import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
 import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
 import org.eclipse.osee.framework.ui.swt.Displays;
@@ -227,8 +226,6 @@ public class SMAEditor extends AbstractArtifactEditor implements IWorldEditor, I
             }
             onDirtied();
          }
-
-         OseeNotificationManager.getInstance().sendNotifications();
       } catch (Exception ex) {
          OseeLog.log(Activator.class, Level.SEVERE, ex);
       }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationTransitionListener.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationTransitionListener.java
index 9b7f34772d4..867223d4003 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationTransitionListener.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationTransitionListener.java
@@ -22,7 +22,6 @@ import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.internal.AtsClientService;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager;
 
 /**
  * @author Donald G. Dunne
@@ -40,7 +39,6 @@ public class AtsNotificationTransitionListener implements ITransitionListener {
       AtsNotificationManager.notify((AbstractWorkflowArtifact) AtsClientService.get().getArtifact(workItem),
          AtsNotifyType.Subscribed, AtsNotifyType.Completed, AtsNotifyType.Cancelled);
 
-      OseeNotificationManager.getInstance().sendNotifications();
    }
 
 }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ReAssignATSObjectsToUser.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ReAssignATSObjectsToUser.java
index d6bdd648586..983417aaaac 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ReAssignATSObjectsToUser.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ReAssignATSObjectsToUser.java
@@ -15,16 +15,15 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.osee.ats.core.client.util.AtsChangeSet;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.internal.AtsClientService;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.skynet.core.User;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
 import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
-import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager;
 import org.eclipse.osee.framework.ui.skynet.util.ArtifactTypeAndDescriptiveLabelProvider;
 import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ArtifactCheckTreeDialog;
 import org.eclipse.osee.framework.ui.swt.Displays;
@@ -61,7 +60,8 @@ public class ReAssignATSObjectsToUser extends AbstractBlam {
                }
 
                // Get all things user is directly assigned to
-               Collection<Artifact> assignedToArts = AtsUtil.getAssigned(AtsClientService.get().getUserAdmin().getUserFromOseeUser(fromUser));
+               Collection<Artifact> assignedToArts =
+                  AtsUtil.getAssigned(AtsClientService.get().getUserAdmin().getUserFromOseeUser(fromUser));
                Set<Artifact> atsArts = new HashSet<Artifact>();
                for (Artifact assignedArt : assignedToArts) {
                   if (assignedArt instanceof AbstractWorkflowArtifact) {
@@ -83,15 +83,18 @@ public class ReAssignATSObjectsToUser extends AbstractBlam {
                }
                final Collection<Artifact> artsToReAssign = dialog.getSelection();
 
+               AtsChangeSet changes = new AtsChangeSet("ReAssign ATS Object to User");
                // Make the changes and persist
                for (Artifact artifact : artsToReAssign) {
                   if (artifact instanceof AbstractWorkflowArtifact) {
-                     ((AbstractWorkflowArtifact) artifact).getStateMgr().removeAssignee(AtsClientService.get().getUserAdmin().getUserFromOseeUser(fromUser));
-                     ((AbstractWorkflowArtifact) artifact).getStateMgr().addAssignee(AtsClientService.get().getUserAdmin().getUserFromOseeUser(toUser));
+                     AbstractWorkflowArtifact awa = (AbstractWorkflowArtifact) artifact;
+                     awa.getStateMgr().removeAssignee(
+                        AtsClientService.get().getUserAdmin().getUserFromOseeUser(fromUser));
+                     awa.getStateMgr().addAssignee(AtsClientService.get().getUserAdmin().getUserFromOseeUser(toUser));
+                     changes.add(awa);
                   }
                }
-               Artifacts.persistInTransaction("Re-Assign ATS Objects to User", artsToReAssign);
-               OseeNotificationManager.getInstance().sendNotifications();
+               changes.execute();
             } catch (Exception ex) {
                log(ex);
             }