Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2017-04-11 03:02:15 +0000
committerdonald.g.dunne2017-04-17 16:58:29 +0000
commitbe1aa581e9edb6e6eeb624e073109a508b1e7da2 (patch)
tree74ed18d628fda082fd679e37d50a61cb17b41440 /plugins/org.eclipse.osee.ats.core.client
parenta2fee6dcf131b64c3618d1f42d99a3b457a48b33 (diff)
downloadorg.eclipse.osee-be1aa581e9edb6e6eeb624e073109a508b1e7da2.tar.gz
org.eclipse.osee-be1aa581e9edb6e6eeb624e073109a508b1e7da2.tar.xz
org.eclipse.osee-be1aa581e9edb6e6eeb624e073109a508b1e7da2.zip
refactor: Move ActionManager.createAction to services
Diffstat (limited to 'plugins/org.eclipse.osee.ats.core.client')
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java62
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java5
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/HasMembers.java3
3 files changed, 12 insertions, 58 deletions
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java
index 7d96cb0e7a1..6b9c6f27fff 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java
@@ -11,72 +11,22 @@
package org.eclipse.osee.ats.core.client.action;
import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.ats.api.ai.IAtsActionableItem;
-import org.eclipse.osee.ats.api.team.ChangeType;
-import org.eclipse.osee.ats.api.team.CreateTeamOption;
-import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
-import org.eclipse.osee.ats.api.user.IAtsUser;
-import org.eclipse.osee.ats.api.util.IAtsChangeSet;
-import org.eclipse.osee.ats.api.workflow.IAtsAction;
-import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
-import org.eclipse.osee.ats.api.workflow.INewActionListener;
-import org.eclipse.osee.ats.core.client.internal.AtsClientService;
+import org.eclipse.osee.ats.api.workflow.ActionResult;
import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
-import org.eclipse.osee.ats.core.util.ActionFactory;
-import org.eclipse.osee.framework.core.data.IArtifactType;
+import org.eclipse.osee.ats.core.util.AtsObjects;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.jdk.core.util.Conditions;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.jdk.core.util.Collections;
/**
* @author Donald G. Dunne
*/
public class ActionManager {
- public static ActionArtifact createAction(IProgressMonitor monitor, String title, String desc, ChangeType changeType, String priority, boolean validationRequired, Date needByDate, Collection<IAtsActionableItem> actionableItems, Date createdDate, IAtsUser createdBy, INewActionListener newActionListener, IAtsChangeSet changes) throws OseeCoreException {
- Conditions.checkNotNullOrEmptyOrContainNull(actionableItems, "actionableItems");
- // if "tt" is title, this is an action created for development. To
- // make it easier, all fields are automatically filled in for ATS developer
-
- if (monitor != null) {
- monitor.subTask("Creating Action");
- }
- Pair<IAtsAction, Collection<IAtsTeamWorkflow>> result =
- AtsClientService.get().getActionFactory().createAction(createdBy, title, desc, changeType, priority,
- validationRequired, needByDate, actionableItems, createdDate, createdBy, newActionListener, changes);
- return (ActionArtifact) result.getFirst().getStoreObject();
- }
-
- public static TeamWorkFlowArtifact createTeamWorkflow(Artifact actionArt, IAtsTeamDefinition teamDef, Collection<IAtsActionableItem> actionableItems, List<? extends IAtsUser> assignees, IAtsChangeSet changes, Date createdDate, IAtsUser createdBy, INewActionListener newActionListener, CreateTeamOption... createTeamOption) throws OseeCoreException {
- IArtifactType teamWorkflowArtifactType =
- ActionFactory.getTeamWorkflowArtifactType(teamDef, AtsClientService.get().getServices());
-
- IAtsTeamWorkflow teamWf = AtsClientService.get().getActionFactory().createTeamWorkflow((IAtsAction) actionArt,
- teamDef, actionableItems, assignees, createdDate, createdBy, null, teamWorkflowArtifactType, newActionListener,
- changes, createTeamOption);
-
- changes.addWorkflowCreated(teamWf);
-
- return (TeamWorkFlowArtifact) teamWf.getStoreObject();
- }
-
- public static TeamWorkFlowArtifact createTeamWorkflow(Artifact actionArt, IAtsTeamDefinition teamDef, Collection<IAtsActionableItem> actionableItems, List<? extends IAtsUser> assignees, Date createdDate, IAtsUser createdBy, String guid, IArtifactType artifactType, INewActionListener newActionListener, IAtsChangeSet changes, CreateTeamOption... createTeamOption) throws OseeCoreException {
-
- IAtsTeamWorkflow teamWf = AtsClientService.get().getActionFactory().createTeamWorkflow((IAtsAction) actionArt,
- teamDef, actionableItems, assignees, changes, createdDate, createdBy, newActionListener, createTeamOption);
-
- changes.addWorkflowCreated(teamWf);
-
- return (TeamWorkFlowArtifact) teamWf.getStoreObject();
- }
-
public static Collection<TeamWorkFlowArtifact> getTeams(Object object) throws OseeCoreException {
if (object instanceof ActionArtifact) {
return ((ActionArtifact) object).getTeams();
+ } else if (object instanceof ActionResult) {
+ return Collections.castAll(AtsObjects.getArtifacts(((ActionResult) object).getTeamWfArts()));
}
return java.util.Collections.emptyList();
}
@@ -84,6 +34,8 @@ public class ActionManager {
public static TeamWorkFlowArtifact getFirstTeam(Object object) throws OseeCoreException {
if (object instanceof ActionArtifact) {
return ((ActionArtifact) object).getFirstTeam();
+ } else if (object instanceof ActionResult) {
+ return (TeamWorkFlowArtifact) ((ActionResult) object).getFirstTeam();
}
return null;
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java
index d520ebe34d7..fd2e3887c9d 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.ats.core.client.artifact;
import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
+import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.ArtifactTypeId;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.RelationTypeSide;
@@ -31,9 +32,9 @@ public abstract class CollectorArtifact extends AbstractWorkflowArtifact impleme
}
@Override
- public void addMember(Artifact artifact) throws OseeCoreException {
+ public void addMember(ArtifactId artifact) throws OseeCoreException {
if (!getMembers().contains(artifact)) {
- addRelation(USER_DEFINED, membersRelationType, artifact);
+ addRelation(USER_DEFINED, membersRelationType, (Artifact) artifact);
}
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/HasMembers.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/HasMembers.java
index efcbdeadf5c..ece04cd956b 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/HasMembers.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/HasMembers.java
@@ -11,6 +11,7 @@
package org.eclipse.osee.ats.core.client.artifact;
import java.util.List;
+import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -21,6 +22,6 @@ public interface HasMembers {
List<Artifact> getMembers() throws OseeCoreException;
- void addMember(Artifact artifact) throws OseeCoreException;
+ void addMember(ArtifactId artifact) throws OseeCoreException;
}

Back to the top