diff options
Diffstat (limited to 'plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats')
73 files changed, 228 insertions, 144 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ConvertActionableItemsAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ConvertActionableItemsAction.java index 8882f67b645..486ee9e98d3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ConvertActionableItemsAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ConvertActionableItemsAction.java @@ -28,6 +28,7 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.widgets.dialog.AICheckTreeDialog; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; @@ -108,7 +109,7 @@ public class ConvertActionableItemsAction extends Action { // "You will be prompted to confirm this conversion.", Active.Both); - diag.setInput(ActionableItems.getTopLevelActionableItems(Active.Both)); + diag.setInput(ActionableItems.getTopLevelActionableItems(Active.Both, AtsClientService.get().getConfig())); if (diag.open() != 0) { return Result.FalseResult; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewAction.java index 474375a26ea..4814f233955 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewAction.java @@ -15,6 +15,7 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.actions.wizard.NewActionWizard; import org.eclipse.osee.ats.core.config.ActionableItems; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.ui.PlatformUI; @@ -42,7 +43,8 @@ public class NewAction extends AbstractAtsAction { public void runWithException() throws OseeCoreException { NewActionWizard wizard = new NewActionWizard(); if (actionableItem != null) { - wizard.setInitialAias(ActionableItems.getActionableItems(Arrays.asList(actionableItem))); + wizard.setInitialAias(ActionableItems.getActionableItems(Arrays.asList(actionableItem), + AtsClientService.get().getConfig())); } if (initialDescription != null) { wizard.setInitialDescription(initialDescription); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenVersionArtifactAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenVersionArtifactAction.java index 59b24364407..047219b86f1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenVersionArtifactAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenVersionArtifactAction.java @@ -11,7 +11,6 @@ package org.eclipse.osee.ats.actions; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; @@ -35,9 +34,9 @@ public class OpenVersionArtifactAction extends AbstractAtsAction { @Override public void runWithException() throws OseeCoreException { - if (AtsVersionService.get().hasTargetedVersion(sma)) { + if (AtsClientService.get().getVersionService().hasTargetedVersion(sma)) { RendererManager.open( - AtsClientService.get().getConfigArtifact(AtsVersionService.get().getTargetedVersion(sma)), + AtsClientService.get().getConfigArtifact(AtsClientService.get().getVersionService().getTargetedVersion(sma)), PresentationType.DEFAULT_OPEN); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java index 05485241cd6..04603b818b8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java @@ -121,7 +121,8 @@ public class NewActionPage1 extends WizardPage { treeViewer.getViewer().setContentProvider(new AITreeContentProvider(Active.Active)); treeViewer.getViewer().setLabelProvider(new AtsObjectLabelProvider()); try { - treeViewer.getViewer().setInput(ActionableItems.getTopLevelActionableItems(Active.Active)); + treeViewer.getViewer().setInput( + ActionableItems.getTopLevelActionableItems(Active.Active, AtsClientService.get().getConfig())); } catch (Exception ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); } @@ -178,8 +179,8 @@ public class NewActionPage1 extends WizardPage { ((XText) getXWidget("Title")).set("tt"); if (atsAi == null) { atsAi = - AtsClientService.get().getConfig().getSoleByGuid( - ATS_Actionable_Item_Guid_For_Training_And_Demos, IAtsActionableItem.class); + AtsClientService.get().getConfig().getSoleByGuid(ATS_Actionable_Item_Guid_For_Training_And_Demos, + IAtsActionableItem.class); if (atsAi != null) { treeViewer.getViewer().setSelection(new StructuredSelection(Arrays.asList(atsAi))); treeViewer.setInitalChecked(Arrays.asList(atsAi)); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalManager.java index b05c5120139..a08fbe59938 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalManager.java @@ -182,7 +182,7 @@ public final class GoalManager { goalArt.initializeNewStateMachine(Arrays.asList(AtsClientService.get().getUserService().getCurrentUser()), new Date(), AtsClientService.get().getUserService().getCurrentUser(), changes); AtsClientService.get().getUtilService().setAtsId(AtsClientService.get().getSequenceProvider(), goalArt, - TeamDefinitions.getTopTeamDefinition(), changes); + TeamDefinitions.getTopTeamDefinition(AtsClientService.get().getConfig()), changes); changes.add(goalArt); return goalArt; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkflowLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkflowLabelProvider.java index fb50fdf544c..320bbf4be88 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkflowLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkflowLabelProvider.java @@ -11,9 +11,9 @@ package org.eclipse.osee.ats.artifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.Versions; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -28,8 +28,8 @@ public class TeamWorkflowLabelProvider extends ArtifactLabelProvider { public String getText(Object element) { TeamWorkFlowArtifact teamWf = (TeamWorkFlowArtifact) element; try { - if (AtsVersionService.get().hasTargetedVersion(teamWf)) { - return "[" + teamWf.getTeamName() + "][" + Versions.getTargetedVersionStr(teamWf) + "] - " + teamWf.getName(); + if (AtsClientService.get().getVersionService().hasTargetedVersion(teamWf)) { + return "[" + teamWf.getTeamName() + "][" + Versions.getTargetedVersionStr(teamWf, AtsClientService.get().getVersionService()) + "] - " + teamWf.getName(); } else { return "[" + teamWf.getTeamName() + "] - " + teamWf.getName(); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java index c6025887420..8e59b23d3c5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/WorkflowManager.java @@ -32,7 +32,6 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; import org.eclipse.osee.ats.core.client.workflow.PriorityUtil; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; import org.eclipse.osee.ats.core.workflow.WorkflowManagerCore; @@ -60,7 +59,7 @@ public class WorkflowManager { awa.isAccessControlWrite() && // (WorkflowManagerCore.isEditable(AtsClientService.get().getUserService().getCurrentUser(), awa, - awa.getStateDefinition(), privilegedEditEnabled) || // + awa.getStateDefinition(), privilegedEditEnabled, AtsClientService.get().getUserService()) || // // page is define to allow anyone to edit awa.getStateDefinition().hasRule(RuleDefinitionOption.AllowAssigneeToAll.name()) || // awa is child of TeamWorkflow that has AllowAssigneeToAll rule @@ -209,7 +208,7 @@ public class WorkflowManager { public static Double getHoursSpent(Collection<AbstractWorkflowArtifact> artifacts) throws OseeCoreException { Double hoursSpent = 0.0; for (AbstractWorkflowArtifact awa : artifacts) { - hoursSpent += HoursSpentUtil.getHoursSpentTotal(awa); + hoursSpent += HoursSpentUtil.getHoursSpentTotal(awa, AtsClientService.get().getServices()); } return hoursSpent; } @@ -284,10 +283,10 @@ public class WorkflowManager { if (awa.getParentTeamWorkflow() == null) { continue; } - if (!AtsVersionService.get().hasTargetedVersion(awa)) { + if (!AtsClientService.get().getVersionService().hasTargetedVersion(awa)) { continue; } - if (versionArts.contains(AtsVersionService.get().getTargetedVersion(awa))) { + if (versionArts.contains(AtsClientService.get().getVersionService().getTargetedVersion(awa))) { returnawas.add(awa); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AbstractWorkflowVersionDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AbstractWorkflowVersionDateColumn.java index 8ce50ff4880..27827e5f4c8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AbstractWorkflowVersionDateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AbstractWorkflowVersionDateColumn.java @@ -20,7 +20,7 @@ import org.eclipse.osee.ats.api.version.IAtsVersion; 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.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -77,7 +77,7 @@ public abstract class AbstractWorkflowVersionDateColumn extends XViewerAtsAttrib public static Date getDateFromTargetedVersion(IAttributeType attributeType, Object object) throws OseeCoreException { if (Artifacts.isOfType(object, AtsArtifactTypes.TeamWorkflow)) { TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) object; - IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(teamArt); + IAtsVersion verArt = AtsClientService.get().getVersionService().getTargetedVersion(teamArt); if (verArt != null) { if (attributeType == AtsAttributeTypes.ReleaseDate) { return verArt.getReleaseDate(); @@ -107,7 +107,7 @@ public abstract class AbstractWorkflowVersionDateColumn extends XViewerAtsAttrib String versionDate = getDateStrFromTargetedVersion(attributeType, artifact); if (Strings.isValid(workflowDate) && Strings.isValid(versionDate)) { return String.format("%s; [%s - %s]", workflowDate, - AtsVersionService.get().getTargetedVersion(artifact), versionDate); + AtsClientService.get().getVersionService().getTargetedVersion(artifact), versionDate); } else if (Strings.isValid(workflowDate)) { return workflowDate; } else if (Strings.isValid(versionDate)) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ChangeTypeColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ChangeTypeColumn.java index 10946cf597a..ed105b15eb6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ChangeTypeColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ChangeTypeColumn.java @@ -25,8 +25,8 @@ 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.client.workflow.ChangeTypeUtil; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; import org.eclipse.osee.ats.workflow.ChangeTypeDialog; import org.eclipse.osee.ats.workflow.ChangeTypeToSwtImage; @@ -79,7 +79,8 @@ public class ChangeTypeColumn extends XViewerAtsAttributeValueColumn { try { for (TeamWorkFlowArtifact team : teams) { - if (AtsVersionService.get().isReleased(team) || AtsVersionService.get().isVersionLocked(team)) { + if (AtsClientService.get().getVersionService().isReleased(team) || AtsClientService.get().getVersionService().isVersionLocked( + team)) { AWorkbench.popup("ERROR", "Team Workflow\n \"" + team.getName() + "\"\n version is locked or already released."); return false; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentSMAStateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentSMAStateColumn.java index 31d3459cd51..a9d14ce64c9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentSMAStateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentSMAStateColumn.java @@ -15,6 +15,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -52,7 +53,8 @@ public class HoursSpentSMAStateColumn extends XViewerAtsColumn implements IXView public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { if (element instanceof IAtsWorkItem) { - return AtsUtilCore.doubleToI18nString(HoursSpentUtil.getHoursSpentSMAState((IAtsWorkItem) element)); + return AtsUtilCore.doubleToI18nString(HoursSpentUtil.getHoursSpentSMAState((IAtsWorkItem) element, + AtsClientService.get().getServices())); } } catch (OseeCoreException ex) { return LogUtil.getCellExceptionString(ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateReviewColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateReviewColumn.java index d4f463c7cf6..6c2f2a3cffc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateReviewColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateReviewColumn.java @@ -15,6 +15,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -53,7 +54,8 @@ public class HoursSpentStateReviewColumn extends XViewerAtsColumn implements IXV public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { if (element instanceof IAtsWorkItem) { - return AtsUtilCore.doubleToI18nString(HoursSpentUtil.getHoursSpentStateReview((IAtsWorkItem) element)); + return AtsUtilCore.doubleToI18nString(HoursSpentUtil.getHoursSpentStateReview((IAtsWorkItem) element, + AtsClientService.get().getServices())); } } catch (OseeCoreException ex) { return LogUtil.getCellExceptionString(ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTasksColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTasksColumn.java index f67c6d7ce42..11ba6dbee16 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTasksColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTasksColumn.java @@ -15,6 +15,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -53,7 +54,8 @@ public class HoursSpentStateTasksColumn extends XViewerAtsColumn implements IXVi public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { if (element instanceof IAtsWorkItem) { - return AtsUtilCore.doubleToI18nString(HoursSpentUtil.getHoursSpentFromStateTasks((IAtsWorkItem) element)); + return AtsUtilCore.doubleToI18nString(HoursSpentUtil.getHoursSpentFromStateTasks((IAtsWorkItem) element, + AtsClientService.get().getServices())); } } catch (OseeCoreException ex) { return LogUtil.getCellExceptionString(ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTotalColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTotalColumn.java index 95de4a7eefc..09ed4c47266 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTotalColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentStateTotalColumn.java @@ -15,6 +15,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -52,7 +53,8 @@ public class HoursSpentStateTotalColumn extends XViewerAtsColumn implements IXVi public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { if (element instanceof IAtsWorkItem) { - return AtsUtilCore.doubleToI18nString(HoursSpentUtil.getHoursSpentStateTotal((IAtsWorkItem) element)); + return AtsUtilCore.doubleToI18nString(HoursSpentUtil.getHoursSpentStateTotal((IAtsWorkItem) element, + AtsClientService.get().getServices())); } } catch (OseeCoreException ex) { return LogUtil.getCellExceptionString(ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentTotalColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentTotalColumn.java index 6ced08438ad..6251cd775f5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentTotalColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/HoursSpentTotalColumn.java @@ -15,6 +15,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.util.HoursSpentUtil; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -52,7 +53,8 @@ public class HoursSpentTotalColumn extends XViewerAtsColumn implements IXViewerV public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { if (element instanceof IAtsWorkItem) { - return AtsUtilCore.doubleToI18nString(HoursSpentUtil.getHoursSpentTotal((IAtsWorkItem) element)); + return AtsUtilCore.doubleToI18nString(HoursSpentUtil.getHoursSpentTotal((IAtsWorkItem) element, + AtsClientService.get().getServices())); } } catch (OseeCoreException ex) { return LogUtil.getCellExceptionString(ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PercentCompleteTotalColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PercentCompleteTotalColumn.java index 818596a9153..b5b52f6ef8b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PercentCompleteTotalColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PercentCompleteTotalColumn.java @@ -14,6 +14,7 @@ import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.core.util.PercentCompleteTotalUtil; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -51,7 +52,8 @@ public class PercentCompleteTotalColumn extends XViewerAtsColumn implements IXVi public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { if (element instanceof IAtsWorkItem) { - return String.valueOf(PercentCompleteTotalUtil.getPercentCompleteTotal((IAtsWorkItem) element)); + return String.valueOf(PercentCompleteTotalUtil.getPercentCompleteTotal((IAtsWorkItem) element, + AtsClientService.get().getServices())); } } catch (OseeCoreException ex) { return LogUtil.getCellExceptionString(ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PriorityColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PriorityColumn.java index 0d556570463..a7b02de7db4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PriorityColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/PriorityColumn.java @@ -20,8 +20,8 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.PromptChangeUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -64,7 +64,8 @@ public class PriorityColumn extends XViewerAtsAttributeValueColumn { try { for (TeamWorkFlowArtifact team : teams) { - if (AtsVersionService.get().isReleased(team) || AtsVersionService.get().isVersionLocked(team)) { + if (AtsClientService.get().getVersionService().isReleased(team) || AtsClientService.get().getVersionService().isVersionLocked( + team)) { AWorkbench.popup("ERROR", "Team Workflow\n \"" + team.getName() + "\"\n version is locked or already released."); return false; @@ -98,7 +99,7 @@ public class PriorityColumn extends XViewerAtsAttributeValueColumn { return false; } TeamWorkFlowArtifact team = (TeamWorkFlowArtifact) useArt; - if (AtsVersionService.get().isReleased(team) || AtsVersionService.get().isVersionLocked(team)) { + if (AtsClientService.get().getVersionService().isReleased(team) || AtsClientService.get().getVersionService().isVersionLocked(team)) { AWorkbench.popup("ERROR", "Team Workflow\n \"" + team.getName() + "\"\n version is locked or already released."); return false; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumn.java index cde373e5b29..c0e5bd171d8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/TargetedVersionColumn.java @@ -31,9 +31,9 @@ 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.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.Versions; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.widgets.dialog.VersionListDialog; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; @@ -128,7 +128,8 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV AWorkbench.popup("ERROR", "Team \"" + teamArt.getTeamDefinition().getName() + "\" doesn't use versions."); return false; } - if (AtsVersionService.get().isReleased(teamArt) || AtsVersionService.get().isVersionLocked(teamArt)) { + if (AtsClientService.get().getVersionService().isReleased(teamArt) || AtsClientService.get().getVersionService().isVersionLocked( + teamArt)) { String error = "Team Workflow\n \"" + teamArt.getName() + "\"\n targeted version is locked or already released."; if (AtsUtilClient.isAtsAdmin() && !MessageDialog.openConfirm(Displays.getActiveShell(), "Change Version", @@ -155,9 +156,9 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV final VersionListDialog vld = new VersionListDialog("Select Version", "Select Version", teamDefHoldingVersions.getVersions( versionReleaseType, versionLockType)); - if (awas.size() == 1 && AtsVersionService.get().hasTargetedVersion(teamArt)) { + if (awas.size() == 1 && AtsClientService.get().getVersionService().hasTargetedVersion(teamArt)) { Object[] objs = new Object[1]; - objs[0] = AtsVersionService.get().getTargetedVersion(teamArt); + objs[0] = AtsClientService.get().getVersionService().getTargetedVersion(teamArt); vld.setInitialSelections(objs); } int result = vld.open(); @@ -178,7 +179,7 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV } for (TeamWorkFlowArtifact teamArt1 : awas) { - AtsVersionService.get().setTargetedVersionAndStore(teamArt1, newVersion); + AtsClientService.get().getVersionService().setTargetedVersionAndStore(teamArt1, newVersion); } Artifacts.persistInTransaction("ATS Prompt Change Version", awas); return true; @@ -190,7 +191,7 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { - String str = Versions.getTargetedVersionStr(team); + String str = Versions.getTargetedVersionStr(team, AtsClientService.get().getVersionService()); if (Strings.isValid(str)) { strs.add(str); } @@ -198,7 +199,7 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV return Collections.toString(";", strs); } else { - return Versions.getTargetedVersionStr(element); + return Versions.getTargetedVersionStr(element, AtsClientService.get().getVersionService()); } } catch (OseeCoreException ex) { return LogUtil.getCellExceptionString(ex); @@ -218,7 +219,8 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV } } - promptChangeVersion(awas, AtsUtilClient.isAtsAdmin() ? VersionReleaseType.Both : VersionReleaseType.UnReleased, + promptChangeVersion(awas, + AtsUtilClient.isAtsAdmin() ? VersionReleaseType.Both : VersionReleaseType.UnReleased, AtsUtilClient.isAtsAdmin() ? VersionLockedType.Both : VersionLockedType.UnLocked); getXViewer().update(awas.toArray(), null); return; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java index be92f715cca..589391f8864 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigOperation.java @@ -28,7 +28,6 @@ import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.api.workdef.IWorkDefinitionMatch; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; import org.eclipse.osee.ats.core.client.util.AtsUtilClient; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; @@ -125,7 +124,7 @@ public class AtsConfigOperation extends AbstractOperation { IAtsTeamDefinition teamDef = AtsClientService.get().createTeamDefinition(GUID.create(), teamDefName); teamDef.getLeads().add(AtsClientService.get().getUserService().getCurrentUser()); teamDef.getMembers().add(AtsClientService.get().getUserService().getCurrentUser()); - TeamDefinitions.getTopTeamDefinition().getChildrenTeamDefinitions().add(teamDef); + TeamDefinitions.getTopTeamDefinition(AtsClientService.get().getConfig()).getChildrenTeamDefinitions().add(teamDef); AtsClientService.get().storeConfigObject(teamDef, changes); return teamDef; } @@ -162,7 +161,7 @@ public class AtsConfigOperation extends AbstractOperation { IAtsVersion version = AtsClientService.get().createVersion(name); teamDef.getVersions().add(version); AtsClientService.get().storeConfigObject(version, changes); - AtsVersionService.get().setTeamDefinition(version, teamDef); + AtsClientService.get().getVersionService().setTeamDefinition(version, teamDef); } } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/ConfigData.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/ConfigData.java index 34635b0a5b3..8e3489d36b5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/ConfigData.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/ConfigData.java @@ -15,6 +15,7 @@ import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.TeamDefinitions; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -94,7 +95,7 @@ public class ConfigData { if (teamDef.getParentTeamDef() != null) { parentTeamDef = teamDef.getParentTeamDef(); } else { - parentTeamDef = TeamDefinitions.getTopTeamDefinition(); + parentTeamDef = TeamDefinitions.getTopTeamDefinition(AtsClientService.get().getConfig()); } return parentTeamDef; } @@ -106,7 +107,7 @@ public class ConfigData { if (fromAias.size() == 1) { parentActionableItem = fromAias.iterator().next().getParentActionableItem(); } else { - parentActionableItem = ActionableItems.getTopActionableItem(); + parentActionableItem = ActionableItems.getTopActionableItem(AtsClientService.get().getConfig()); } return parentActionableItem; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigResultsEditorNavigateItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigResultsEditorNavigateItem.java index f12201960bc..44e29da7040 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigResultsEditorNavigateItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigResultsEditorNavigateItem.java @@ -20,6 +20,7 @@ import org.eclipse.osee.ats.api.IAtsConfigObject; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; @@ -37,8 +38,8 @@ public class AtsConfigResultsEditorNavigateItem extends XNavigateItemAction { @Override public void run(TableLoadOption... tableLoadOptions) throws Exception { final List<IAtsConfigObject> objs = new ArrayList<IAtsConfigObject>(); - objs.add(TeamDefinitions.getTopTeamDefinition()); - objs.add(ActionableItems.getTopActionableItem()); + objs.add(TeamDefinitions.getTopTeamDefinition(AtsClientService.get().getConfig())); + objs.add(ActionableItems.getTopActionableItem(AtsClientService.get().getConfig())); Job job = new Job("ATS Config Viewer") { @Override 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 34bc4901814..67e0c71c3e9 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 @@ -35,8 +35,8 @@ import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.navigate.VisitedItems; import org.eclipse.osee.ats.task.IXTaskViewer; import org.eclipse.osee.ats.task.TaskComposite; @@ -618,7 +618,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IWorldEditor, I @Override public IAtsVersion getMetricsVersionArtifact() throws OseeCoreException { - return AtsVersionService.get().getTargetedVersion(awa); + return AtsClientService.get().getVersionService().getTargetedVersion(awa); } @Override diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPercentCompleteHeader.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPercentCompleteHeader.java index e0eb835d140..c60718c6cd1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPercentCompleteHeader.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPercentCompleteHeader.java @@ -17,6 +17,7 @@ import org.eclipse.osee.ats.core.client.util.AtsChangeSet; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.util.PercentCompleteTotalUtil; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -107,7 +108,7 @@ public class SMAPercentCompleteHeader extends Composite { public String getPercentCompleteStr() throws OseeCoreException { int awaPercent = awa.getSoleAttributeValue(AtsAttributeTypes.PercentComplete, 0); - int totalPecent = PercentCompleteTotalUtil.getPercentCompleteTotal(awa); + int totalPecent = PercentCompleteTotalUtil.getPercentCompleteTotal(awa, AtsClientService.get().getServices()); if (awaPercent != totalPecent) { return String.format("%d | %d", awaPercent, totalPecent); } else { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java index 730f0bd87b6..646c9e17b90 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java @@ -117,7 +117,8 @@ public class SMAPrint extends Action { } resultData.addRaw(AHTML.newline()); resultData.addRaw(AtsLogUtility.getHtml(sma.getLog(), - AtsClientService.get().getLogFactory().getLogProvider(sma, AtsClientService.get().getAttributeResolver()))); + AtsClientService.get().getLogFactory().getLogProvider(sma, AtsClientService.get().getAttributeResolver()), + AtsClientService.get().getUserService())); XResultData rd = new XResultData(); rd.addRaw(AHTML.beginMultiColumnTable(100, 1)); @@ -148,8 +149,8 @@ public class SMAPrint extends Action { art.getName(), art.getStateMgr().getCurrentStateName().replaceAll("(Task|State)", ""), AssigneeColumn.instance.getAssigneeStr(art), - PercentCompleteTotalUtil.getPercentCompleteTotal(art) + "", - HoursSpentUtil.getHoursSpentTotal(art) + "", + PercentCompleteTotalUtil.getPercentCompleteTotal(art, AtsClientService.get().getServices()) + "", + HoursSpentUtil.getHoursSpentTotal(art, AtsClientService.get().getServices()) + "", art.getSoleAttributeValue(AtsAttributeTypes.Resolution, ""), art.getAtsId()})); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATargetedVersionHeader.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATargetedVersionHeader.java index 6536dc13815..9661d9f50bd 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATargetedVersionHeader.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATargetedVersionHeader.java @@ -16,8 +16,8 @@ import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.column.TargetedVersionColumn; import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -101,8 +101,8 @@ public class SMATargetedVersionHeader extends Composite { private void updateLabel(AbstractWorkflowArtifact sma) throws OseeCoreException { if (Widgets.isAccessible(valueLabel)) { String value = "Not Set"; - if (AtsVersionService.get().hasTargetedVersion(sma)) { - value = AtsVersionService.get().getTargetedVersion(sma).getName(); + if (AtsClientService.get().getVersionService().hasTargetedVersion(sma)) { + value = AtsClientService.get().getVersionService().getTargetedVersion(sma).getName(); } valueLabel.setText(value); valueLabel.getParent().layout(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java index 699c81df6c6..b558efb1be3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java @@ -86,7 +86,7 @@ public class SMAWorkFlowSection extends SectionPart { isEditable = WorkflowManagerCore.isEditable(AtsClientService.get().getUserService().getCurrentUser(), sma, - page.getStateDefinition(), editor.isPrivilegedEditModeEnabled()); + page.getStateDefinition(), editor.isPrivilegedEditModeEnabled(), AtsClientService.get().getUserService()); isGlobalEditable = !sma.isReadOnly() && sma.isAccessControlWrite() && editor.isPrivilegedEditModeEnabled(); isCurrentState = sma.isInState(page); // parent.setBackground(Displays.getSystemColor(SWT.COLOR_CYAN)); @@ -369,7 +369,7 @@ public class SMAWorkFlowSection extends SectionPart { IAtsLogItem item = sma.getStateMgr().getStateStartedData(statePageName); if (item != null) { sb.append(" by "); - sb.append(AtsLogUtility.getUserName(item.getUserId())); + sb.append(AtsLogUtility.getUserName(item.getUserId(), AtsClientService.get().getUserService())); } } else if (sma.isCancelled()) { if (!sma.getCurrentStateName().equals(StateType.Cancelled.toString())) { @@ -380,7 +380,7 @@ public class SMAWorkFlowSection extends SectionPart { IAtsLogItem item = sma.getStateMgr().getStateStartedData(statePageName); if (item != null) { sb.append(" by "); - sb.append(AtsLogUtility.getUserName(item.getUserId())); + sb.append(AtsLogUtility.getUserName(item.getUserId(), AtsClientService.get().getUserService())); } } if (sma.getStateMgr().getAssignees().size() > 0) { @@ -399,7 +399,7 @@ public class SMAWorkFlowSection extends SectionPart { if (item != null) { sb.append(item.getDate(DateUtil.MMDDYYHHMM)); sb.append(" by "); - sb.append(AtsLogUtility.getUserName(item.getUserId())); + sb.append(AtsLogUtility.getUserName(item.getUserId(), AtsClientService.get().getUserService())); } } return sb.toString(); @@ -433,7 +433,7 @@ public class SMAWorkFlowSection extends SectionPart { sma.getStateDefinition(), sma, WorkflowManagerCore.isEditable(AtsClientService.get().getUserService().getCurrentUser(), sma, - sma.getStateDefinition(), false)); + sma.getStateDefinition(), false, AtsClientService.get().getUserService())); } catch (Exception ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkflowMetricsHeader.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkflowMetricsHeader.java index c609ac4f14c..084fe3f0453 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkflowMetricsHeader.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkflowMetricsHeader.java @@ -83,13 +83,15 @@ public class SMAWorkflowMetricsHeader extends Composite { totalPercentHeader.refresh(); } if (percentLabel != null && !percentLabel.isDisposed()) { - percentLabel.setText(String.valueOf(PercentCompleteTotalUtil.getPercentCompleteTotal(awa))); + percentLabel.setText(String.valueOf(PercentCompleteTotalUtil.getPercentCompleteTotal(awa, + AtsClientService.get().getServices()))); } if (estimatedHoursHeader != null) { estimatedHoursHeader.refresh(); } if (hoursSpentLabel != null && !hoursSpentLabel.isDisposed()) { - hoursSpentLabel.setText(String.valueOf(AtsUtilCore.doubleToI18nString(HoursSpentUtil.getHoursSpentTotal(awa)))); + hoursSpentLabel.setText(String.valueOf(AtsUtilCore.doubleToI18nString(HoursSpentUtil.getHoursSpentTotal( + awa, AtsClientService.get().getServices())))); } if (hoursSpentLabel != null && !hoursSpentLabel.isDisposed()) { Result result = RemainingHoursColumn.isRemainingHoursValid(awa); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WETransitionComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WETransitionComposite.java index 3c07b011130..93a3c51ea01 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WETransitionComposite.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WETransitionComposite.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.osee.ats.api.IAtsServices; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; @@ -193,7 +194,7 @@ public class WETransitionComposite extends Composite { final List<IAtsWorkItem> workItems = Arrays.asList((IAtsWorkItem) awa); final IAtsStateDefinition toStateDef = (IAtsStateDefinition) transitionToStateCombo.getSelected(); final IAtsStateDefinition fromStateDef = awa.getStateDefinition(); - ITransitionHelper helper = new TransitionHelperAdapter() { + ITransitionHelper helper = new TransitionHelperAdapter(AtsClientService.get().getServices()) { private AtsChangeSet changes; @@ -293,6 +294,11 @@ public class WETransitionComposite extends Composite { return java.util.Collections.emptyList(); } + @Override + public IAtsServices getServices() { + return AtsClientService.get().getServices(); + } + }; final TransitionToOperation operation = new TransitionToOperation(helper); Operations.executeAsJob(operation, true, Job.SHORT, new JobChangeAdapter() { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/log/column/LogAuthorColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/log/column/LogAuthorColumn.java index 9432b2b14eb..ee139f947b2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/log/column/LogAuthorColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/log/column/LogAuthorColumn.java @@ -14,6 +14,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerValueColumn; import org.eclipse.osee.ats.api.workflow.log.IAtsLogItem; import org.eclipse.osee.ats.core.workflow.log.AtsLogUtility; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.swt.SWT; /** @@ -44,7 +45,7 @@ public class LogAuthorColumn extends XViewerValueColumn { @Override public String getColumnText(Object element, XViewerColumn column, int columnIndex) { if (element instanceof IAtsLogItem) { - return AtsLogUtility.getUserName(((IAtsLogItem) element).getUserId()); + return AtsLogUtility.getUserName(((IAtsLogItem) element).getUserId(), AtsClientService.get().getUserService()); } return ""; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java index e02568219bb..26c60fde40c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java @@ -318,7 +318,8 @@ public class ReviewInfoXWidget extends XLabelValueBase { AtsChangeSet changes = new AtsChangeSet("Admin Auto-Complete Reviews"); TransitionHelper helper = new TransitionHelper("ATS Auto Complete Reviews", awas, TeamState.Completed.getName(), null, - null, changes, TransitionOption.OverrideTransitionValidityCheck, TransitionOption.None); + null, changes, AtsClientService.get().getServices(), + TransitionOption.OverrideTransitionValidityCheck, TransitionOption.None); IAtsTransitionManager transitionMgr = TransitionFactory.getTransitionManager(helper); TransitionResults results = transitionMgr.handleAllAndPersist(); if (!results.isEmpty()) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/StateHoursSpentXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/StateHoursSpentXWidget.java index e13e7a5cc48..dfb0aba2ecb 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/StateHoursSpentXWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/StateHoursSpentXWidget.java @@ -20,6 +20,7 @@ import org.eclipse.osee.ats.core.util.HoursSpentUtil; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.editor.SMAPromptChangeStatus; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.workdef.StateXWidgetPage; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -86,7 +87,7 @@ public class StateHoursSpentXWidget extends XHyperlinkLabelValueSelection { boolean breakoutNeeded = false; if (sma instanceof AbstractTaskableArtifact && ((AbstractTaskableArtifact) sma).hasTaskArtifacts()) { sb.append(String.format("\n Task Hours: %5.2f", - HoursSpentUtil.getHoursSpentFromStateTasks(sma, page))); + HoursSpentUtil.getHoursSpentFromStateTasks(sma, page, AtsClientService.get().getServices()))); breakoutNeeded = true; } if (sma.isTeamWorkflow() && ReviewManager.hasReviews((TeamWorkFlowArtifact) sma)) { @@ -96,7 +97,8 @@ public class StateHoursSpentXWidget extends XHyperlinkLabelValueSelection { } if (breakoutNeeded) { setToolTip(sb.toString()); - return String.format("%5.2f", HoursSpentUtil.getHoursSpentStateTotal(sma, page)); + return String.format("%5.2f", + HoursSpentUtil.getHoursSpentStateTotal(sma, page, AtsClientService.get().getServices())); } else { return String.format("%5.2f", sma.getStateMgr().getHoursSpent(page.getName())); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/StatePercentCompleteXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/StatePercentCompleteXWidget.java index c20bc7ca2ba..8884c2368e5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/StatePercentCompleteXWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/StatePercentCompleteXWidget.java @@ -20,6 +20,7 @@ import org.eclipse.osee.ats.core.util.PercentCompleteTotalUtil; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.editor.SMAPromptChangeStatus; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.workdef.StateXWidgetPage; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -98,7 +99,8 @@ public class StatePercentCompleteXWidget extends XHyperlinkLabelValueSelection { if (!getControl().isDisposed()) { setToolTip(sb.toString() + "\n" + TOOLTIP); } - return String.valueOf(PercentCompleteTotalUtil.getPercentCompleteSMAStateTotal(sma, page)); + return String.valueOf(PercentCompleteTotalUtil.getPercentCompleteSMAStateTotal(sma, page, + AtsClientService.get().getServices())); } else { return String.valueOf(sma.getStateMgr().getPercentComplete(page.getName())); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/TaskInfoXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/TaskInfoXWidget.java index a1bb9e87782..45cee49dfd9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/TaskInfoXWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/TaskInfoXWidget.java @@ -137,6 +137,7 @@ public class TaskInfoXWidget extends XLabelValueBase { TransitionHelper helper = new TransitionHelper("Transition to Completed", Arrays.asList(taskArt), TaskStates.Completed.getName(), null, null, changes, + AtsClientService.get().getServices(), TransitionOption.OverrideTransitionValidityCheck, TransitionOption.None); IAtsTransitionManager transitionMgr = TransitionFactory.getTransitionManager(helper); TransitionResults results = transitionMgr.handleAll(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java index 5dcbabce1d1..ac05961ba68 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java @@ -49,7 +49,6 @@ 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.util.AtsTaskCache; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.eclipse.osee.ats.core.util.AtsObjects; @@ -638,7 +637,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (parentBranchUuid > 0) { validateBranchUuid(version, parentBranchUuid, results); } - if (AtsVersionService.get().getTeamDefinition(version) == null) { + if (AtsClientService.get().getVersionService().getTeamDefinition(version) == null) { results.log(artifact, "testVersionArtifacts", "Error: " + version.toStringWithId() + " not related to Team Definition"); } @@ -993,7 +992,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { } // Test that targeted version belongs to teamDefHoldingVersion else { - IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(teamArt); + IAtsVersion verArt = AtsClientService.get().getVersionService().getTargetedVersion(teamArt); if (verArt != null && teamArt.getTeamDefinition().getTeamDefinitionHoldingVersions() != null) { if (!teamArt.getTeamDefinition().getTeamDefinitionHoldingVersions().getVersions().contains(verArt)) { results.log( @@ -1023,7 +1022,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { try { if (artifact.isOfType(AtsArtifactTypes.TeamWorkflow)) { TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) artifact; - IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(teamArt); + IAtsVersion verArt = AtsClientService.get().getVersionService().getTargetedVersion(teamArt); if (verArt != null && teamArt.getTeamDefinition().getTeamDefinitionHoldingVersions() != null) { if (!teamArt.getTeamDefinition().getTeamDefinitionHoldingVersions().getVersions().contains(verArt)) { results.log( @@ -1210,7 +1209,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { AtsLogUtility.getHtml( awa.getLog(), AtsClientService.get().getLogFactory().getLogProvider(awa, - AtsClientService.get().getAttributeResolver()), true); + AtsClientService.get().getAttributeResolver()), true, AtsClientService.get().getUserService()); // Verify that all users are resolved for (IAtsLogItem logItem : awa.getLog().getLogItems()) { if (logItem.getUserId() == null) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java index 067bce5d0e6..74d72353b84 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java @@ -148,7 +148,8 @@ public class AtsOseeCmService implements IOseeCmService { if (cType == null) { cType = ChangeType.Improvement; } - Set<IAtsActionableItem> aias = ActionableItems.getActionableItems(productNames); + Set<IAtsActionableItem> aias = + ActionableItems.getActionableItems(productNames, AtsClientService.get().getConfig()); if (aias.isEmpty()) { throw new OseeArgumentException("Can not resolve productNames to Actionable Items"); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java index 620fbcd1348..a8880a807e3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsRemoteEventTestItem.java @@ -32,7 +32,6 @@ 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.ChangeTypeUtil; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.workflow.state.TeamState; import org.eclipse.osee.ats.core.workflow.transition.TransitionFactory; @@ -197,7 +196,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { TransitionHelper helper = new TransitionHelper("Remote Event Test", Arrays.asList(teamArt), TeamState.Analyze.getName(), Collections.singleton(AtsClientService.get().getUserService().getCurrentUser()), null, changes, - TransitionOption.None); + AtsClientService.get().getServices(), TransitionOption.None); IAtsTransitionManager transitionMgr = TransitionFactory.getTransitionManager(helper); TransitionResults results = transitionMgr.handleAllAndPersist(); if (!results.isEmpty()) { @@ -207,7 +206,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { private void makeChanges6(TeamWorkFlowArtifact teamArt) throws OseeCoreException { // Make changes and transition - AtsVersionService.get().setTargetedVersionAndStore(teamArt, getVersion257()); + AtsClientService.get().getVersionService().setTargetedVersionAndStore(teamArt, getVersion257()); teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "false"); teamArt.persist("Remote Event Test"); } @@ -225,13 +224,13 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { teamArt.setSoleAttributeFromString(AtsAttributeTypes.Description, "description 4"); ChangeTypeUtil.setChangeType(teamArt, ChangeType.Support); teamArt.setSoleAttributeFromString(AtsAttributeTypes.PriorityType, "3"); - AtsVersionService.get().setTargetedVersionAndStore(teamArt, getVersion258()); + AtsClientService.get().getVersionService().setTargetedVersionAndStore(teamArt, getVersion258()); teamArt.persist("Remote Event Test"); } private void makeChanges3(TeamWorkFlowArtifact teamArt) throws OseeCoreException { // Make changes and persist - AtsVersionService.get().setTargetedVersionAndStore(teamArt, getVersion257()); + AtsClientService.get().getVersionService().setTargetedVersionAndStore(teamArt, getVersion257()); teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "false"); teamArt.persist(getClass().getSimpleName()); } @@ -249,20 +248,20 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { ChangeTypeUtil.setChangeType(teamArt, ChangeType.Problem); teamArt.setSoleAttributeFromString(AtsAttributeTypes.PriorityType, "2"); teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "true"); - AtsVersionService.get().setTargetedVersionAndStore(teamArt, getVersion256()); + AtsClientService.get().getVersionService().setTargetedVersionAndStore(teamArt, getVersion256()); teamArt.persist("Remote Event Test"); } private IAtsVersion getVersion256() throws OseeCoreException { - return AtsVersionService.get().getById(Version_2_5_6); + return AtsClientService.get().getVersionService().getById(Version_2_5_6); } private IAtsVersion getVersion257() throws OseeCoreException { - return AtsVersionService.get().getById(Version_2_5_7); + return AtsClientService.get().getVersionService().getById(Version_2_5_7); } private IAtsVersion getVersion258() throws OseeCoreException { - return AtsVersionService.get().getById(Version_2_5_8); + return AtsClientService.get().getVersionService().getById(Version_2_5_8); } private void validateActionAtStart(Artifact actionArt) throws OseeCoreException { @@ -298,7 +297,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { testEquals("Validation Required", "false", String.valueOf(teamArt.getSoleAttributeValue(AtsAttributeTypes.ValidationRequired, null))); - IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(teamArt); + IAtsVersion verArt = AtsClientService.get().getVersionService().getTargetedVersion(teamArt); String expectedTargetedVersion; if (verArt != null) { expectedTargetedVersion = verArt.toString(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java index 407c67e8863..9270d8fc1b5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java @@ -26,6 +26,7 @@ import org.eclipse.osee.ats.core.client.workflow.PriorityUtil; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.ats.version.VersionMetrics; import org.eclipse.osee.ats.version.VersionTeamMetrics; @@ -65,7 +66,8 @@ public class FirstTimeQualityMetricReportItem extends XNavigateItemAction { Set<IAtsTeamDefinition> teamReleaseableDefinitions = null; try { - teamReleaseableDefinitions = TeamDefinitions.getTeamReleaseableDefinitions(Active.Both); + teamReleaseableDefinitions = + TeamDefinitions.getTeamReleaseableDefinitions(Active.Both, AtsClientService.get().getConfig()); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Error loading team definitions", ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/ActionTeamDateListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/ActionTeamDateListDialog.java index f768b177333..038fa69f028 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/ActionTeamDateListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/ActionTeamDateListDialog.java @@ -22,6 +22,7 @@ import org.eclipse.osee.ats.api.team.ChangeType; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.ats.util.widgets.dialog.AtsObjectNameSorter; import org.eclipse.osee.ats.workflow.ChangeTypeLabelProvider; @@ -147,7 +148,8 @@ public class ActionTeamDateListDialog extends SelectionDialog { } Set<Object> objs = new HashSet<Object>(); try { - for (IAtsTeamDefinition teamDef : TeamDefinitions.getTeamDefinitions(Active.Both)) { + for (IAtsTeamDefinition teamDef : TeamDefinitions.getTeamDefinitions(Active.Both, + AtsClientService.get().getConfig())) { objs.add(teamDef); } } catch (Exception ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/ExtendedStatusReportJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/ExtendedStatusReportJob.java index c942075be4a..86b0b15af63 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/ExtendedStatusReportJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/ExtendedStatusReportJob.java @@ -30,6 +30,7 @@ import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; import org.eclipse.osee.ats.core.config.Versions; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.DateUtil; @@ -169,7 +170,8 @@ public class ExtendedStatusReportJob extends Job { } else if (col == Columns.Date_Created) { values.add(CreatedDateColumn.getDateStr(sma)); } else if (col == Columns.Version) { - values.add((!Strings.isValid(Versions.getTargetedVersionStr(sma)) ? "." : Versions.getTargetedVersionStr(sma))); + values.add((!Strings.isValid(Versions.getTargetedVersionStr(sma, AtsClientService.get().getVersionService())) ? "." : Versions.getTargetedVersionStr( + sma, AtsClientService.get().getVersionService()))); } } sb.append(AHTML.addRowMultiColumnTable(values.toArray(new String[values.size()]))); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/PublishFullVersionReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/PublishFullVersionReportItem.java index 8c411f5491d..f04eeccdd6a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/PublishFullVersionReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/PublishFullVersionReportItem.java @@ -20,6 +20,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.ats.version.VersionReportJob; import org.eclipse.osee.framework.core.enums.Active; @@ -69,7 +70,7 @@ public class PublishFullVersionReportItem extends XNavigateItemAction { if (useTeamDef == null) { List<IAtsTeamDefinition> teamDefinitions = null; try { - teamDefinitions = TeamDefinitions.getTeamDefinitions(Active.Both); + teamDefinitions = TeamDefinitions.getTeamDefinitions(Active.Both, AtsClientService.get().getConfig()); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Error loading team definitions", ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatusBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatusBlam.java index 57b386352c9..c864d3bea5d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatusBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatusBlam.java @@ -621,7 +621,8 @@ public class DetailedTestStatusBlam extends AbstractBlam { reqTaskMap.put(requirementName, legacyId, requirementStatus); } - int percentComplete = PercentCompleteTotalUtil.getPercentCompleteTotal(task); + int percentComplete = + PercentCompleteTotalUtil.getPercentCompleteTotal(task, AtsClientService.get().getServices()); requirementStatus.addPartitionStatus(percentComplete, taskNameMatcher.group(1), task.getCurrentStateName()); requirementStatus.setTestPocs(task.getImplementers()); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatusOld.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatusOld.java index 6147e49d512..89fec087421 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatusOld.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatusOld.java @@ -547,7 +547,8 @@ public class DetailedTestStatusOld extends AbstractBlam { reqTaskMap.put(requirementName, legacyId, requirementStatus); } - int percentComplete = PercentCompleteTotalUtil.getPercentCompleteTotal(task); + int percentComplete = + PercentCompleteTotalUtil.getPercentCompleteTotal(task, AtsClientService.get().getServices()); requirementStatus.addPartitionStatus(percentComplete, taskNameMatcher.group(1), task.getCurrentStateName()); requirementStatus.setTestPocs(task.getImplementers()); } else { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java index 2aa6bda3c95..e8b68d305d0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java @@ -242,7 +242,8 @@ public class ModifyActionableItemsBlam extends AbstractBlam { } otherTree.getViewer().setInput(ais); - newTree.getViewer().setInput(ActionableItems.getTopLevelActionableItems(Active.Active)); + newTree.getViewer().setInput( + ActionableItems.getTopLevelActionableItems(Active.Active, AtsClientService.get().getConfig())); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java index 8b81d82e3cc..a4784904cf1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java @@ -132,7 +132,8 @@ public class TaskMetrics extends AbstractBlam { assignees = ImplementersColumn.instance.getImplementers(task); } for (IAtsUser user : assignees) { - int percentComplete = PercentCompleteTotalUtil.getPercentCompleteTotal(task); + int percentComplete = + PercentCompleteTotalUtil.getPercentCompleteTotal(task, AtsClientService.get().getServices()); if (percentComplete == COMPLETED_CANCELLED_PERCENT) { if (task.getStateMgr().getStateType().isCompletedOrCancelledState()) { metrics.put(user, COMPLETED_CANCELLED_PERCENT); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewWorldSearchItem.java index 11f1162615c..c2f3c9287f1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewWorldSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewWorldSearchItem.java @@ -31,10 +31,10 @@ import org.eclipse.osee.ats.core.client.review.ReviewManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.workflow.state.TeamState; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.world.search.WorldUISearchItem; import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -166,7 +166,7 @@ public class ReviewWorldSearchItem extends WorldUISearchItem { // don't include if version specified and workflow's not targeted for version if (versionArt != null) { TeamWorkFlowArtifact team = awa.getParentTeamWorkflow(); - IAtsVersion version = AtsVersionService.get().getTargetedVersion(team); + IAtsVersion version = AtsClientService.get().getVersionService().getTargetedVersion(team); if (team != null && (version == null || !version.equals(versionArt))) { return false; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java index cdb6b8c94e2..8f9904a2de3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java @@ -26,9 +26,9 @@ import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.util.AtsChangeSet; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.AtsMetricsComposite; import org.eclipse.osee.ats.world.IAtsMetricsProvider; @@ -325,8 +325,8 @@ public class TaskEditor extends AbstractArtifactEditor implements IAtsMetricsPro @Override public IAtsVersion getMetricsVersionArtifact() throws OseeCoreException { for (TaskArtifact taskArt : tasks) { - if (AtsVersionService.get().hasTargetedVersion(taskArt)) { - return AtsVersionService.get().getTargetedVersion(taskArt); + if (AtsClientService.get().getVersionService().hasTargetedVersion(taskArt)) { + return AtsClientService.get().getVersionService().getTargetedVersion(taskArt); } } return null; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/CreateActionUsingAllActionableItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/CreateActionUsingAllActionableItems.java index 858df3a3505..d8302caa86f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/CreateActionUsingAllActionableItems.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/CreateActionUsingAllActionableItems.java @@ -65,7 +65,8 @@ public class CreateActionUsingAllActionableItems extends XNavigateItemAction { public static ActionArtifact createActionWithAllAis() throws OseeCoreException { Set<IAtsActionableItem> aias = new HashSet<IAtsActionableItem>(); - for (IAtsActionableItem aia : ActionableItems.getActionableItems(Active.Active)) { + for (IAtsActionableItem aia : ActionableItems.getActionableItems(Active.Active, + AtsClientService.get().getConfig())) { if (aia.isActionable()) { aias.add(aia); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java index 31b16c3dd27..b9b8cb07135 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java @@ -44,7 +44,6 @@ import org.eclipse.osee.ats.core.client.artifact.GoalArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUtilClient; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; @@ -182,14 +181,16 @@ public class ExcelAtsActionArtifactExtractor { if (actionArt == null) { actionArt = ActionManager.createAction(null, aData.title, aData.desc, ChangeType.getChangeType(aData.changeType), - aData.priorityStr, false, null, ActionableItems.getActionableItems(aData.actionableItems), + aData.priorityStr, false, null, + ActionableItems.getActionableItems(aData.actionableItems, AtsClientService.get().getConfig()), createdDate, createdBy, null, changes); newTeamArts = ActionManager.getTeams(actionArt); addToGoal(newTeamArts, changes); actionNameToAction.put(aData.title, actionArt); actionArts.add(actionArt); } else { - Set<IAtsActionableItem> aias = ActionableItems.getActionableItems(aData.actionableItems); + Set<IAtsActionableItem> aias = + ActionableItems.getActionableItems(aData.actionableItems, AtsClientService.get().getConfig()); Map<IAtsTeamDefinition, Collection<IAtsActionableItem>> teamDefToAias = getTeamDefToAias(aias); for (Entry<IAtsTeamDefinition, Collection<IAtsActionableItem>> entry : teamDefToAias.entrySet()) { @@ -213,7 +214,7 @@ public class ExcelAtsActionArtifactExtractor { throw new OseeArgumentException("No version [%s] configured for Team Definition [%s]", aData.version, team.getTeamDefinition()); } - AtsVersionService.get().setTargetedVersionAndStore(team, version); + AtsClientService.get().getVersionService().setTargetedVersionAndStore(team, version); } } if (aData.estimatedHours != null) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java index 3d1221103d4..091d83b6945 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java @@ -257,7 +257,7 @@ public class Overview { AtsLogUtility.getTable( artifactLog, AtsClientService.get().getLogFactory().getLogProvider(artifact, - AtsClientService.get().getAttributeResolver())); + AtsClientService.get().getAttributeResolver()), AtsClientService.get().getUserService()); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/WorkflowMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/WorkflowMetrics.java index 42b938d310f..bb7845011ae 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/WorkflowMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/WorkflowMetrics.java @@ -30,6 +30,7 @@ import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.EstimatedHoursUtil; import org.eclipse.osee.ats.core.util.HoursSpentUtil; import org.eclipse.osee.ats.core.util.PercentCompleteTotalUtil; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.DateUtil; @@ -119,9 +120,10 @@ public class WorkflowMetrics { for (AbstractWorkflowArtifact team : awas) { hrsRemainFromEstimates += RemainingHoursColumn.getRemainingHours(team); estHours += EstimatedHoursUtil.getEstimatedHours(team); - hrsSpent += HoursSpentUtil.getHoursSpentTotal(team); + hrsSpent += HoursSpentUtil.getHoursSpentTotal(team, AtsClientService.get().getServices()); manDaysNeeded += WorkDaysNeededColumn.getWorldViewManDaysNeeded(team); - cummulativeWorkflowPercentComplete += PercentCompleteTotalUtil.getPercentCompleteTotal(team); + cummulativeWorkflowPercentComplete += + PercentCompleteTotalUtil.getPercentCompleteTotal(team, AtsClientService.get().getServices()); } if (hrsRemainFromEstimates != 0) { manDaysNeeded = hrsRemainFromEstimates / manHoursPerDay; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XActionableItemCombo.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XActionableItemCombo.java index 9aa3c1980b5..0dd2bcdd3fb 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XActionableItemCombo.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XActionableItemCombo.java @@ -18,6 +18,7 @@ import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.core.config.ActionableItemSorter; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; @@ -45,7 +46,7 @@ public class XActionableItemCombo extends XComboViewer { Collection<IAtsActionableItem> teamDefs = null; try { - teamDefs = ActionableItems.getActionableItems(Active.Active); + teamDefs = ActionableItems.getActionableItems(Active.Active, AtsClientService.get().getConfig()); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Error loading actionable items", ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XTeamDefinitionCombo.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XTeamDefinitionCombo.java index ec224449749..abdf982d8df 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XTeamDefinitionCombo.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XTeamDefinitionCombo.java @@ -18,6 +18,7 @@ import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.TeamDefinitionSorter; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; @@ -46,7 +47,7 @@ public class XTeamDefinitionCombo extends XComboViewer { Collection<IAtsTeamDefinition> teamDefs = null; try { - teamDefs = TeamDefinitions.getTeamDefinitions(Active.Active); + teamDefs = TeamDefinitions.getTeamDefinitions(Active.Active, AtsClientService.get().getConfig()); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Error loading team definitions", ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AICheckTreeDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AICheckTreeDialog.java index 5a37d519479..fdb1220eb18 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AICheckTreeDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AICheckTreeDialog.java @@ -20,6 +20,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.util.Result; @@ -59,7 +60,8 @@ public class AICheckTreeDialog extends OSEECheckedFilteredTreeDialog { protected Control createDialogArea(Composite container) { Control comp = super.createDialogArea(container); try { - getTreeViewer().getViewer().setInput(ActionableItems.getTopLevelActionableItems(active)); + getTreeViewer().getViewer().setInput( + ActionableItems.getTopLevelActionableItems(active, AtsClientService.get().getConfig())); getTreeViewer().getViewer().addSelectionChangedListener(new ISelectionChangedListener() { @Override public void selectionChanged(SelectionChangedEvent event) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java index e7302d0918f..9eb4009a1f2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java @@ -13,6 +13,7 @@ package org.eclipse.osee.ats.util.widgets.dialog; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.logging.OseeLevel; @@ -43,7 +44,7 @@ public class ActionActionableItemListDialog extends OSEECheckedFilteredTreeDialo super("Select Actionable Items", "Select Actionable Items", new AITreeContentProvider(active), new AtsObjectLabelProvider(), new AtsObjectNameSorter()); try { - setInput(ActionableItems.getTopLevelActionableItems(active)); + setInput(ActionableItems.getTopLevelActionableItems(active, AtsClientService.get().getConfig())); } catch (Exception ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamListDialog.java index b817a85bb77..453d7392529 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamListDialog.java @@ -18,6 +18,7 @@ import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.logging.OseeLevel; @@ -58,7 +59,7 @@ public class ActionTeamListDialog extends ListDialog { setMessage("Select Team(s)"); ArrayList<IAtsTeamDefinition> arts = new ArrayList<IAtsTeamDefinition>(); try { - for (IAtsTeamDefinition prod : TeamDefinitions.getTeamDefinitions(active)) { + for (IAtsTeamDefinition prod : TeamDefinitions.getTeamDefinitions(active, AtsClientService.get().getConfig())) { arts.add(prod); } } catch (Exception ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemListDialog.java index 17baf17c021..d46c2e5ec95 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemListDialog.java @@ -15,6 +15,7 @@ import java.util.Set; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.logging.OseeLevel; @@ -31,7 +32,7 @@ public class ActionableItemListDialog extends OSEECheckedFilteredTreeDialog { super("Select Actionable Item(s)", "Select Actionable Item(s)", new AITreeContentProvider(active), new AtsObjectLabelProvider(), new ArtifactNameSorter()); try { - setInput(ActionableItems.getTopLevelActionableItems(active)); + setInput(ActionableItems.getTopLevelActionableItems(active, AtsClientService.get().getConfig())); } catch (Exception ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemTreeWithChildrenDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemTreeWithChildrenDialog.java index 907f57d3a85..1008221937c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemTreeWithChildrenDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemTreeWithChildrenDialog.java @@ -16,6 +16,7 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.core.config.ActionableItems; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -40,7 +41,7 @@ public class ActionableItemTreeWithChildrenDialog extends OSEECheckedFilteredTre protected Composite dialogComp; public ActionableItemTreeWithChildrenDialog(Active active) throws OseeCoreException { - this(active, ActionableItems.getTopLevelActionableItems(active)); + this(active, ActionableItems.getTopLevelActionableItems(active, AtsClientService.get().getConfig())); } public ActionableItemTreeWithChildrenDialog(Active active, Collection<IAtsActionableItem> actionableItems) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionCheckTreeDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionCheckTreeDialog.java index 019f1be22c6..a293a61a36c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionCheckTreeDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionCheckTreeDialog.java @@ -19,6 +19,7 @@ import java.util.Set; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.util.Result; @@ -60,7 +61,8 @@ public class TeamDefinitionCheckTreeDialog extends OSEECheckedFilteredTreeDialog protected Control createDialogArea(Composite container) { Control comp = super.createDialogArea(container); try { - getTreeViewer().getViewer().setInput(TeamDefinitions.getTopLevelTeamDefinitions(active)); + getTreeViewer().getViewer().setInput( + TeamDefinitions.getTopLevelTeamDefinitions(active, AtsClientService.get().getConfig())); if (getInitialTeamDefs() != null) { getTreeViewer().setInitalChecked(getInitialTeamDefs()); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java index 3d897250c4a..d137cf1dda1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeWithChildrenDialog.java @@ -16,6 +16,7 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.TeamDefinitions; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -39,7 +40,7 @@ public class TeamDefinitionTreeWithChildrenDialog extends OSEECheckedFilteredTre protected Composite dialogComp; public TeamDefinitionTreeWithChildrenDialog(Active active) throws OseeCoreException { - this(active, TeamDefinitions.getTeamTopLevelDefinitions(active)); + this(active, TeamDefinitions.getTeamTopLevelDefinitions(active, AtsClientService.get().getConfig())); } public TeamDefinitionTreeWithChildrenDialog(Active active, Collection<IAtsTeamDefinition> TeamDefinitions) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java index 102fdd0ab20..b44e509bd80 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java @@ -18,6 +18,7 @@ import org.eclipse.osee.ats.api.version.VersionLockedType; import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.logging.OseeLevel; @@ -66,7 +67,8 @@ public class TeamVersionListDialog extends SelectionDialog { ArrayList<Object> objs = new ArrayList<Object>(); try { - for (IAtsTeamDefinition art : TeamDefinitions.getTeamReleaseableDefinitions(active)) { + for (IAtsTeamDefinition art : TeamDefinitions.getTeamReleaseableDefinitions(active, + AtsClientService.get().getConfig())) { objs.add(art); } } catch (Exception ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/CreateNewVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/CreateNewVersionItem.java index 8e332dfe681..580f039bd77 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/CreateNewVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/CreateNewVersionItem.java @@ -140,7 +140,7 @@ public class CreateNewVersionItem extends XNavigateItemAction { return teamDefHoldingVersions; } TeamDefinitionDialog ld = new TeamDefinitionDialog("Select Team", "Select Team"); - ld.setInput(TeamDefinitions.getTeamReleaseableDefinitions(Active.Active)); + ld.setInput(TeamDefinitions.getTeamReleaseableDefinitions(Active.Active, AtsClientService.get().getConfig())); int result = ld.open(); if (result == 0) { return (IAtsTeamDefinition) ld.getResult()[0]; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateFullVersionReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateFullVersionReportItem.java index af5fcaebddd..8766aef09c3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateFullVersionReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateFullVersionReportItem.java @@ -20,6 +20,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.util.XResultData; @@ -71,7 +72,8 @@ public class GenerateFullVersionReportItem extends XNavigateItemAction { if (teamDef == null) { Set<IAtsTeamDefinition> teamDefinitions = null; try { - teamDefinitions = TeamDefinitions.getTeamReleaseableDefinitions(Active.Active); + teamDefinitions = + TeamDefinitions.getTeamReleaseableDefinitions(Active.Active, AtsClientService.get().getConfig()); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Error loading team definitions", ex); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/MassEditTeamVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/MassEditTeamVersionItem.java index 6ec88968de2..309648583f4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/MassEditTeamVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/MassEditTeamVersionItem.java @@ -57,7 +57,7 @@ public class MassEditTeamVersionItem extends XNavigateItemAction { return teamDef; } TeamDefinitionDialog ld = new TeamDefinitionDialog("Select Team", "Select Team"); - ld.setInput(TeamDefinitions.getTeamReleaseableDefinitions(Active.Active)); + ld.setInput(TeamDefinitions.getTeamReleaseableDefinitions(Active.Active, AtsClientService.get().getConfig())); int result = ld.open(); if (result == 0) { return (IAtsTeamDefinition) ld.getResult()[0]; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/ReleaseVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/ReleaseVersionItem.java index 7ab0c847de1..80942fb11c8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/ReleaseVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/ReleaseVersionItem.java @@ -20,7 +20,6 @@ import org.eclipse.osee.ats.api.version.VersionReleaseType; 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.util.AtsUtilClient; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.internal.AtsClientService; @@ -69,7 +68,7 @@ public class ReleaseVersionItem extends XNavigateItemAction { IAtsVersion verArt = (IAtsVersion) ld.getResult()[0]; // Validate team lead status - if (!AtsUtilClient.isAtsAdmin() && !AtsVersionService.get().getTeamDefinition(verArt).getLeads().contains( + if (!AtsUtilClient.isAtsAdmin() && !AtsClientService.get().getVersionService().getTeamDefinition(verArt).getLeads().contains( AtsClientService.get().getUserService().getCurrentUser())) { AWorkbench.popup("ERROR", "Only lead can release version."); return; @@ -125,7 +124,7 @@ public class ReleaseVersionItem extends XNavigateItemAction { return teamDefHoldingVersions; } TeamDefinitionDialog ld = new TeamDefinitionDialog("Select Team", "Select Team"); - ld.setInput(TeamDefinitions.getTeamReleaseableDefinitions(Active.Active)); + ld.setInput(TeamDefinitions.getTeamReleaseableDefinitions(Active.Active, AtsClientService.get().getConfig())); int result = ld.open(); if (result == 0) { return (IAtsTeamDefinition) ld.getResult()[0]; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java index ae20fe4f5e2..58789b4f0c0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java @@ -32,6 +32,7 @@ import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.help.ui.AtsHelpContext; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.walker.action.ActionWalkerLayoutAction; import org.eclipse.osee.ats.walker.action.ActionWalkerRefreshAction; @@ -384,7 +385,7 @@ public class ActionWalkerView extends GenericViewPart implements IPartListener, private String getTargetedVersion(Artifact artifact) { try { if (artifact.isOfType(AtsArtifactTypes.TeamWorkflow)) { - String str = Versions.getTargetedVersionStr(artifact); + String str = Versions.getTargetedVersionStr(artifact, AtsClientService.get().getVersionService()); return str.isEmpty() ? "" : str; } } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java index 75e04635888..133c3266acb 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java @@ -67,10 +67,14 @@ public class ImportAIsAndTeamDefinitionsToDb { public void execute() throws OseeCoreException { importUserDefinitions(atsDsl.getUserDef()); - importTeamDefinitions(atsDsl.getTeamDef(), - AtsClientService.get().getConfigArtifact(TeamDefinitions.getTopTeamDefinition())); - importActionableItems(atsDsl.getActionableItemDef(), - AtsClientService.get().getConfigArtifact(ActionableItems.getTopActionableItem())); + importTeamDefinitions( + atsDsl.getTeamDef(), + AtsClientService.get().getConfigArtifact( + TeamDefinitions.getTopTeamDefinition(AtsClientService.get().getConfig()))); + importActionableItems( + atsDsl.getActionableItemDef(), + AtsClientService.get().getConfigArtifact( + ActionableItems.getTopActionableItem(AtsClientService.get().getConfig()))); } private void importUserDefinitions(EList<UserDef> userDefs) throws OseeCoreException { @@ -275,9 +279,13 @@ public class ImportAIsAndTeamDefinitionsToDb { AtsChangeSet changes = new AtsChangeSet(getClass().getSimpleName()); if (parent == null) { if (isTeamDef) { - parent = AtsClientService.get().storeConfigObject(TeamDefinitions.getTopTeamDefinition(), changes); + parent = + AtsClientService.get().storeConfigObject( + TeamDefinitions.getTopTeamDefinition(AtsClientService.get().getConfig()), changes); } else { - parent = AtsClientService.get().storeConfigObject(ActionableItems.getTopActionableItem(), changes); + parent = + AtsClientService.get().storeConfigObject( + ActionableItems.getTopActionableItem(AtsClientService.get().getConfig()), changes); } changes.execute(); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/ConvertAIsAndTeamsToAtsDsl.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/ConvertAIsAndTeamsToAtsDsl.java index 35814d21065..638806a2d29 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/ConvertAIsAndTeamsToAtsDsl.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/provider/ConvertAIsAndTeamsToAtsDsl.java @@ -26,6 +26,7 @@ import org.eclipse.osee.ats.dsl.atsDsl.UserByName; import org.eclipse.osee.ats.dsl.atsDsl.VersionDef; import org.eclipse.osee.ats.dsl.atsDsl.impl.AtsDslFactoryImpl; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; @@ -53,11 +54,13 @@ public class ConvertAIsAndTeamsToAtsDsl { try { // Add all TeamDef definitions - TeamDef topTeam = convertTeamDef(TeamDefinitions.getTopTeamDefinition(), null); + TeamDef topTeam = + convertTeamDef(TeamDefinitions.getTopTeamDefinition(AtsClientService.get().getConfig()), null); atsDsl.getTeamDef().add(topTeam); // Add all AI definitions - ActionableItemDef topAi = convertAIDef(ActionableItems.getTopActionableItem(), null); + ActionableItemDef topAi = + convertAIDef(ActionableItems.getTopActionableItem(AtsClientService.get().getConfig()), null); atsDsl.getActionableItemDef().add(topAi); } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/TransitionToMenu.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/TransitionToMenu.java index ee60fd6eb5d..ec6ce31d19b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/TransitionToMenu.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/TransitionToMenu.java @@ -22,6 +22,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.action.MenuManager; import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.api.IAtsServices; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.util.IAtsChangeSet; @@ -128,7 +129,7 @@ public class TransitionToMenu { } private static void handleTransitionToSelected(final String toStateName, final Set<IAtsWorkItem> workItems) { - final ITransitionHelper helper = new TransitionHelperAdapter() { + final ITransitionHelper helper = new TransitionHelperAdapter(AtsClientService.get().getServices()) { private AtsChangeSet changes; @@ -260,6 +261,11 @@ public class TransitionToMenu { return java.util.Collections.emptyList(); } + @Override + public IAtsServices getServices() { + return AtsClientService.get().getServices(); + } + }; final TransitionToOperation operation = new TransitionToOperation(helper); Operations.executeAsJob(operation, true, Job.SHORT, new JobChangeAdapter() { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java index 5f1c778c133..1ed7e395df4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java @@ -22,9 +22,9 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.util.PercentCompleteTotalUtil; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.WorkflowMetrics; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.DateUtil; @@ -164,7 +164,7 @@ public class AtsMetricsComposite extends ScrolledComposite { // Try to find an estimated release date from one of the workflows for (Artifact art : iAtsMetricsProvider.getMetricsArtifacts()) { if (art.isOfType(AtsArtifactTypes.TeamWorkflow)) { - IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(art); + IAtsVersion verArt = AtsClientService.get().getVersionService().getTargetedVersion(art); if (verArt != null) { Date estRelDate = verArt.getEstimatedReleaseDate(); if (estRelDate != null) { @@ -277,7 +277,9 @@ public class AtsMetricsComposite extends ScrolledComposite { if (sMet.getUserToAssignedSmas().getValues(user) != null) { for (Artifact awa : sMet.getUserToAssignedSmas().getValues(user)) { if (!processedArts.contains(awa) && !sMet.getUserToCompletedSmas().containsValue(awa)) { - cummulativePercentComplete += PercentCompleteTotalUtil.getPercentCompleteTotal((IAtsWorkItem) awa); + cummulativePercentComplete += + PercentCompleteTotalUtil.getPercentCompleteTotal((IAtsWorkItem) awa, + AtsClientService.get().getServices()); processedArts.add(awa); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java index 17209524096..044e70c4fb6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java @@ -19,9 +19,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.Action; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.help.ui.AtsHelpContext; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -245,8 +245,9 @@ public class WorldEditor extends FormEditor implements IWorldEditor, IDirtiableE return verArt; } for (Artifact artifact : getLoadedArtifacts()) { - if (artifact instanceof AbstractWorkflowArtifact && AtsVersionService.get().hasTargetedVersion(artifact)) { - return AtsVersionService.get().getTargetedVersion(artifact); + if (artifact instanceof AbstractWorkflowArtifact && AtsClientService.get().getVersionService().hasTargetedVersion( + artifact)) { + return AtsClientService.get().getVersionService().getTargetedVersion(artifact); } } return null; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java index 02d4d471051..01d6f5f8997 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java @@ -106,7 +106,7 @@ public class NextVersionSearchItem extends WorldUISearchItem { } try { TeamDefinitionDialog ld = new TeamDefinitionDialog("Select Team", "Select Team"); - ld.setInput(TeamDefinitions.getTeamReleaseableDefinitions(Active.Active)); + ld.setInput(TeamDefinitions.getTeamReleaseableDefinitions(Active.Active, AtsClientService.get().getConfig())); int result = ld.open(); if (result == 0) { selectedTeamDef = (IAtsTeamDefinition) ld.getResult()[0]; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java index cd055560ab3..77b46716063 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java @@ -27,7 +27,6 @@ import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.Versions; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; @@ -127,7 +126,7 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem { } Set<TaskArtifact> removeTaskArts = new HashSet<TaskArtifact>(); for (TaskArtifact taskArt : userTaskArts) { - if (verArt != null && !verArt.equals(AtsVersionService.get().getTargetedVersion( + if (verArt != null && !verArt.equals(AtsClientService.get().getVersionService().getTargetedVersion( taskArt.getParentTeamWorkflow()))) { removeTaskArts.add(taskArt); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java index 704d7b1e8a7..a90a189fafd 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java @@ -28,11 +28,11 @@ import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.artifact.WorkflowManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.core.util.AtsUtilCore; import org.eclipse.osee.ats.core.workflow.state.TeamState; import org.eclipse.osee.ats.internal.Activator; +import org.eclipse.osee.ats.internal.AtsClientService; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -153,7 +153,7 @@ public class TeamWorldSearchItem extends WorldUISearchItem { // don't include if version specified and workflow's not targeted for version if (versionArt != null) { TeamWorkFlowArtifact team = awa.getParentTeamWorkflow(); - if (team != null && (!AtsVersionService.get().hasTargetedVersion(team) || !AtsVersionService.get().getTargetedVersion( + if (team != null && (!AtsClientService.get().getVersionService().hasTargetedVersion(team) || !AtsClientService.get().getVersionService().getTargetedVersion( team).equals(versionArt))) { continue; } @@ -163,7 +163,7 @@ public class TeamWorldSearchItem extends WorldUISearchItem { TeamWorkFlowArtifact team = awa.getParentTeamWorkflow(); if (team != null) { // skip if released is desired and version artifact is not set - IAtsVersion setVerArt = AtsVersionService.get().getTargetedVersion(team); + IAtsVersion setVerArt = AtsClientService.get().getVersionService().getTargetedVersion(team); if (setVerArt == null && releasedOption == ReleasedOption.Released) { continue; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/VersionTargetedForTeamSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/VersionTargetedForTeamSearchItem.java index 3e8212692ed..cf0d71246a8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/VersionTargetedForTeamSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/VersionTargetedForTeamSearchItem.java @@ -113,7 +113,7 @@ public class VersionTargetedForTeamSearchItem extends WorldUISearchItem { IAtsTeamDefinition selectedTeamDef = teamDef; if (versionArt == null && selectedTeamDef == null) { TeamDefinitionDialog ld = new TeamDefinitionDialog("Select Team", "Select Team"); - ld.setInput(TeamDefinitions.getTeamReleaseableDefinitions(Active.Both)); + ld.setInput(TeamDefinitions.getTeamReleaseableDefinitions(Active.Both, AtsClientService.get().getConfig())); int result = ld.open(); if (result == 0) { selectedTeamDef = (IAtsTeamDefinition) ld.getResult()[0]; |