Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2016-03-03 23:56:44 +0000
committerRyan D. Brooks2016-03-03 23:56:44 +0000
commita09bde6557e86373d107c15ac9514f7ba3fcb358 (patch)
tree32dbcfd89b770f8bb2ae3762a1c9073f2b63cfac
parent94993486374754a3f1937ca6da2d419df6538b8d (diff)
downloadorg.eclipse.osee-a09bde6557e86373d107c15ac9514f7ba3fcb358.tar.gz
org.eclipse.osee-a09bde6557e86373d107c15ac9514f7ba3fcb358.tar.xz
org.eclipse.osee-a09bde6557e86373d107c15ac9514f7ba3fcb358.zip
feature[ats_ATS263337]: (40) Remove unnecessary ProgramManager methods
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/program/IAtsProgramService.java2
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java3
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgramManager.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/program/AtsProgramService.java7
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java22
6 files changed, 23 insertions, 16 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/program/IAtsProgramService.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/program/IAtsProgramService.java
index 382dddf524a..89a43dc9f75 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/program/IAtsProgramService.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/program/IAtsProgramService.java
@@ -112,4 +112,6 @@ public interface IAtsProgramService {
Collection<IAtsTeamWorkflow> getWorkflows(IAtsProgram program, WorkType workType);
+ Collection<IAtsTeamWorkflow> getWorkflows(IAtsProgram program);
+
}
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java
index f3894f25682..a1ca15be17c 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.ats.api.query;
import java.util.Collection;
import java.util.List;
-import org.eclipse.osee.ats.api.IAtsConfigObject;
import org.eclipse.osee.ats.api.IAtsObject;
import org.eclipse.osee.ats.api.IAtsWorkItem;
import org.eclipse.osee.ats.api.ai.IAtsActionableItem;
@@ -39,7 +38,7 @@ public interface IAtsQuery {
<T extends IAtsWorkItem> Collection<T> getItems() throws OseeCoreException;
- <T extends IAtsConfigObject> Collection<T> getItems(Class<T> clazz);
+ <T extends IAtsWorkItem> Collection<T> getItems(Class<T> clazz);
IAtsQuery andAttr(IAttributeType attributeType, Collection<String> values, QueryOption... queryOption) throws OseeCoreException;
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgramManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgramManager.java
index 21838c22d9e..4792f12a33d 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgramManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgramManager.java
@@ -22,8 +22,6 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
*/
public interface IAtsProgramManager {
- public String getName(TeamWorkFlowArtifact teamArt);
-
public boolean isApplicable(TeamWorkFlowArtifact teamArt);
public IOperation createValidateReqChangesOp(TeamWorkFlowArtifact teamArt) throws OseeCoreException;
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/program/AtsProgramService.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/program/AtsProgramService.java
index 8e5cf03e584..f41f30700e8 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/program/AtsProgramService.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/program/AtsProgramService.java
@@ -341,6 +341,13 @@ public class AtsProgramService implements IAtsProgramService {
}
@Override
+ public Collection<IAtsTeamWorkflow> getWorkflows(IAtsProgram program) throws OseeCoreException {
+ Collection<IAtsTeamDefinition> workTypeTeamDefs = getTeamDefs(program);
+ return services.getQueryService().createQuery(WorkItemType.TeamWorkflow).andTeam(workTypeTeamDefs).getItems(
+ IAtsTeamWorkflow.class);
+ }
+
+ @Override
public Collection<IAtsTeamWorkflow> getWorkflows(IAtsProgram program, Collection<WorkType> workTypes, IAtsWorkItem workItem) throws OseeCoreException {
if (workTypes.contains(WorkType.All)) {
throw new OseeArgumentException("Invalid option ALL for getWorkflow");
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java
index 69d01e3d726..fa1ee1a0b59 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java
@@ -19,7 +19,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
-import org.eclipse.osee.ats.api.IAtsConfigObject;
import org.eclipse.osee.ats.api.IAtsObject;
import org.eclipse.osee.ats.api.IAtsServices;
import org.eclipse.osee.ats.api.IAtsWorkItem;
@@ -1005,7 +1004,7 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery {
}
@Override
- public <T extends IAtsConfigObject> Collection<T> getItems(Class<T> clazz) {
+ public <T extends IAtsWorkItem> Collection<T> getItems(Class<T> clazz) {
return org.eclipse.osee.framework.jdk.core.util.Collections.castAll(getItems());
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java
index 3e5c070c8b9..a0e1d872872 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osee.ats.api.commit.ICommitConfigItem;
import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
+import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.internal.Activator;
import org.eclipse.osee.ats.internal.AtsClientService;
@@ -48,27 +49,27 @@ import org.eclipse.osee.framework.ui.swt.Displays;
* @author Donald G. Dunne
*/
public class CreateActionArtifactChangeReportJob extends Job {
- private final Set<TeamWorkFlowArtifact> teamArts;
+ private final Set<IAtsTeamWorkflow> teamWfs;
private final IAttributeType attributeType;
- public CreateActionArtifactChangeReportJob(String jobName, Set<TeamWorkFlowArtifact> teamArts, IAttributeType attributeType) {
+ public CreateActionArtifactChangeReportJob(String jobName, Set<IAtsTeamWorkflow> teamWfs, IAttributeType attributeType) {
super(jobName);
- this.teamArts = teamArts;
+ this.teamWfs = teamWfs;
this.attributeType = attributeType;
}
@Override
public IStatus run(IProgressMonitor monitor) {
- return runIt(monitor, getName(), teamArts, attributeType);
+ return runIt(monitor, getName(), teamWfs, attributeType);
}
- public static IStatus runIt(IProgressMonitor monitor, String jobName, Collection<TeamWorkFlowArtifact> teamArts, IAttributeType attributeType) {
+ public static IStatus runIt(IProgressMonitor monitor, String jobName, Collection<IAtsTeamWorkflow> teamWfs, IAttributeType attributeType) {
XResultData rd = new XResultData();
try {
- if (teamArts.isEmpty()) {
+ if (teamWfs.isEmpty()) {
throw new OseeStateException("No Actions/Workflows Specified");
}
- retrieveData(monitor, teamArts, attributeType, rd);
+ retrieveData(monitor, teamWfs, attributeType, rd);
if (rd.toString().equals("")) {
rd.log("No Problems Found");
}
@@ -97,16 +98,17 @@ public class CreateActionArtifactChangeReportJob extends Job {
/**
* used recursively when originally passed a directory, thus an array of files is accepted
*/
- private static void retrieveData(IProgressMonitor monitor, Collection<TeamWorkFlowArtifact> teamArts, IAttributeType attributeType, XResultData rd) throws OseeCoreException {
+ private static void retrieveData(IProgressMonitor monitor, Collection<IAtsTeamWorkflow> teamWfs, IAttributeType attributeType, XResultData rd) throws OseeCoreException {
monitor.subTask("Retrieving Actions");
int x = 1;
rd.addRaw(AHTML.beginMultiColumnTable(95));
rd.addRaw(AHTML.addHeaderRowMultiColumnTable(
new String[] {"ID", "Bulld", "UI", attributeType.getName(), "RPCR", "Change"}));
- for (TeamWorkFlowArtifact teamArt : teamArts) {
+ for (IAtsTeamWorkflow teamWf : teamWfs) {
+ TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) teamWf.getStoreObject();
String rcprId = teamArt.getSoleAttributeValue(AtsAttributeTypes.LegacyPcrId, "");
- String result = String.format("Processing %s/%s RPCR %s for \"%s\"", x, teamArts.size(), rcprId,
+ String result = String.format("Processing %s/%s RPCR %s for \"%s\"", x, teamWfs.size(), rcprId,
teamArt.getTeamDefinition().getName());
monitor.subTask(result);
rd.log("\nRPCR " + rcprId);

Back to the top