From 3ea8e3d9d3a8ad0c92d17a51fe900c059f51f236 Mon Sep 17 00:00:00 2001 From: donald.g.dunne Date: Fri, 13 Dec 2013 14:33:12 -0700 Subject: bug[ats_ATS4869]: Alt-left click change of assignee doesn't save Change-Id: I879709022ab3b0bdfc66ed877aade65c2f775ac0 --- .../eclipse/osee/ats/column/AssigneeColumnUI.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'plugins') diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AssigneeColumnUI.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AssigneeColumnUI.java index 5d8d61d023e..8268df47b3b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AssigneeColumnUI.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AssigneeColumnUI.java @@ -23,6 +23,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.core.client.util.AtsChangeSet; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.column.AssigneeColumn; import org.eclipse.osee.ats.internal.Activator; @@ -35,7 +36,6 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; 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.FrameworkArtifactImageProvider; import org.eclipse.osee.framework.ui.skynet.util.LogUtil; @@ -87,14 +87,14 @@ public class AssigneeColumnUI extends XViewerAtsColumn implements IXViewerValueC if (!(useArt instanceof AbstractWorkflowArtifact)) { return false; } - boolean modified = - promptChangeAssignees(Arrays.asList((AbstractWorkflowArtifact) useArt), isPersistViewer()); + AbstractWorkflowArtifact awa = (AbstractWorkflowArtifact) useArt; + boolean modified = promptChangeAssignees(Arrays.asList(awa), isPersistViewer()); XViewer xViewer = ((XViewerColumn) treeColumn.getData()).getTreeViewer(); if (modified && isPersistViewer(xViewer)) { - useArt.persist("persist assignees via alt-left-click"); + AtsChangeSet.execute("persist assignees via alt-left-click", awa); } if (modified) { - xViewer.update(useArt, null); + xViewer.update(awa, null); return true; } } @@ -124,11 +124,13 @@ public class AssigneeColumnUI extends XViewerAtsColumn implements IXViewerValueC UserCheckTreeDialog uld = new UserCheckTreeDialog(); uld.setMessage("Select to assign.\nDeSelect to un-assign."); if (awas.iterator().next().getParentTeamWorkflow() != null) { - uld.setTeamMembers(AtsClientService.get().getUserAdmin().getOseeUsers(awas.iterator().next().getParentTeamWorkflow().getTeamDefinition().getMembersAndLeads())); + uld.setTeamMembers(AtsClientService.get().getUserAdmin().getOseeUsers( + awas.iterator().next().getParentTeamWorkflow().getTeamDefinition().getMembersAndLeads())); } if (awas.size() == 1) { - uld.setInitialSelections(AtsClientService.get().getUserAdmin().getOseeUsers(awas.iterator().next().getStateMgr().getAssignees())); + uld.setInitialSelections(AtsClientService.get().getUserAdmin().getOseeUsers( + awas.iterator().next().getStateMgr().getAssignees())); } if (uld.open() != 0) { return false; @@ -146,7 +148,7 @@ public class AssigneeColumnUI extends XViewerAtsColumn implements IXViewerValueC awa.getStateMgr().setAssignees(users); } if (persist) { - Artifacts.persistInTransaction("Assignee - Prompt Change", awas); + AtsChangeSet.execute("Assignee - Prompt Change", awas); } return true; } @@ -203,7 +205,8 @@ public class AssigneeColumnUI extends XViewerAtsColumn implements IXViewerValueC return null; } if (artifact instanceof AbstractWorkflowArtifact) { - return FrameworkArtifactImageProvider.getUserImage(AtsClientService.get().getUserAdmin().getOseeUsers(((AbstractWorkflowArtifact) artifact).getStateMgr().getAssignees())); + return FrameworkArtifactImageProvider.getUserImage(AtsClientService.get().getUserAdmin().getOseeUsers( + ((AbstractWorkflowArtifact) artifact).getStateMgr().getAssignees())); } if (artifact.isOfType(AtsArtifactTypes.Action)) { for (TeamWorkFlowArtifact team : ActionManager.getTeams(artifact)) { -- cgit v1.2.3