diff options
| author | ddunne | 2012-07-16 21:46:17 +0000 |
|---|---|---|
| committer | Roberto E. Escobar | 2012-07-16 21:46:17 +0000 |
| commit | 7fd1dc42669b9627d489204d9b05010444f70eef (patch) | |
| tree | 63968dd559e13dbd668389bce5f6e0fd1a198b43 | |
| parent | 78582a9d055e1b034d301ffc2e55893631860e2e (diff) | |
| download | org.eclipse.osee-7fd1dc42669b9627d489204d9b05010444f70eef.tar.gz org.eclipse.osee-7fd1dc42669b9627d489204d9b05010444f70eef.tar.xz org.eclipse.osee-7fd1dc42669b9627d489204d9b05010444f70eef.zip | |
bug: Fix Target Version not being saved
317 files changed, 1370 insertions, 854 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF index 02d2dffb6c6..2d338d65c6d 100644 --- a/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF @@ -5,8 +5,16 @@ Bundle-SymbolicName: org.eclipse.osee.ats.api Bundle-Version: 0.10.1.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.osee.ats.api.data, - org.eclipse.osee.ats.api.workdef +Export-Package: org.eclipse.osee.ats.api, + org.eclipse.osee.ats.api.ai, + org.eclipse.osee.ats.api.commit, + org.eclipse.osee.ats.api.data, + org.eclipse.osee.ats.api.rule, + org.eclipse.osee.ats.api.team, + org.eclipse.osee.ats.api.user, + org.eclipse.osee.ats.api.version, + org.eclipse.osee.ats.api.workdef, + org.eclipse.osee.ats.api.workflow Require-Bundle: org.eclipse.core.runtime Import-Package: org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsConfigObject.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsConfigObject.java index 3a44b45773c..8785d163c6c 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsConfigObject.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsConfigObject.java @@ -1,15 +1,11 @@ /* - * Created on Feb 13, 2012 + * Created on Jul 16, 2012 * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api; -/** - * @author Donald G. Dunne - */ public interface IAtsConfigObject extends IAtsObject { String toStringWithId(); - } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsObject.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsObject.java index c6f889de152..272c0460629 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsObject.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsObject.java @@ -3,19 +3,25 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api; + +import org.eclipse.osee.framework.core.data.HasDescription; +import org.eclipse.osee.framework.core.data.Identifiable; /** * Base class to build all ats config and action objects on * * @author Donald G. Dunne */ -public interface IAtsObject { +public interface IAtsObject extends Identifiable, HasDescription { + @Override public String getName(); + @Override public String getGuid(); + @Override public String getDescription(); public String getHumanReadableId(); diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsWorkItem.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsWorkItem.java new file mode 100644 index 00000000000..e0b743ab35b --- /dev/null +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/IAtsWorkItem.java @@ -0,0 +1,20 @@ +/* + * Created on Feb 9, 2012 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.ats.api; + +import org.eclipse.osee.ats.api.workflow.HasAssignees; +import org.eclipse.osee.ats.api.workflow.HasStateProvider; +import org.eclipse.osee.ats.api.workflow.HasWorkData; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; +import org.eclipse.osee.framework.core.exception.OseeCoreException; + +/** + * @author Donald G. Dunne + */ +public interface IAtsWorkItem extends IAtsObject, HasWorkData, HasAssignees, HasStateProvider { + + IAtsTeamWorkflow getParentTeamWorkflow() throws OseeCoreException; +} diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsActionableItem.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/ai/IAtsActionableItem.java index 4217f120932..4e6028b407d 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsActionableItem.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/ai/IAtsActionableItem.java @@ -3,9 +3,12 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.ai; import java.util.Collection; +import org.eclipse.osee.ats.api.IAtsConfigObject; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** @@ -18,7 +21,7 @@ public interface IAtsActionableItem extends IAtsConfigObject { ******************************/ void setHumanReadableId(String humanReadableId); - void setName(String name); + void setName(String name) throws OseeCoreException; void setDescription(String description); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/ICommitConfigArtifact.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/commit/ICommitConfigArtifact.java index 806194c9757..52ffcfdaa35 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/ICommitConfigArtifact.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/commit/ICommitConfigArtifact.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.commit; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsRules.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/rule/IAtsRules.java index 9033620aa11..910afeff955 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsRules.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/rule/IAtsRules.java @@ -3,7 +3,7 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.rule; import java.util.Collection; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsTeamDefinition.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/team/IAtsTeamDefinition.java index 464ba6f819c..3675b7b6336 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsTeamDefinition.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/team/IAtsTeamDefinition.java @@ -3,9 +3,17 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.team; import java.util.Collection; +import org.eclipse.osee.ats.api.IAtsConfigObject; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.commit.ICommitConfigArtifact; +import org.eclipse.osee.ats.api.rule.IAtsRules; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.version.VersionLockedType; +import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; @@ -18,7 +26,7 @@ public interface IAtsTeamDefinition extends IAtsConfigObject, IAtsRules, ICommit * Name, Full Name, Description ******************************/ - void setName(String name); + void setName(String name) throws OseeCoreException; void setDescription(String description); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/TeamDefinitionOptions.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/team/TeamDefinitionOptions.java index dd4c753ebfe..49de7280d8f 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/TeamDefinitionOptions.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/team/TeamDefinitionOptions.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.team; public enum TeamDefinitionOptions { TeamUsesVersions, diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsUser.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/IAtsUser.java index 0ee4c2b9be9..ba82b0646d0 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsUser.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/IAtsUser.java @@ -3,8 +3,9 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.user; +import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** @@ -12,6 +13,9 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; */ public interface IAtsUser extends IAtsObject, Comparable<Object> { + @Override + public String getName(); + public String getUserId() throws OseeCoreException; public String getEmail() throws OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsUserGroup.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/IAtsUserGroup.java index d083b121d99..a50dee1b358 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsUserGroup.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/user/IAtsUserGroup.java @@ -3,7 +3,7 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.user; import java.util.List; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsVersion.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersion.java index 5b1d7488a3d..fe86d5d4ce7 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsVersion.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersion.java @@ -3,18 +3,20 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.version; import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Set; +import org.eclipse.osee.ats.api.IAtsConfigObject; +import org.eclipse.osee.ats.api.commit.ICommitConfigArtifact; import org.eclipse.osee.framework.core.util.Result; /** * @author Donald G. Dunne */ -public interface IAtsVersion extends IAtsConfigObject, ICommitConfigArtifact { +public interface IAtsVersion extends ICommitConfigArtifact, IAtsConfigObject { /***************************** * Name, Full Name, Description @@ -107,12 +109,4 @@ public interface IAtsVersion extends IAtsConfigObject, ICommitConfigArtifact { void setNextVersion(boolean nextVersion); - /***************************** - * Related Team Definition - ******************************/ - - IAtsTeamDefinition getTeamDefinition(); - - void setTeamDefinition(IAtsTeamDefinition teamDefinition); - } diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionService.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionService.java new file mode 100644 index 00000000000..f2186e6ab7c --- /dev/null +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/IAtsVersionService.java @@ -0,0 +1,32 @@ +/* + * Created on Jul 16, 2012 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.ats.api.version; + +import java.util.Collection; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; + +public interface IAtsVersionService { + + boolean hasTargetedVersion(Object object); + + IAtsVersion getTargetedVersion(Object object); + + IAtsVersion setTargetedVersion(IAtsTeamWorkflow teamWf, IAtsVersion version); + + Collection<IAtsVersion> getVersions(IAtsTeamDefinition teamDef); + + void addVersion(IAtsTeamDefinition teamDef, IAtsVersion version); + + public IAtsTeamDefinition getTeamDefinition(IAtsVersion version); + + void setTeamDefinition(IAtsVersion version, IAtsTeamDefinition teamDef); + + public boolean isReleased(IAtsTeamWorkflow teamWf); + + public boolean isVersionLocked(IAtsTeamWorkflow teamWf); + +} diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/VersionLockedType.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/VersionLockedType.java index 5a6492a2692..9dc1b556b30 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/VersionLockedType.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/VersionLockedType.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.version; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/VersionReleaseType.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/VersionReleaseType.java index c9d5716e440..6867bd5485f 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/VersionReleaseType.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/version/VersionReleaseType.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.version; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/HasActions.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/HasActions.java index 62c2c156094..b4b22812460 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/HasActions.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/HasActions.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.workflow; import java.util.Collection; +import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/HasAssignees.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/HasAssignees.java index 3546aa21039..e3904786e28 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/HasAssignees.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/HasAssignees.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.workflow; import java.util.List; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/HasStateProvider.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/HasStateProvider.java index a2f084b7429..41f03e9b69a 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/HasStateProvider.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/HasStateProvider.java @@ -3,7 +3,7 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.workflow; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/HasWorkData.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/HasWorkData.java index 54b1a84ab0e..b163ffbf147 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/HasWorkData.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/HasWorkData.java @@ -3,7 +3,7 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.workflow; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/IAtsTeamWorkflow.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/IAtsTeamWorkflow.java new file mode 100644 index 00000000000..25359abcbc2 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/IAtsTeamWorkflow.java @@ -0,0 +1,14 @@ +/* + * Created on Jul 16, 2012 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.ats.api.workflow; + +import org.eclipse.osee.ats.api.IAtsWorkItem; + +public interface IAtsTeamWorkflow extends IAtsWorkItem { + + String toStringWithId(); + +} diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsWorkData.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/IAtsWorkData.java index c1865de4b39..fc224994cd9 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsWorkData.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/IAtsWorkData.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.workflow; import java.util.Date; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/WorkState.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/WorkState.java index 3fa27e7bddb..ebec27e232f 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/WorkState.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/WorkState.java @@ -3,9 +3,10 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.workflow; import java.util.List; +import org.eclipse.osee.ats.api.user.IAtsUser; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/WorkStateProvider.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/WorkStateProvider.java index 06be4d36422..74294e8994d 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/WorkStateProvider.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/WorkStateProvider.java @@ -1,7 +1,8 @@ -package org.eclipse.osee.ats.core.model; +package org.eclipse.osee.ats.api.workflow; import java.util.Collection; import java.util.List; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/PopulateDemoActionsTest.java b/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/PopulateDemoActionsTest.java index e93c03e4e8f..ef6d69eed97 100644 --- a/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/PopulateDemoActionsTest.java +++ b/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/PopulateDemoActionsTest.java @@ -15,6 +15,8 @@ import java.util.Collection; import java.util.List; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.config.demo.config.DemoDbUtil; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; @@ -28,7 +30,7 @@ import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.task.TaskStates; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.DemoTestUtil; @@ -475,8 +477,9 @@ public class PopulateDemoActionsTest { Assert.assertEquals(priority, teamArt.getSoleAttributeValue(AtsAttributeTypes.PriorityType, "")); // want targeted version, not error/exception String targetedVerStr = ""; - if (teamArt.getTargetedVersion() != null) { - targetedVerStr = teamArt.getTargetedVersion().getName(); + IAtsVersion version = AtsVersionService.get().getTargetedVersion(teamArt); + if (version != null) { + targetedVerStr = version.getName(); } Assert.assertEquals(versionName, targetedVerStr); Assert.assertEquals(artifactType, teamArt.getArtifactType()); diff --git a/plugins/org.eclipse.osee.ats.config.demo/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.config.demo/META-INF/MANIFEST.MF index 487ec73ddd7..571a7ae58da 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.config.demo/META-INF/MANIFEST.MF @@ -19,7 +19,14 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.forms Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.core.filesystem, + org.eclipse.osee.ats.api, + org.eclipse.osee.ats.api.ai, + org.eclipse.osee.ats.api.commit, org.eclipse.osee.ats.api.data, + org.eclipse.osee.ats.api.rule, + org.eclipse.osee.ats.api.team, + org.eclipse.osee.ats.api.user, + org.eclipse.osee.ats.api.version, org.eclipse.osee.ats.api.workdef, org.eclipse.osee.ats.core.client.action, org.eclipse.osee.ats.core.client.artifact, diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java index f879b705746..ace3fd534be 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java @@ -19,6 +19,8 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.config.demo.config.DemoDbActionData; import org.eclipse.osee.ats.config.demo.config.DemoDbActionData.CreateReview; @@ -38,12 +40,11 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.version.AtsVersionStore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.FavoritesManager; import org.eclipse.osee.ats.util.SubscribeManagerUI; @@ -335,8 +336,7 @@ public class PopulateDemoActions extends XNavigateItemAction { teamWf.persist(transaction); if (Strings.isValid(versionStr)) { IAtsVersion version = AtsConfigCache.getSoleByName(versionStr, IAtsVersion.class); - teamWf.setTargetedVersion(version); - teamWf.setTargetedVersionLink(version); + AtsVersionStore.setTargetedVersionLink(teamWf, version); teamWf.persist(transaction); } } diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateSawBuild2Actions.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateSawBuild2Actions.java index 860cc075a1d..7f6ab3fe3cb 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateSawBuild2Actions.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateSawBuild2Actions.java @@ -14,7 +14,10 @@ import java.util.Collection; import java.util.Date; import java.util.logging.Level; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.config.demo.config.DemoDbAIs; import org.eclipse.osee.ats.config.demo.config.DemoDbUtil; @@ -29,12 +32,11 @@ import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; +import org.eclipse.osee.ats.core.client.version.AtsVersionStore; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.util.AtsBranchManager; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -126,8 +128,7 @@ public class PopulateSawBuild2Actions { teamWf.persist(transaction); IAtsVersion version = AtsConfigCache.getSoleByName(versionStr, IAtsVersion.class); - teamWf.setTargetedVersion(version); - teamWf.setTargetedVersionLink(version); + AtsVersionStore.setTargetedVersionLink(teamWf, version); teamWf.persist(transaction); } return actionArt; @@ -203,8 +204,7 @@ public class PopulateSawBuild2Actions { teamWf.persist(transaction); IAtsVersion version = AtsConfigCache.getSoleByName(versionStr, IAtsVersion.class); - teamWf.setTargetedVersion(version); - teamWf.setTargetedVersionLink(version); + AtsVersionStore.setTargetedVersionLink(teamWf, version); teamWf.persist(transaction); } return actionArt; @@ -282,8 +282,7 @@ public class PopulateSawBuild2Actions { teamWf.persist(transaction); IAtsVersion version = AtsConfigCache.getSoleByName(versionStr, IAtsVersion.class); - teamWf.setTargetedVersion(version); - teamWf.setTargetedVersionLink(version); + AtsVersionStore.setTargetedVersionLink(teamWf, version); teamWf.persist(transaction); } return actionArt; @@ -341,8 +340,7 @@ public class PopulateSawBuild2Actions { teamWf.persist(transaction); IAtsVersion version = AtsConfigCache.getSoleByName(versionStr, IAtsVersion.class); - teamWf.setTargetedVersion(version); - teamWf.setTargetedVersionLink(version); + AtsVersionStore.setTargetedVersionLink(teamWf, version); teamWf.persist(transaction); } return actionArt; @@ -432,7 +430,8 @@ public class PopulateSawBuild2Actions { } Job job = AtsBranchManager.commitWorkingBranch(reqTeam, false, true, - BranchManager.getBranchByGuid(reqTeam.getTargetedVersion().getBaslineBranchGuid()), true); + BranchManager.getBranchByGuid(AtsVersionService.get().getTargetedVersion(reqTeam).getBaslineBranchGuid()), + true); try { job.join(); } catch (InterruptedException ex) { diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTeamWorkflows.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTeamWorkflows.java index e25643fa081..0148cb799b9 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTeamWorkflows.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTeamWorkflows.java @@ -13,12 +13,12 @@ package org.eclipse.osee.ats.config.demo.artifact; import java.util.Collection; import java.util.logging.Level; import org.eclipse.osee.ats.actions.wizard.TeamWorkflowProviderAdapter; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.config.demo.internal.Activator; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbActionData.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbActionData.java index 8058f3d20db..f8632a041cc 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbActionData.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbActionData.java @@ -15,8 +15,8 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.core.client.team.TeamState; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.framework.ui.skynet.widgets.util.UserCommunity; /** diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java index 6326c70b945..29940a149b9 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbReviews.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.logging.Level; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.config.demo.internal.Activator; import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; import org.eclipse.osee.ats.core.client.review.DecisionReviewManager; @@ -31,7 +32,6 @@ import org.eclipse.osee.ats.core.client.review.role.Role; import org.eclipse.osee.ats.core.client.review.role.UserRole; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.logging.OseeLog; diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbTasks.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbTasks.java index cae049824d7..1735883f1f6 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbTasks.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbTasks.java @@ -16,11 +16,11 @@ import java.util.Collection; import java.util.Date; import java.util.List; import java.util.logging.Level; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.config.demo.internal.Activator; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java index c4943caac39..a14dd27bc84 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java @@ -17,10 +17,10 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.logging.Level; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.config.demo.internal.Activator; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/CreateGoalTestDemoArtifacts.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/CreateGoalTestDemoArtifacts.java index 4dae17af74b..113b9ae004a 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/CreateGoalTestDemoArtifacts.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/CreateGoalTestDemoArtifacts.java @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.Date; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.artifact.GoalManager; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.action.ActionManager; @@ -26,7 +27,6 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.WorldEditorSimpleProvider; diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java index dc3d86099df..a42bca3049f 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/navigate/DemoNavigateViewItems.java @@ -15,11 +15,11 @@ import java.util.Arrays; import java.util.List; import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.config.demo.PopulateDemoActions; import org.eclipse.osee.ats.config.demo.internal.Activator; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.health.ValidateAtsDatabase; import org.eclipse.osee.ats.navigate.IAtsNavigateItem; import org.eclipse.osee.ats.navigate.SearchNavigateItem; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtil.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtil.java index de3e4f2295b..e3aa505292c 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtil.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/AtsTestUtil.java @@ -18,7 +18,11 @@ import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Set; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewOption; import org.eclipse.osee.ats.api.workdef.IAtsWidgetDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; @@ -40,6 +44,7 @@ import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.version.AtsVersionStore; import org.eclipse.osee.ats.core.client.workdef.WorkDefinitionFactory; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper; @@ -48,12 +53,9 @@ import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; import org.eclipse.osee.ats.core.config.ActionableItemFactory; import org.eclipse.osee.ats.core.config.AtsConfigCache; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitionFactory; import org.eclipse.osee.ats.core.config.VersionFactory; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.core.workdef.SimpleDecisionReviewOption; import org.eclipse.osee.ats.core.workflow.StateTypeAdapter; import org.eclipse.osee.ats.mocks.MockStateDefinition; @@ -634,7 +636,7 @@ public class AtsTestUtil { "1", false, null, Arrays.asList(testAi4), new Date(), AtsUsersClient.getUser(), null, transaction); teamArt4 = actionArt4.getFirstTeam(); - teamArt4.setTargetedVersion(verArt4); + AtsVersionStore.setTargetedVersionLink(teamArt, verArt4); transaction.execute(); } return teamArt4; @@ -709,9 +711,8 @@ public class AtsTestUtil { verArt.setAllowCreateBranch(true); verArt.setAllowCommitBranch(true); verArt.setBaselineBranchGuid(BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1).getGuid()); - if (getTeamWf().getTargetedVersion() == null) { - getTeamWf().setTargetedVersion(getVerArt1()); - getTeamWf().setTargetedVersionLink(getVerArt1()); + if (!AtsVersionService.get().hasTargetedVersion(getTeamWf())) { + AtsVersionStore.setTargetedVersionLink(getTeamWf(), getVerArt1()); getTeamWf().persist(AtsTestUtil.class.getSimpleName() + "-SetTeamWfTargetedVer1"); } } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCoreTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCoreTest.java index c0a0ac2edc5..34b8295f812 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCoreTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCoreTest.java @@ -15,11 +15,13 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.HashSet; +import org.eclipse.osee.ats.api.commit.ICommitConfigArtifact; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.ICommitConfigArtifact; +import org.eclipse.osee.ats.core.client.version.AtsVersionStore; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; @@ -63,8 +65,8 @@ public class AtsBranchManagerCoreTest { IAtsVersion verArt1 = AtsTestUtil.getVerArt1(); IAtsVersion verArt2 = AtsTestUtil.getVerArt2(); verArt1.getParallelVersions().add(verArt2); - teamArt.setTargetedVersion(verArt1); - teamArt.setTargetedVersionLink(verArt1); + AtsVersionService.get().setTargetedVersion(teamArt, verArt1); + AtsVersionStore.setTargetedVersionLink(teamArt, verArt1); Collection<Object> commitObjs = AtsBranchManagerCore.getCommitTransactionsAndConfigItemsForTeamWf(teamArt); assertTrue("commitObjs has wrong size", commitObjs.size() == 2); assertTrue("commitObjs is missing verArt1", commitObjs.contains(verArt1)); diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/config/AtsActionableItemToTeamDefinitionTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/config/AtsActionableItemToTeamDefinitionTest.java index 7f935df5a48..d4eb6521a26 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/config/AtsActionableItemToTeamDefinitionTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/config/AtsActionableItemToTeamDefinitionTest.java @@ -13,10 +13,10 @@ package org.eclipse.osee.ats.core.client.config; import static org.junit.Assert.assertFalse; import java.util.Arrays; import java.util.Collection; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/TaskManagerTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/TaskManagerTest.java index 6d0b2c44f84..bc6c1ccefd7 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/TaskManagerTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/TaskManagerTest.java @@ -13,6 +13,7 @@ package org.eclipse.osee.ats.core.client.task; import java.util.Arrays; import junit.framework.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; @@ -20,7 +21,6 @@ import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workdef.WorkDefinitionFactory; import org.eclipse.osee.ats.core.client.workflow.HoursSpentUtil; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.core.util.XResultData; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/createTasks/CreateTasksOperationTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/createTasks/CreateTasksOperationTest.java index 92942365005..0b19c8ae5eb 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/createTasks/CreateTasksOperationTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/task/createTasks/CreateTasksOperationTest.java @@ -17,8 +17,10 @@ import java.util.Date; import java.util.List; import java.util.logging.Level; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.task.TaskArtifact; @@ -30,8 +32,7 @@ import org.eclipse.osee.ats.core.client.task.createtasks.TaskMetadata; import org.eclipse.osee.ats.core.client.task.createtasks.TaskOpModify; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.core.client.version.AtsVersionStore; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.MultipleAttributesExist; @@ -241,12 +242,9 @@ public class CreateTasksOperationTest { ver2_ChangesWithoutTasks.setName(ver2_ChangesWithoutTasks.getName() + " ChangesWithoutTasks"); ver3_TasksWithoutChanges.setName(ver3_TasksWithoutChanges.getName() + " TasksWithoutChanges"); - destTeamWf1_Proper.setTargetedVersion(ver1_Proper); - destTeamWf1_Proper.setTargetedVersionLink(ver1_Proper); - destTeamWf2_ChangesWithoutTasks.setTargetedVersion(ver2_ChangesWithoutTasks); - destTeamWf2_ChangesWithoutTasks.setTargetedVersionLink(ver2_ChangesWithoutTasks); - destTeamWf3_TasksWithoutChanges.setTargetedVersion(ver3_TasksWithoutChanges); - destTeamWf3_TasksWithoutChanges.setTargetedVersionLink(ver3_TasksWithoutChanges); + AtsVersionStore.setTargetedVersionLink(destTeamWf1_Proper, ver1_Proper); + AtsVersionStore.setTargetedVersionLink(destTeamWf2_ChangesWithoutTasks, ver2_ChangesWithoutTasks); + AtsVersionStore.setTargetedVersionLink(destTeamWf3_TasksWithoutChanges, ver3_TasksWithoutChanges); IAtsVersion verArt4 = AtsTestUtil.getVerArt4(); verArt4.setBaselineBranchGuid(DemoSawBuilds.SAW_Bld_1.getGuid()); diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/AtsUserTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/AtsUserTest.java index c448c1012cb..70648423bd4 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/AtsUserTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/util/AtsUserTest.java @@ -9,7 +9,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import junit.framework.Assert; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.framework.core.data.Identity; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.skynet.core.User; @@ -57,11 +58,14 @@ public class AtsUserTest { Collection<IAtsUser> assignees = new HashSet<IAtsUser>(); assignees.add(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay)); assignees.add(AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith)); - Assert.assertTrue(Collections.isEqual(assignees, - Arrays.asList(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay), AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith)))); + Assert.assertTrue(Collections.isEqual( + assignees, + Arrays.asList(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay), + AtsUsersClient.getUserFromToken(DemoUsers.Joe_Smith)))); assignees.remove(AtsUsersClient.getUser()); - Assert.assertTrue(Collections.isEqual(assignees, Arrays.asList(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay)))); + Assert.assertTrue(Collections.isEqual(assignees, + Arrays.asList(AtsUsersClient.getUserFromToken(DemoUsers.Alex_Kay)))); } public IAtsUser getAtsUser(final String name, final String userId) { @@ -106,6 +110,11 @@ public class AtsUserTest { public String getEmail() { return null; } + + @Override + public boolean matches(Identity<?>... identities) { + return false; + } }; } diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/MockTransitionHelper.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/MockTransitionHelper.java index 85f8eaf3a33..6b729f48c89 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/MockTransitionHelper.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/MockTransitionHelper.java @@ -11,9 +11,9 @@ package org.eclipse.osee.ats.core.client.workflow.transition; import java.util.Collection; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManagerTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManagerTest.java index 4520827ef4d..e338741c402 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManagerTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManagerTest.java @@ -11,6 +11,7 @@ import java.util.List; import junit.framework.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWidgetDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; @@ -29,7 +30,7 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.workflow.transition.TransitionResult; import org.eclipse.osee.ats.mocks.MockStateDefinition; import org.eclipse.osee.framework.core.enums.SystemUser; @@ -382,7 +383,7 @@ public class TransitionManagerTest { // set targeted version; transition validation should succeed results.clear(); - teamArt.setTargetedVersion(AtsTestUtil.getVerArt1()); + AtsVersionService.get().setTargetedVersion(teamArt, AtsTestUtil.getVerArt1()); transMgr.handleTransitionValidation(results); Assert.assertTrue(results.isEmpty()); } @@ -410,7 +411,7 @@ public class TransitionManagerTest { // set targeted version; transition validation should succeed results.clear(); - teamArt.setTargetedVersion(AtsTestUtil.getVerArt1()); + AtsVersionService.get().setTargetedVersion(teamArt, AtsTestUtil.getVerArt1()); transMgr.handleTransitionValidation(results); Assert.assertTrue(results.isEmpty()); } diff --git a/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF index 49521c589f7..13f865c4062 100644 --- a/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core.client/META-INF/MANIFEST.MF @@ -15,8 +15,16 @@ Import-Package: com.google.inject, org.eclipse.emf.ecore.resource, org.eclipse.emf.ecore.resource.impl, org.eclipse.emf.ecore.xmi.impl, + org.eclipse.osee.ats.api, + org.eclipse.osee.ats.api.ai, + org.eclipse.osee.ats.api.commit, org.eclipse.osee.ats.api.data, + org.eclipse.osee.ats.api.rule, + org.eclipse.osee.ats.api.team, + org.eclipse.osee.ats.api.user, + org.eclipse.osee.ats.api.version, org.eclipse.osee.ats.api.workdef, + org.eclipse.osee.ats.api.workflow, org.eclipse.osee.ats.core.client.config, org.eclipse.osee.ats.core.config, org.eclipse.osee.ats.core.model, diff --git a/plugins/org.eclipse.osee.ats.core.client/OSGI-INF/ats.version.service.xml b/plugins/org.eclipse.osee.ats.core.client/OSGI-INF/ats.version.service.xml new file mode 100644 index 00000000000..e4a26c04533 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.client/OSGI-INF/ats.version.service.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.ats.core.client.version.AtsVersionServiceProvider"> + <implementation class="org.eclipse.osee.ats.core.client.version.AtsVersionServiceProvider"/> + <service> + <provide interface="org.eclipse.osee.ats.api.version.IAtsVersionService"/> + </service> +</scr:component> diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionArtifact.java index fe5993ce9ab..b1a32ce6f2c 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionArtifact.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionArtifact.java @@ -13,9 +13,9 @@ package org.eclipse.osee.ats.core.client.action; import java.util.Collection; import java.util.HashSet; import java.util.Set; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java index 5328f0a06ba..f53629a943d 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/action/ActionManager.java @@ -14,9 +14,12 @@ import java.util.Collection; import java.util.Date; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager; import org.eclipse.osee.ats.core.client.team.CreateTeamOption; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; @@ -26,9 +29,6 @@ import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; import org.eclipse.osee.ats.core.client.workflow.ITeamWorkflowProvider; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeArgumentException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/actions/ISelectedTeamDefinitionArtifacts.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/actions/ISelectedTeamDefinitionArtifacts.java index 86169a48064..5ebeff53fa7 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/actions/ISelectedTeamDefinitionArtifacts.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/actions/ISelectedTeamDefinitionArtifacts.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.client.actions; import java.util.Collection; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AbstractAtsArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AbstractAtsArtifact.java index 2bda5845b6a..1b3789e6317 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AbstractAtsArtifact.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AbstractAtsArtifact.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.client.artifact; -import org.eclipse.osee.ats.core.model.IAtsObject; +import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java index 9534106a269..abc2148fdcf 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java @@ -23,6 +23,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.osee.ats.api.commit.ICommitConfigArtifact; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewDefinition; import org.eclipse.osee.ats.api.workdef.IAtsPeerReviewDefinition; import org.eclipse.osee.ats.api.workdef.StateEventType; @@ -34,10 +38,7 @@ import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.ICommitConfigArtifact; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.BranchState; @@ -246,16 +247,17 @@ public class AtsBranchManagerCore { return Result.FalseResult; } if (teamArt.getTeamDefinition().isTeamUsesVersions()) { - if (teamArt.getTargetedVersion() == null) { + if (!AtsVersionService.get().hasTargetedVersion(teamArt)) { return new Result(false, "Workflow not targeted for Version"); } - Result result = teamArt.getTargetedVersion().isAllowCommitBranchInherited(); + Result result = AtsVersionService.get().getTargetedVersion(teamArt).isAllowCommitBranchInherited(); if (result.isFalse()) { return result; } - if (!Strings.isValid(teamArt.getTargetedVersion().getBaslineBranchGuid())) { - return new Result(false, "Parent Branch not configured for Version [" + teamArt.getTargetedVersion() + "]"); + if (!Strings.isValid(AtsVersionService.get().getTargetedVersion(teamArt).getBaslineBranchGuid())) { + return new Result(false, + "Parent Branch not configured for Version [" + AtsVersionService.get().getTargetedVersion(teamArt) + "]"); } return Result.TrueResult; @@ -279,18 +281,19 @@ public class AtsBranchManagerCore { } if (teamArt.getTeamDefinition().isTeamUsesVersions()) { - if (teamArt.getTargetedVersion() == null) { + if (!AtsVersionService.get().hasTargetedVersion(teamArt)) { return new Result(false, "Workflow not targeted for Version"); } - Result result = teamArt.getTargetedVersion().isAllowCreateBranchInherited(); + Result result = AtsVersionService.get().getTargetedVersion(teamArt).isAllowCreateBranchInherited(); if (result.isFalse()) { return result; } - if (!Strings.isValid(teamArt.getTargetedVersion().getBaslineBranchGuid())) { - return new Result(false, "Parent Branch not configured for Version [" + teamArt.getTargetedVersion() + "]"); + if (!Strings.isValid(AtsVersionService.get().getTargetedVersion(teamArt).getBaslineBranchGuid())) { + return new Result(false, + "Parent Branch not configured for Version [" + AtsVersionService.get().getTargetedVersion(teamArt) + "]"); } - if (!BranchManager.getBranchByGuid(teamArt.getTargetedVersion().getBaslineBranchGuid()).getBranchType().isBaselineBranch()) { + if (!BranchManager.getBranchByGuid(AtsVersionService.get().getTargetedVersion(teamArt).getBaslineBranchGuid()).getBranchType().isBaselineBranch()) { return new Result(false, "Parent Branch must be of Baseline branch type. See Admin for configuration."); } return Result.TrueResult; @@ -323,8 +326,8 @@ public class AtsBranchManagerCore { public static Collection<ICommitConfigArtifact> getConfigArtifactsConfiguredToCommitTo(TeamWorkFlowArtifact teamArt) throws OseeCoreException { Set<ICommitConfigArtifact> configObjects = new HashSet<ICommitConfigArtifact>(); if (teamArt.isTeamUsesVersions()) { - if (teamArt.getTargetedVersion() != null) { - teamArt.getTargetedVersion().getParallelVersions(configObjects); + if (AtsVersionService.get().hasTargetedVersion(teamArt)) { + AtsVersionService.get().getTargetedVersion(teamArt).getParallelVersions(configObjects); } } else { if (teamArt.isTeamWorkflow() && Strings.isValid(teamArt.getTeamDefinition().getBaslineBranchGuid())) { @@ -336,8 +339,8 @@ public class AtsBranchManagerCore { public static ICommitConfigArtifact getParentBranchConfigArtifactConfiguredToCommitTo(TeamWorkFlowArtifact teamArt) throws OseeCoreException { if (teamArt.isTeamUsesVersions()) { - if (teamArt.getTargetedVersion() != null) { - return teamArt.getTargetedVersion(); + if (AtsVersionService.get().hasTargetedVersion(teamArt)) { + return AtsVersionService.get().getTargetedVersion(teamArt); } } else { if (teamArt.isTeamWorkflow() && Strings.isValid(teamArt.getTeamDefinition().getBaslineBranchGuid())) { @@ -425,7 +428,7 @@ public class AtsBranchManagerCore { // Check for parent branch id in Version artifact if (teamArt.isTeamUsesVersions()) { - IAtsVersion verArt = teamArt.getTargetedVersion(); + IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(teamArt); if (verArt != null && Strings.isValid(verArt.getBaslineBranchGuid())) { parentBranch = BranchManager.getBranchByGuid(verArt.getBaslineBranchGuid()); } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/ActionableItemManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/ActionableItemManager.java index 0894b96d0e2..018c3e5e43e 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/ActionableItemManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/ActionableItemManager.java @@ -14,9 +14,9 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/AtsConfigManagerClient.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/AtsConfigManagerClient.java index 492a4c3e6c6..9520ceea09e 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/AtsConfigManagerClient.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/AtsConfigManagerClient.java @@ -5,14 +5,14 @@ */ package org.eclipse.osee.ats.core.client.config; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.config.store.ActionableItemArtifactStore; import org.eclipse.osee.ats.core.client.config.store.TeamDefinitionArtifactStore; import org.eclipse.osee.ats.core.client.config.store.VersionArtifactStore; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/AtsObjectsClient.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/AtsObjectsClient.java index ea7709e3a78..6396113df50 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/AtsObjectsClient.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/AtsObjectsClient.java @@ -8,10 +8,10 @@ package org.eclipse.osee.ats.core.client.config; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.eclipse.osee.ats.api.IAtsConfigObject; +import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsConfigObject; -import org.eclipse.osee.ats.core.model.IAtsObject; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgram.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgram.java index 583251d70d5..651a313db5c 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgram.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/IAtsProgram.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.core.client.config; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/TeamDefinitionOptions.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/TeamDefinitionOptions.java deleted file mode 100644 index ee77e3bc704..00000000000 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/TeamDefinitionOptions.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.client.config; - -public enum TeamDefinitionOptions { - TeamUsesVersions, - RequireTargetedVersion -}; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/VersionsClient.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/VersionsClient.java index de0b143b22b..966340beff8 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/VersionsClient.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/VersionsClient.java @@ -7,8 +7,8 @@ package org.eclipse.osee.ats.core.client.config; import java.util.Collection; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/ActionableItemArtifactStore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/ActionableItemArtifactStore.java index 847c1780841..ca23d0a94bb 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/ActionableItemArtifactStore.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/ActionableItemArtifactStore.java @@ -7,9 +7,12 @@ package org.eclipse.osee.ats.core.client.config.store; import java.util.Collection; import java.util.List; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.config.AtsObjectsClient; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; @@ -17,9 +20,6 @@ import org.eclipse.osee.ats.core.config.ActionableItemFactory; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitionFactory; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/ArtifactAtsObjectStore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/ArtifactAtsObjectStore.java index e2f25dd7f62..4b2db3277ce 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/ArtifactAtsObjectStore.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/ArtifactAtsObjectStore.java @@ -3,8 +3,8 @@ package org.eclipse.osee.ats.core.client.config.store; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.ats.core.client.config.AtsObjectsClient; -import org.eclipse.osee.ats.core.model.IAtsObject; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.IRelationTypeSide; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/TeamDefinitionArtifactStore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/TeamDefinitionArtifactStore.java index 569ac9776ae..5a40a465c3c 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/TeamDefinitionArtifactStore.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/TeamDefinitionArtifactStore.java @@ -6,21 +6,22 @@ package org.eclipse.osee.ats.core.client.config.store; import java.util.List; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.config.AtsObjectsClient; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.config.ActionableItemFactory; import org.eclipse.osee.ats.core.config.AtsConfigCache; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitionFactory; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.core.config.VersionFactory; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; @@ -214,7 +215,7 @@ public class TeamDefinitionArtifactStore extends ArtifactAtsObjectStore { for (Artifact verArt : teamDefArt.getRelatedArtifacts(AtsRelationTypes.TeamDefinitionToVersion_Version)) { IAtsVersion version = VersionFactory.getOrCreate(verArt.getGuid(), verArt.getName()); teamDef.getVersions().add(version); - version.setTeamDefinition(teamDef); + AtsVersionService.get().setTeamDefinition(version, teamDef); } for (Artifact userArt : teamDefArt.getRelatedArtifacts(AtsRelationTypes.SubscribedUser_User)) { IAtsUser user = AtsUsersClient.getUserFromOseeUser((User) userArt); diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/VersionArtifactStore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/VersionArtifactStore.java index 8993ef454f5..50a7525282b 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/VersionArtifactStore.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/config/store/VersionArtifactStore.java @@ -10,12 +10,13 @@ import java.util.List; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.config.AtsConfigCache; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitionFactory; import org.eclipse.osee.ats.core.config.VersionFactory; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -78,8 +79,9 @@ public class VersionArtifactStore extends ArtifactAtsObjectStore { } // set parent artifact to top team def - if (version.getTeamDefinition() != null) { - Artifact teamDefArt = new TeamDefinitionArtifactStore(version.getTeamDefinition()).getArtifact(); + IAtsTeamDefinition teamDefinition = AtsVersionService.get().getTeamDefinition(version); + if (teamDefinition != null) { + Artifact teamDefArt = new TeamDefinitionArtifactStore(teamDefinition).getArtifact(); if (teamDefArt != null) { if (!teamDefArt.getRelatedArtifacts(AtsRelationTypes.TeamDefinitionToVersion_Version).contains(verArt)) { teamDefArt.addRelation(AtsRelationTypes.TeamDefinitionToVersion_Version, verArt); @@ -120,7 +122,7 @@ public class VersionArtifactStore extends ArtifactAtsObjectStore { if (!teamDefArts.isEmpty()) { Artifact teamDefArt = teamDefArts.iterator().next(); IAtsTeamDefinition teamDef = TeamDefinitionFactory.getOrCreate(teamDefArt.getGuid(), teamDefArt.getName()); - version.setTeamDefinition(teamDef); + AtsVersionService.get().setTeamDefinition(version, teamDef); } for (String staticId : artifact.getAttributesToStringList(CoreAttributeTypes.StaticId)) { version.getStaticIds().add(staticId); diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java index a91074e7fa1..6f1307b7d00 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotificationManager.java @@ -15,15 +15,15 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.logging.Level; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsers.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsers.java index 6a6c1934a3c..61fc101d44a 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsers.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/notify/AtsNotifyUsers.java @@ -16,6 +16,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.logging.Level; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; import org.eclipse.osee.ats.core.client.review.role.Role; @@ -24,7 +25,6 @@ import org.eclipse.osee.ats.core.client.review.role.UserRoleManager; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.SubscribeManager; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/AbstractReviewArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/AbstractReviewArtifact.java index c09991d30ef..9aac5395a88 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/AbstractReviewArtifact.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/AbstractReviewArtifact.java @@ -17,6 +17,8 @@ import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.core.client.config.ActionableItemManager; import org.eclipse.osee.ats.core.client.internal.Activator; @@ -27,8 +29,6 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.StateManager; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionOption.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionOption.java index 560910729f0..03d0aaca880 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionOption.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionOption.java @@ -15,8 +15,8 @@ import java.util.HashSet; import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.internal.Activator; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManager.java index 3d83228dd82..1e49724a5ee 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewDefinitionManager.java @@ -14,6 +14,7 @@ import java.util.Collection; import java.util.Date; import java.util.LinkedList; import java.util.List; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.api.workdef.StateEventType; @@ -22,7 +23,6 @@ import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.log.LogType; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionAdapter; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManager.java index af364f319e0..b72a2afeb3f 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/DecisionReviewManager.java @@ -19,6 +19,7 @@ import java.util.List; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewOption; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; @@ -30,7 +31,6 @@ import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.workdef.SimpleDecisionReviewOption; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManager.java index 8d20b93b978..39bb016bd49 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerReviewDefinitionManager.java @@ -13,6 +13,7 @@ package org.eclipse.osee.ats.core.client.review; import java.util.Collection; import java.util.Date; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsPeerReviewDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; @@ -21,7 +22,6 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.log.LogType; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionAdapter; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManager.java index fbc4fcb1e34..3f50227ee87 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/PeerToPeerReviewManager.java @@ -17,6 +17,7 @@ import java.util.Date; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.api.workdef.StateType; @@ -31,7 +32,6 @@ import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/ValidateReviewManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/ValidateReviewManager.java index a3747bf1abe..a746af5a55a 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/ValidateReviewManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/ValidateReviewManager.java @@ -16,6 +16,7 @@ import java.util.Date; import java.util.HashSet; import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; @@ -26,7 +27,6 @@ import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectItem.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectItem.java index b06262f9fbb..7fa1214bba9 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectItem.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectItem.java @@ -15,8 +15,8 @@ import java.util.Collection; import java.util.Date; import java.util.HashSet; import java.util.Set; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AXml; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectManager.java index b04bf5421d3..872cd9ed3c6 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectManager.java @@ -17,10 +17,10 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectItem.Severity; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.validator.ArtifactValueProvider; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.validator.IValueProvider; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRole.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRole.java index d7f14927e75..ff0ab1ed038 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRole.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRole.java @@ -12,10 +12,10 @@ package org.eclipse.osee.ats.core.client.review.role; import java.text.NumberFormat; import java.util.logging.Level; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AXml; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRoleManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRoleManager.java index e44da91a590..809b30cce50 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRoleManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/review/role/UserRoleManager.java @@ -17,6 +17,7 @@ import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager; import org.eclipse.osee.ats.core.client.notify.AtsNotifyType; @@ -25,7 +26,6 @@ import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectManager; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.validator.ArtifactValueProvider; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.validator.IValueProvider; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.exception.OseeArgumentException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/AbstractTaskableArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/AbstractTaskableArtifact.java index 2df2691b0bd..7cc4ee3e5cd 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/AbstractTaskableArtifact.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/AbstractTaskableArtifact.java @@ -22,6 +22,7 @@ import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.core.client.internal.Activator; @@ -30,7 +31,6 @@ import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.PercentCompleteTotalUtil; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskArtifact.java index 71845d21be3..d8292e10119 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskArtifact.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskArtifact.java @@ -16,6 +16,7 @@ import java.util.Date; import java.util.List; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; @@ -28,7 +29,6 @@ import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskManager.java index bb9a9fc6343..27b612a4de6 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/TaskManager.java @@ -16,6 +16,7 @@ import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; @@ -26,7 +27,6 @@ import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.workdef.WorkDefinitionMatch; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/createtasks/CreateTasksOperation.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/createtasks/CreateTasksOperation.java index 47373d4dc14..756aff4b4c6 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/createtasks/CreateTasksOperation.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/task/createtasks/CreateTasksOperation.java @@ -20,7 +20,11 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.config.ActionableItemManager; import org.eclipse.osee.ats.core.client.internal.Activator; @@ -28,11 +32,9 @@ import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.CreateTeamOption; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; +import org.eclipse.osee.ats.core.client.version.AtsVersionStore; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.OperationLogger; @@ -151,7 +153,7 @@ public class CreateTasksOperation extends AbstractOperation { if (derivedArt instanceof TeamWorkFlowArtifact) { derivedTeamWfArt = (TeamWorkFlowArtifact) derivedArt; - IAtsVersion derivedArtVersion = derivedTeamWfArt.getTargetedVersion(); + IAtsVersion derivedArtVersion = AtsVersionService.get().getTargetedVersion(derivedTeamWfArt); boolean isDestVersion = destVersion.equals(derivedArtVersion); ActionableItemManager actionableItemsDamFromArt = derivedTeamWfArt.getActionableItemsDam(); @@ -194,8 +196,7 @@ public class CreateTasksOperation extends AbstractOperation { Arrays.asList(AtsUsersClient.getUser()), transaction, createdDate, createdBy, null, CreateTeamOption.Duplicate_If_Exists); if (destTeamWf != null) { - destTeamWf.setTargetedVersion(destVersion); - destTeamWf.setTargetedVersionLink(destVersion); + AtsVersionStore.setTargetedVersionLink(destTeamWf, destVersion); } } return destTeamWf; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowArtifact.java index 90a38298471..67a31c46f93 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowArtifact.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowArtifact.java @@ -12,29 +12,29 @@ package org.eclipse.osee.ats.core.client.team; import java.util.Collection; -import java.util.Collections; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.action.ActionArtifactRollup; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.config.ActionableItemManager; import org.eclipse.osee.ats.core.client.config.store.TeamDefinitionArtifactStore; -import org.eclipse.osee.ats.core.client.config.store.VersionArtifactStore; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; import org.eclipse.osee.ats.core.client.review.ReviewManager; import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; -import org.eclipse.osee.ats.core.client.version.TargetedVersionUtil; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.core.config.AtsVersionService; +import org.eclipse.osee.ats.core.config.Versions; import org.eclipse.osee.ats.core.util.AtsUtilCoreCore; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeArgumentException; @@ -52,13 +52,12 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; /** * @author Donald G. Dunne */ -public class TeamWorkFlowArtifact extends AbstractTaskableArtifact implements IATSStateMachineArtifact { +public class TeamWorkFlowArtifact extends AbstractTaskableArtifact implements IAtsTeamWorkflow, IATSStateMachineArtifact { private static final Set<Integer> teamArtsWithNoAction = new HashSet<Integer>(); private final ActionableItemManager actionableItemsDam; private boolean creatingWorkingBranch = false; private boolean committingWorkingBranch = false; - private IAtsVersion targetedVersion; public TeamWorkFlowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, IArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); @@ -111,8 +110,9 @@ public class TeamWorkFlowArtifact extends AbstractTaskableArtifact implements IA @Override public String getEditorTitle() throws OseeCoreException { try { - if (getTargetedVersion() != null) { - return String.format("%s: [%s] - %s", getType(), getTargetedVersionStr(), getName()); + IAtsVersion version = AtsVersionService.get().getTargetedVersion(this); + if (version != null) { + return String.format("%s: [%s] - %s", getType(), Versions.getTargetedVersionStr(version), getName()); } } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); @@ -275,29 +275,4 @@ public class TeamWorkFlowArtifact extends AbstractTaskableArtifact implements IA this.committingWorkingBranch = inProgress; } - public void setTargetedVersion(IAtsVersion targetedVersion) { - this.targetedVersion = targetedVersion; - } - - public void setTargetedVersionLink(IAtsVersion targetedVersion) throws OseeCoreException { - VersionArtifactStore store = new VersionArtifactStore(targetedVersion); - Artifact versionArt = store.getArtifact(); - if (versionArt != null) { - setRelations(AtsRelationTypes.TeamWorkflowTargetedForVersion_Version, Collections.singleton(versionArt)); - } - } - - @Override - public IAtsVersion getTargetedVersion() { - return targetedVersion; - } - - public IAtsVersion getTargetedVersionLinkAndUpdate() throws OseeCoreException { - IAtsVersion targetVersion = TargetedVersionUtil.getTargetedVersion(this); - if (targetedVersion != targetVersion) { - targetedVersion = targetVersion; - } - return targetedVersion; - } - } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowManager.java index 1c8cf9f2b92..57ab3ac170d 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/team/TeamWorkFlowManager.java @@ -18,20 +18,22 @@ import java.util.HashSet; import java.util.Set; import java.util.logging.Level; import org.eclipse.core.runtime.Assert; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IStateToken; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; +import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ITeamWorkflowProvider; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.ArtifactType; @@ -40,6 +42,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; /** @@ -301,4 +304,8 @@ public class TeamWorkFlowManager { } } + public static TeamWorkFlowArtifact getTeamWorkflowArt(IAtsTeamWorkflow teamWf) throws OseeCoreException { + return (TeamWorkFlowArtifact) ArtifactQuery.getArtifactFromId(teamWf.getGuid(), AtsUtilCore.getAtsBranchToken()); + } + } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUser.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUser.java index ce2240ff501..5d898676cf6 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUser.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUser.java @@ -5,7 +5,8 @@ */ package org.eclipse.osee.ats.core.client.util; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.framework.core.data.Identity; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.User; @@ -127,4 +128,14 @@ public class AtsUser implements IAtsUser { return "Exception: " + ex.getLocalizedMessage(); } } + + @Override + public boolean matches(Identity<?>... identities) { + for (Identity<?> identity : identities) { + if (equals(identity)) { + return true; + } + } + return false; + } } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUsersClient.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUsersClient.java index 4969fa8cef4..364b267a4a3 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUsersClient.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsUsersClient.java @@ -8,7 +8,7 @@ package org.eclipse.osee.ats.core.client.util; import java.util.Collection; import java.util.LinkedList; import java.util.List; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.framework.core.data.IUserToken; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/CopyActionDetails.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/CopyActionDetails.java index 9fa9f11aaed..386e9aa9784 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/CopyActionDetails.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/CopyActionDetails.java @@ -7,13 +7,13 @@ package org.eclipse.osee.ats.core.client.util; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.config.store.TeamDefinitionArtifactStore; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/SubscribeManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/SubscribeManager.java index f93e19cbc52..83b18c925c4 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/SubscribeManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/SubscribeManager.java @@ -15,8 +15,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/UsersByIds.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/UsersByIds.java index 47174eb5e49..de8632dc8c2 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/UsersByIds.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/UsersByIds.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/AtsVersionCache.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/AtsVersionCache.java new file mode 100644 index 00000000000..848467412b8 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/AtsVersionCache.java @@ -0,0 +1,39 @@ +/* + * Created on Jul 16, 2012 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.ats.core.client.version; + +import java.util.HashMap; +import java.util.Map; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; + +public class AtsVersionCache { + + public static AtsVersionCache instance = new AtsVersionCache(); + + public Map<String, IAtsVersion> hridToVersion = new HashMap<String, IAtsVersion>(500); + + public IAtsVersion getVersion(IAtsTeamWorkflow teamWf) { + return hridToVersion.get(teamWf.getHumanReadableId()); + } + + public boolean hasVersion(IAtsTeamWorkflow teamWf) { + IAtsVersion version = getVersion(teamWf); + return version != null && !version.equals(NullVersion.instance); + } + + public IAtsVersion cache(IAtsTeamWorkflow teamWf, IAtsVersion version) { + return hridToVersion.put(teamWf.getHumanReadableId(), version); + } + + public void deCache(IAtsTeamWorkflow teamWf) { + hridToVersion.remove(teamWf.getHumanReadableId()); + } + + public IAtsVersion cacheNull(IAtsTeamWorkflow teamWf) { + return cache(teamWf, NullVersion.instance); + } +} diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/AtsVersionServiceProvider.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/AtsVersionServiceProvider.java new file mode 100644 index 00000000000..2c983274086 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/AtsVersionServiceProvider.java @@ -0,0 +1,112 @@ +/* + * Created on Jul 16, 2012 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.ats.core.client.version; + +import java.util.Collection; +import java.util.logging.Level; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.version.IAtsVersionService; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; +import org.eclipse.osee.ats.core.client.internal.Activator; +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.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLog; + +public class AtsVersionServiceProvider implements IAtsVersionService { + + private IAtsVersion getTargetedVersionByTeamWf(IAtsTeamWorkflow teamWf) { + IAtsVersion version = AtsVersionCache.instance.getVersion(teamWf); + if (version == null) { + try { + version = AtsVersionStore.getTargetedVersion(teamWf); + } catch (OseeCoreException ex) { + OseeLog.log(Activator.class, Level.SEVERE, ex); + version = NullVersion.instance; + } + AtsVersionCache.instance.cache(teamWf, version); + } + return version; + } + + @Override + public IAtsVersion getTargetedVersion(Object object) { + IAtsVersion version = NullVersion.instance; + if (version == null) { + if (object instanceof AbstractWorkflowArtifact) { + try { + TeamWorkFlowArtifact teamArt = ((AbstractWorkflowArtifact) object).getParentTeamWorkflow(); + if (teamArt != null) { + version = getTargetedVersionByTeamWf(teamArt); + } + } catch (OseeCoreException ex) { + OseeLog.log(Activator.class, Level.SEVERE, ex); + } + } + } + return version; + } + + @Override + public IAtsVersion setTargetedVersion(IAtsTeamWorkflow teamWf, IAtsVersion version) { + return AtsVersionCache.instance.cache(teamWf, version); + } + + @Override + public Collection<IAtsVersion> getVersions(IAtsTeamDefinition teamDef) { + return null; + } + + @Override + public void addVersion(IAtsTeamDefinition teamDef, IAtsVersion version) { + } + + @Override + public IAtsTeamDefinition getTeamDefinition(IAtsVersion version) { + return null; + } + + @Override + public void setTeamDefinition(IAtsVersion version, IAtsTeamDefinition teamDef) { + } + + /** + * @return true if this is a TeamWorkflow and the version it's been targeted for has been released + */ + @Override + public boolean isReleased(IAtsTeamWorkflow teamWf) { + try { + IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(teamWf); + if (verArt != null) { + return verArt.isReleased(); + } + } catch (Exception ex) { + OseeLog.log(Activator.class, Level.SEVERE, ex); + } + return false; + } + + @Override + public boolean isVersionLocked(IAtsTeamWorkflow teamWf) { + try { + IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(teamWf); + if (verArt != null) { + return verArt.isVersionLocked(); + } + } catch (Exception ex) { + OseeLog.log(Activator.class, Level.SEVERE, ex); + } + return false; + } + + @Override + public boolean hasTargetedVersion(Object object) { + return getTargetedVersion(object) != null && !getTargetedVersion(object).equals(NullVersion.instance); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/AtsVersionStore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/AtsVersionStore.java new file mode 100644 index 00000000000..dba629562e2 --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/AtsVersionStore.java @@ -0,0 +1,66 @@ +/* + * Created on Jul 16, 2012 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.ats.core.client.version; + +import java.util.Collections; +import java.util.List; +import java.util.logging.Level; +import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; +import org.eclipse.osee.ats.core.client.config.store.VersionArtifactStore; +import org.eclipse.osee.ats.core.client.internal.Activator; +import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; +import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.config.AtsConfigCache; +import org.eclipse.osee.ats.core.config.AtsVersionService; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; + +public class AtsVersionStore { + + public static TeamWorkFlowArtifact setTargetedVersionLink(IAtsTeamWorkflow teamWf, IAtsVersion version) throws OseeCoreException { + VersionArtifactStore store = new VersionArtifactStore(version); + Artifact versionArt = store.getArtifact(); + if (versionArt != null) { + TeamWorkFlowArtifact teamArt = TeamWorkFlowManager.getTeamWorkflowArt(teamWf); + if (teamArt != null) { + teamArt.setRelations(AtsRelationTypes.TeamWorkflowTargetedForVersion_Version, + Collections.singleton(versionArt)); + AtsVersionService.get().setTargetedVersion(teamWf, version); + return teamArt; + } else { + throw new OseeStateException("Team Workflow artifact does not exist [%s]", teamWf.toStringWithId()); + } + } else { + throw new OseeStateException("Version artifact does not exist [%s]", version.toStringWithId()); + } + } + + public static IAtsVersion getTargetedVersion(Object object) throws OseeCoreException { + IAtsVersion version = NullVersion.instance; + if (object instanceof AbstractWorkflowArtifact) { + TeamWorkFlowArtifact teamArt = ((AbstractWorkflowArtifact) object).getParentTeamWorkflow(); + if (teamArt != null) { + if (teamArt.getRelatedArtifactsCount(AtsRelationTypes.TeamWorkflowTargetedForVersion_Version) > 0) { + List<Artifact> verArts = + teamArt.getRelatedArtifacts(AtsRelationTypes.TeamWorkflowTargetedForVersion_Version); + if (verArts.size() > 1) { + OseeLog.log(Activator.class, Level.SEVERE, + "Multiple targeted versions for artifact " + teamArt.toStringWithId()); + version = AtsConfigCache.getSoleByGuid(verArts.iterator().next().getGuid(), IAtsVersion.class); + } else { + version = AtsConfigCache.getSoleByGuid(verArts.iterator().next().getGuid(), IAtsVersion.class); + } + } + } + } + return version; + } +} diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/NullVersion.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/NullVersion.java new file mode 100644 index 00000000000..e0bcb0c30eb --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/NullVersion.java @@ -0,0 +1,219 @@ +/* + * Created on Jul 16, 2012 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.ats.core.client.version; + +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Set; +import org.eclipse.osee.ats.api.commit.ICommitConfigArtifact; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.framework.core.data.Identity; +import org.eclipse.osee.framework.core.util.Result; + +public class NullVersion implements IAtsVersion { + + public static NullVersion instance = new NullVersion(); + + private NullVersion() { + } + + @Override + public String getName() { + return "Null Version"; + } + + @Override + public String getTypeName() { + return "Version"; + } + + @Override + public String toStringWithId() { + return getName(); + } + + @Override + public String getGuid() { + return getName(); + } + + @Override + public String getHumanReadableId() { + return getName(); + } + + @Override + public boolean matches(Identity<?>... identities) { + return false; + } + + @Override + public void setHumanReadableId(String humanReadableId) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public void setName(String name) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public String getFullName() { + return getName(); + } + + @Override + public void setFullName(String fullName) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public String getDescription() { + return getName(); + } + + @Override + public void setDescription(String description) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public List<IAtsVersion> getParallelVersions() { + return null; + } + + @Override + public void getParallelVersions(Set<ICommitConfigArtifact> configArts) { + } + + @Override + public void setParallelVersions(List<IAtsVersion> parallelVersions) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public String getBaslineBranchGuid() { + return null; + } + + @Override + public String getBaselineBranchGuidInherited() { + return null; + } + + @Override + public void setBaselineBranchGuid(String parentBranchGuid) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public String getCommitFullDisplayName() { + return null; + } + + @Override + public Result isAllowCreateBranchInherited() { + return null; + } + + @Override + public boolean isAllowCreateBranch() { + return false; + } + + @Override + public void setAllowCreateBranch(boolean allow) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public boolean isAllowCommitBranch() { + return false; + } + + @Override + public void setAllowCommitBranch(boolean allow) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public Result isAllowCommitBranchInherited() { + return null; + } + + @Override + public Date getReleaseDate() { + return null; + } + + @Override + public void setReleaseDate(Date date) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public void setReleasedDate(Date Date) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public Boolean isReleased() { + return false; + } + + @Override + public void setReleased(boolean released) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public Date getEstimatedReleaseDate() { + return null; + } + + @Override + public void setEstimatedReleasedDate(Date date) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public Collection<String> getStaticIds() { + return Collections.emptyList(); + } + + @Override + public boolean isLocked() { + return false; + } + + @Override + public Boolean isVersionLocked() { + return false; + } + + @Override + public void setLocked(boolean locked) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public void setVersionLocked(boolean locked) { + throw new IllegalArgumentException("not valid for " + getName()); + } + + @Override + public Boolean isNextVersion() { + return false; + } + + @Override + public void setNextVersion(boolean nextVersion) { + throw new IllegalArgumentException("not valid for " + getName()); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/TargetedVersionUtil.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/TargetedVersionUtil.java deleted file mode 100644 index 339aab71d00..00000000000 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/version/TargetedVersionUtil.java +++ /dev/null @@ -1,85 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.ats.core.client.version; - -import java.util.Collection; -import java.util.List; -import java.util.logging.Level; -import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.api.data.AtsRelationTypes; -import org.eclipse.osee.ats.core.client.internal.Activator; -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.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.utility.Artifacts; - -/** - * @author Donald G. Dunne - */ -public class TargetedVersionUtil { - - public static IAtsVersion getTargetedVersion(Object object) throws OseeCoreException { - if (object instanceof AbstractWorkflowArtifact) { - TeamWorkFlowArtifact teamArt = ((AbstractWorkflowArtifact) object).getParentTeamWorkflow(); - if (teamArt != null) { - if (teamArt.getRelatedArtifactsCount(AtsRelationTypes.TeamWorkflowTargetedForVersion_Version) > 0) { - List<Artifact> verArts = - teamArt.getRelatedArtifacts(AtsRelationTypes.TeamWorkflowTargetedForVersion_Version); - if (verArts.size() > 1) { - OseeLog.log(Activator.class, Level.SEVERE, - "Multiple targeted versions for artifact " + teamArt.toStringWithId()); - return AtsConfigCache.getSoleByGuid(verArts.iterator().next().getGuid(), IAtsVersion.class); - } else { - return AtsConfigCache.getSoleByGuid(verArts.iterator().next().getGuid(), IAtsVersion.class); - } - } - } - } - return null; - } - - public static String getTargetedVersionStr(Object object) throws OseeCoreException { - if (object instanceof AbstractWorkflowArtifact) { - TeamWorkFlowArtifact teamArt = ((AbstractWorkflowArtifact) object).getParentTeamWorkflow(); - if (teamArt != null) { - Collection<Artifact> verArts = - teamArt.getRelatedArtifacts(AtsRelationTypes.TeamWorkflowTargetedForVersion_Version); - if (verArts.isEmpty()) { - return ""; - } - if (verArts.size() > 1) { - String errStr = - "Workflow " + teamArt.getHumanReadableId() + " targeted for multiple versions: " + Artifacts.commaArts(verArts); - OseeLog.log(Activator.class, Level.SEVERE, errStr, null); - return "!Error " + errStr; - } - Artifact verArt = verArts.iterator().next(); - if (!teamArt.isCompleted() && !teamArt.isCancelled() && verArt.getSoleAttributeValue( - AtsAttributeTypes.Released, false)) { - String errStr = - "Workflow " + teamArt.getHumanReadableId() + " targeted for released version, but not completed: " + verArt; - if (!teamArt.isTargetedErrorLogged()) { - OseeLog.log(Activator.class, Level.SEVERE, errStr, null); - teamArt.setTargetedErrorLogged(true); - } - return "!Error " + errStr; - } - return verArt.getName(); - } - } - return ""; - } - -} diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workdef/WorkDefinitionFactory.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workdef/WorkDefinitionFactory.java index a39e677dff3..1066062bf4c 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workdef/WorkDefinitionFactory.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workdef/WorkDefinitionFactory.java @@ -20,6 +20,7 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionService; import org.eclipse.osee.ats.core.client.internal.Activator; @@ -30,7 +31,6 @@ import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.util.WorkflowManagerCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ITeamWorkflowProvider; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.core.workdef.AtsWorkDefinitionService; import org.eclipse.osee.ats.core.workdef.WorkDefinitionMatch; import org.eclipse.osee.framework.core.enums.DeletionFlag; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java index a571941e88e..0cd2aaf73a9 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AbstractWorkflowArtifact.java @@ -19,13 +19,18 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; import org.eclipse.core.runtime.Platform; +import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; import org.eclipse.osee.ats.api.workdef.StateType; +import org.eclipse.osee.ats.api.workflow.IAtsWorkData; +import org.eclipse.osee.ats.api.workflow.WorkStateProvider; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.artifact.AbstractAtsArtifact; import org.eclipse.osee.ats.core.client.internal.Activator; @@ -37,7 +42,6 @@ import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; -import org.eclipse.osee.ats.core.client.version.TargetedVersionUtil; import org.eclipse.osee.ats.core.client.workdef.WorkDefinitionFactory; import org.eclipse.osee.ats.core.client.workflow.log.ArtifactLog; import org.eclipse.osee.ats.core.client.workflow.log.AtsLog; @@ -46,12 +50,6 @@ import org.eclipse.osee.ats.core.client.workflow.log.LogType; import org.eclipse.osee.ats.core.client.workflow.note.ArtifactNote; import org.eclipse.osee.ats.core.client.workflow.note.AtsNote; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.IAtsWorkData; -import org.eclipse.osee.ats.core.model.IAtsWorkItem; -import org.eclipse.osee.ats.core.model.WorkStateProvider; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.core.workdef.WorkDefinitionMatch; @@ -93,7 +91,6 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple private final AtsLog atsLog; private final AtsNote atsNote; private boolean inTransition = false; - private boolean targetedErrorLogged = false; private IAtsWorkData atsWorkData; public AbstractWorkflowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, IArtifactType artifactType) throws OseeCoreException { @@ -174,6 +171,7 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple return parentAction; } + @Override @SuppressWarnings("unused") public TeamWorkFlowArtifact getParentTeamWorkflow() throws OseeCoreException { return parentTeamArt; @@ -503,41 +501,6 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple } } - /** - * @return true if this is a TeamWorkflow and the version it's been targeted for has been released - */ - public boolean isReleased() { - try { - IAtsVersion verArt = getTargetedVersion(); - if (verArt != null) { - return verArt.isReleased(); - } - } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); - } - return false; - } - - public boolean isVersionLocked() { - try { - IAtsVersion verArt = getTargetedVersion(); - if (verArt != null) { - return verArt.isVersionLocked(); - } - } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); - } - return false; - } - - public IAtsVersion getTargetedVersion() throws OseeCoreException { - return TargetedVersionUtil.getTargetedVersion(this); - } - - public String getTargetedVersionStr() throws OseeCoreException { - return TargetedVersionUtil.getTargetedVersionStr(this); - } - public void setCreatedBy(IAtsUser user, boolean logChange, Date date) throws OseeCoreException { if (logChange) { if (getSoleAttributeValue(AtsAttributeTypes.CreatedBy, null) == null) { @@ -746,14 +709,6 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple return (CmAccessControl) context.getService(reference); } - public boolean isTargetedErrorLogged() { - return targetedErrorLogged; - } - - public void setTargetedErrorLogged(boolean targetedErrorLogged) { - this.targetedErrorLogged = targetedErrorLogged; - } - public List<IAtsStateDefinition> getToStatesWithCompleteCancelReturnStates() throws OseeCoreException { List<IAtsStateDefinition> allPages = new ArrayList<IAtsStateDefinition>(); IAtsStateDefinition currState = getStateDefinition(); diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AtsWorkData.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AtsWorkData.java index a33dc6d1b5b..297f2cc3312 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AtsWorkData.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/AtsWorkData.java @@ -7,9 +7,9 @@ package org.eclipse.osee.ats.core.client.workflow; import java.util.Date; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.StateType; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsWorkData; +import org.eclipse.osee.ats.api.workflow.IAtsWorkData; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/ITeamWorkflowProvider.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/ITeamWorkflowProvider.java index 771f248bd31..3413c506e83 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/ITeamWorkflowProvider.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/ITeamWorkflowProvider.java @@ -11,9 +11,9 @@ package org.eclipse.osee.ats.core.client.workflow; import java.util.Collection; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/PercentCompleteTotalUtil.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/PercentCompleteTotalUtil.java index 71a2072d2a1..5e1e940f2d2 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/PercentCompleteTotalUtil.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/PercentCompleteTotalUtil.java @@ -15,6 +15,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; +import org.eclipse.osee.ats.api.workflow.WorkStateProvider; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; import org.eclipse.osee.ats.core.client.review.ReviewManager; @@ -22,7 +23,6 @@ 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.client.util.WorkflowManagerCore; -import org.eclipse.osee.ats.core.model.WorkStateProvider; import org.eclipse.osee.ats.core.workdef.AtsWorkDefinitionService; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/StateManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/StateManager.java index 61e88a4cea3..10d58c10393 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/StateManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/StateManager.java @@ -23,10 +23,13 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsArtifactToken; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.api.workdef.StateType; +import org.eclipse.osee.ats.api.workflow.WorkState; +import org.eclipse.osee.ats.api.workflow.WorkStateProvider; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager; import org.eclipse.osee.ats.core.client.notify.AtsNotifyType; @@ -37,10 +40,7 @@ import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workdef.WorkDefinitionFactory; import org.eclipse.osee.ats.core.client.workflow.log.LogItem; import org.eclipse.osee.ats.core.client.workflow.log.LogType; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.WorkState; import org.eclipse.osee.ats.core.model.WorkStateFactory; -import org.eclipse.osee.ats.core.model.WorkStateProvider; import org.eclipse.osee.ats.core.model.impl.WorkStateImpl; import org.eclipse.osee.ats.core.model.impl.WorkStateProviderImpl; import org.eclipse.osee.ats.core.notify.IAtsNotificationListener; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/AtsLog.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/AtsLog.java index 5fa2e281b1f..edfa43d7a5a 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/AtsLog.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/AtsLog.java @@ -19,9 +19,9 @@ import java.util.List; import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.internal.Activator; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.AXml; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/LogItem.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/LogItem.java index 7bdf6d24fa7..2ae97139482 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/LogItem.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/log/LogItem.java @@ -14,7 +14,7 @@ import static org.eclipse.osee.framework.jdk.core.util.Strings.intern; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.DateUtil; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/AtsNote.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/AtsNote.java index 15d7b3a6f8e..bdf41332927 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/AtsNote.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/AtsNote.java @@ -18,8 +18,8 @@ import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.internal.Activator; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/NoteItem.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/NoteItem.java index b89b96696d6..90310f9c33c 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/NoteItem.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/note/NoteItem.java @@ -15,8 +15,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.logging.Level; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.internal.Activator; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.UserNotInDatabase; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/ITransitionHelper.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/ITransitionHelper.java index ae886e88331..e239aaa4c51 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/ITransitionHelper.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/ITransitionHelper.java @@ -11,9 +11,9 @@ package org.eclipse.osee.ats.core.client.workflow.transition; import java.util.Collection; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/ITransitionListener.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/ITransitionListener.java index e59b7e8efbc..5e1b08e174a 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/ITransitionListener.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/ITransitionListener.java @@ -11,9 +11,9 @@ package org.eclipse.osee.ats.core.client.workflow.transition; import java.util.Collection; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionAdapter.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionAdapter.java index a5fd7841b88..b036640c0e4 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionAdapter.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionAdapter.java @@ -11,9 +11,9 @@ package org.eclipse.osee.ats.core.client.workflow.transition; import java.util.Collection; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionHelper.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionHelper.java index 9d4fada3236..cd49ad3f6c5 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionHelper.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionHelper.java @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.core.client.workflow.transition; import java.util.Collection; import java.util.List; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManager.java index 737afbec197..4f03cb41884 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManager.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManager.java @@ -12,6 +12,7 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; @@ -31,7 +32,7 @@ import org.eclipse.osee.ats.core.client.util.WorkflowManagerCore; import org.eclipse.osee.ats.core.client.validator.AtsXWidgetValidateManagerClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.log.LogType; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.ats.core.workflow.transition.TransitionResult; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -366,7 +367,7 @@ public class TransitionManager { // Only check this if TeamWorkflow, not for reviews if (awa.isOfType(AtsArtifactTypes.TeamWorkflow) && (teamDefRequiresTargetedVersion || pageRequiresTargetedVersion) && // - awa.getTargetedVersion() == null && // + AtsVersionService.get().hasTargetedVersion(awa) && // !toStateDef.getStateType().isCancelledState()) { results.addResult(awa, TransitionResult.MUST_BE_TARGETED_FOR_VERSION); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AssigneeColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AssigneeColumnTest.java index a995ca346f7..bde85a562fd 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AssigneeColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AssigneeColumnTest.java @@ -8,12 +8,12 @@ package org.eclipse.osee.ats.core.column; import java.util.Arrays; import junit.framework.Assert; import org.eclipse.osee.ats.api.workdef.StateType; +import org.eclipse.osee.ats.api.workflow.HasWorkData; +import org.eclipse.osee.ats.api.workflow.IAtsWorkData; import org.eclipse.osee.ats.core.mock.MockActionGroup; import org.eclipse.osee.ats.core.mock.MockAtsUser; import org.eclipse.osee.ats.core.mock.MockWorkData; import org.eclipse.osee.ats.core.mock.MockWorkItem; -import org.eclipse.osee.ats.core.model.HasWorkData; -import org.eclipse.osee.ats.core.model.IAtsWorkData; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ImplementersColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ImplementersColumnTest.java index a87e6d58fe2..b3897e9b3c2 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ImplementersColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ImplementersColumnTest.java @@ -9,11 +9,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import junit.framework.Assert; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.core.mock.MockActionGroup; import org.eclipse.osee.ats.core.mock.MockAtsUser; import org.eclipse.osee.ats.core.mock.MockWorkItem; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.users.UnAssigned; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockAtsUser.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockAtsUser.java index 8c9208df880..9f1eb4035b3 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockAtsUser.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockAtsUser.java @@ -5,7 +5,8 @@ */ package org.eclipse.osee.ats.core.mock; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.framework.core.data.Identity; /** * @author Donald G. Dunne @@ -111,4 +112,14 @@ public class MockAtsUser implements IAtsUser { return active; } + @Override + public boolean matches(Identity<?>... identities) { + for (Identity<?> identity : identities) { + if (equals(identity)) { + return true; + } + } + return false; + } + } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockState.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockState.java index 8d2c7d58aa7..e59b94013cd 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockState.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockState.java @@ -7,7 +7,7 @@ package org.eclipse.osee.ats.core.mock; import java.util.LinkedList; import java.util.List; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUser; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkData.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkData.java index e92c185652c..017bc3ec858 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkData.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkData.java @@ -6,9 +6,9 @@ package org.eclipse.osee.ats.core.mock; import java.util.Date; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.StateType; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsWorkData; +import org.eclipse.osee.ats.api.workflow.IAtsWorkData; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java index 19f9bd56994..8a7ff196c9e 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java @@ -6,14 +6,16 @@ package org.eclipse.osee.ats.core.mock; import java.util.List; +import org.eclipse.osee.ats.api.IAtsWorkItem; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.StateType; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsWorkData; -import org.eclipse.osee.ats.core.model.IAtsWorkItem; -import org.eclipse.osee.ats.core.model.WorkStateProvider; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; +import org.eclipse.osee.ats.api.workflow.IAtsWorkData; +import org.eclipse.osee.ats.api.workflow.WorkStateProvider; import org.eclipse.osee.ats.core.model.impl.WorkStateImpl; import org.eclipse.osee.ats.core.model.impl.WorkStateProviderImpl; import org.eclipse.osee.ats.core.util.AtsUserGroup; +import org.eclipse.osee.framework.core.data.Identity; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** @@ -100,4 +102,19 @@ public class MockWorkItem implements IAtsWorkItem { implementers.addUser(joe); } + @Override + public boolean matches(Identity<?>... identities) { + for (Identity<?> identity : identities) { + if (equals(identity)) { + return true; + } + } + return false; + } + + @Override + public IAtsTeamWorkflow getParentTeamWorkflow() throws OseeCoreException { + return null; + } + } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkStateFactory.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkStateFactory.java index 029ecb9cdfa..228dc47a8e3 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkStateFactory.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkStateFactory.java @@ -6,8 +6,8 @@ package org.eclipse.osee.ats.core.mock; import java.util.List; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.WorkState; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.workflow.WorkState; import org.eclipse.osee.ats.core.model.WorkStateFactory; import org.eclipse.osee.ats.core.model.impl.WorkStateImpl; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsObjectTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsObjectTest.java index bfbb7444256..2e4fc795b37 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsObjectTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/AtsObjectTest.java @@ -10,7 +10,7 @@ import org.junit.Test; /** * Test case for {@link AtsObject} - * + * * @author Donald G. Dunne */ public class AtsObjectTest { @@ -46,13 +46,11 @@ public class AtsObjectTest { Assert.assertFalse(obj.equals(null)); Assert.assertFalse(obj.equals("str")); - AtsObject obj3 = new AtsObject("hello", "GUID", "HRID"); - obj3.setGuid(null); + AtsObject obj3 = new AtsObject("hello", null, "HRID"); Assert.assertFalse(obj.equals(obj3)); Assert.assertFalse(obj3.equals(obj)); - AtsObject obj4 = new AtsObject("hello", "GUID", "HRID"); - obj4.setGuid(null); + AtsObject obj4 = new AtsObject("hello", null, "HRID"); Assert.assertFalse(obj3.equals(obj4)); } @@ -61,8 +59,7 @@ public class AtsObjectTest { AtsObject obj = new AtsObject("hello", "GUID", "HRID"); Assert.assertEquals(2199208, obj.hashCode()); - obj = new AtsObject("hello"); - obj.setGuid(null); + obj = new AtsObject("hello", null, "HRID"); Assert.assertEquals(31, obj.hashCode()); } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImplTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImplTest.java index 52b4b28ad80..1619fc52550 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImplTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImplTest.java @@ -10,9 +10,9 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; import junit.framework.Assert; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.mock.MockAtsUser; import org.eclipse.osee.ats.core.mock.MockWorkStateFactory; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.notify.IAtsNotificationListener; import org.eclipse.osee.ats.core.users.Guest; import org.eclipse.osee.ats.core.users.UnAssigned; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsUsersTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsUsersTest.java index 59578303866..7f79b599b2f 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsUsersTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsUsersTest.java @@ -11,8 +11,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import junit.framework.Assert; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.mock.MockAtsUser; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/SystemUsersTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/SystemUsersTest.java index 3171b9881f5..95031c7cb83 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/SystemUsersTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/SystemUsersTest.java @@ -7,7 +7,8 @@ package org.eclipse.osee.ats.core.users; import java.util.HashMap; import junit.framework.Assert; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.framework.core.data.Identity; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.junit.Test; @@ -233,5 +234,10 @@ public class SystemUsersTest { public boolean isActive() { return true; } + + @Override + public boolean matches(Identity<?>... identities) { + return false; + } }; } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsObjectsTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsObjectsTest.java index 03d0838886d..e992507060a 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsObjectsTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsObjectsTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import junit.framework.Assert; -import org.eclipse.osee.ats.core.model.IAtsObject; +import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.ats.core.users.Guest; import org.eclipse.osee.ats.core.users.SystemUser; import org.eclipse.osee.ats.core.users.UnAssigned; diff --git a/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF index c908e826f8e..2cfab579511 100644 --- a/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF @@ -14,11 +14,21 @@ Import-Package: com.google.inject, org.eclipse.emf.ecore.resource, org.eclipse.emf.ecore.resource.impl, org.eclipse.emf.ecore.xmi.impl, + org.eclipse.osee.ats.api, + org.eclipse.osee.ats.api.ai, + org.eclipse.osee.ats.api.commit, + org.eclipse.osee.ats.api.data, + org.eclipse.osee.ats.api.rule, + org.eclipse.osee.ats.api.team, + org.eclipse.osee.ats.api.user, + org.eclipse.osee.ats.api.version, org.eclipse.osee.ats.api.workdef, + org.eclipse.osee.ats.api.workflow, org.eclipse.osee.ats.dsl, org.eclipse.osee.ats.dsl.atsDsl, org.eclipse.osee.ats.dsl.atsDsl.impl, org.eclipse.osee.framework.core.client, + org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, org.eclipse.osee.framework.core.util, diff --git a/plugins/org.eclipse.osee.ats.core/OSGI-INF/ats.version.provider.ref.xml b/plugins/org.eclipse.osee.ats.core/OSGI-INF/ats.version.provider.ref.xml new file mode 100644 index 00000000000..8f22c00683a --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core/OSGI-INF/ats.version.provider.ref.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" name="org.eclipse.osee.ats.core.config.AtsVersionService"> + <implementation class="org.eclipse.osee.ats.core.config.AtsVersionService"/> + <reference bind="setVersionService" cardinality="1..1" interface="org.eclipse.osee.ats.api.version.IAtsVersionService" name="IAtsVersionService" policy="static"/> +</scr:component> diff --git a/plugins/org.eclipse.osee.ats.core/OSGI-INF/ats.workdef.provider.ref.xml b/plugins/org.eclipse.osee.ats.core/OSGI-INF/ats.workdef.provider.ref.xml index 0700ba25e30..44273e80ac3 100644 --- a/plugins/org.eclipse.osee.ats.core/OSGI-INF/ats.workdef.provider.ref.xml +++ b/plugins/org.eclipse.osee.ats.core/OSGI-INF/ats.workdef.provider.ref.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" name="org.eclipse.osee.ats.core.workdef.WorkDefUtil"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" name="org.eclipse.osee.ats.core.workdef.AtsWorkDefinitionService"> <reference bind="setWorkDefinitionService" cardinality="1..1" interface="org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionService" name="org.eclipse.osee.ats.api.workdef.IAtsWorkDefinitionService" policy="static"/> <implementation class="org.eclipse.osee.ats.core.workdef.AtsWorkDefinitionService"/> </scr:component> diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AssigneeColumn.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AssigneeColumn.java index 21c5ba982fc..f56f0dff035 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AssigneeColumn.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AssigneeColumn.java @@ -8,11 +8,11 @@ package org.eclipse.osee.ats.core.column; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.eclipse.osee.ats.core.model.HasActions; -import org.eclipse.osee.ats.core.model.HasAssignees; -import org.eclipse.osee.ats.core.model.HasWorkData; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsWorkItem; +import org.eclipse.osee.ats.api.IAtsWorkItem; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.workflow.HasActions; +import org.eclipse.osee.ats.api.workflow.HasAssignees; +import org.eclipse.osee.ats.api.workflow.HasWorkData; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/ImplementersColumn.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/ImplementersColumn.java index 4dc613b9c7d..401e0d8cfc6 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/ImplementersColumn.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/ImplementersColumn.java @@ -9,9 +9,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; import java.util.List; +import org.eclipse.osee.ats.api.IAtsWorkItem; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.model.IActionGroup; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsWorkItem; import org.eclipse.osee.ats.core.users.UnAssigned; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItemFactory.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItemFactory.java index d36f52470ac..2a763d81d69 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItemFactory.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItemFactory.java @@ -5,8 +5,8 @@ */ package org.eclipse.osee.ats.core.config; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.core.config.impl.ActionableItem; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.framework.jdk.core.util.HumanReadableId; /** diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItemSorter.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItemSorter.java index a3d19ae7c50..5281a9ff45d 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItemSorter.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItemSorter.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.core.config; import java.io.Serializable; import java.util.Comparator; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItems.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItems.java index b1c80576228..7a5b153acfd 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItems.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/ActionableItems.java @@ -10,9 +10,9 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsConfigObject; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.IAtsConfigObject; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/AtsConfigCache.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/AtsConfigCache.java index e7ea48c4111..1012c6b84bd 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/AtsConfigCache.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/AtsConfigCache.java @@ -10,8 +10,8 @@ import java.util.Collection; import java.util.List; import java.util.Map.Entry; import java.util.Set; -import org.eclipse.osee.ats.core.model.IAtsConfigObject; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.IAtsConfigObject; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.framework.jdk.core.type.HashCollection; /** diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/AtsVersionService.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/AtsVersionService.java new file mode 100644 index 00000000000..ce69fda315a --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/AtsVersionService.java @@ -0,0 +1,30 @@ +/* + * Created on Jul 16, 2012 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.ats.core.config; + +import org.eclipse.osee.ats.api.version.IAtsVersionService; + +public class AtsVersionService { + + private static AtsVersionService instance; + private IAtsVersionService service; + + public static IAtsVersionService get() { + if (instance == null) { + throw new IllegalStateException("ATS Version Service has not been activated"); + } + return instance.service; + } + + public void setVersionService(IAtsVersionService service) { + this.service = service; + } + + public void start() { + instance = this; + } + +} diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/RuleManager.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/RuleManager.java index 9bfe10f31ea..94f292aaac7 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/RuleManager.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/RuleManager.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.core.config; import java.util.ArrayList; import java.util.List; -import org.eclipse.osee.ats.core.model.IAtsRules; +import org.eclipse.osee.ats.api.rule.IAtsRules; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinitionFactory.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinitionFactory.java index 437251e5d15..f2ec006857e 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinitionFactory.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinitionFactory.java @@ -5,8 +5,8 @@ */ package org.eclipse.osee.ats.core.config; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.impl.TeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.framework.jdk.core.util.HumanReadableId; /** diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinitionSorter.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinitionSorter.java index 653a90fbf20..1bf13c81a86 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinitionSorter.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinitionSorter.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.core.config; import java.io.Serializable; import java.util.Comparator; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinitions.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinitions.java index 011ebc9db31..0659860abdc 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinitions.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/TeamDefinitions.java @@ -10,8 +10,8 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/VersionFactory.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/VersionFactory.java index 3db45e59006..e4272894a17 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/VersionFactory.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/VersionFactory.java @@ -5,8 +5,8 @@ */ package org.eclipse.osee.ats.core.config; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.config.impl.Version; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.HumanReadableId; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/Versions.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/Versions.java index 311204ecbf1..82393312aa5 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/Versions.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/Versions.java @@ -7,13 +7,23 @@ package org.eclipse.osee.ats.core.config; import java.util.ArrayList; import java.util.Collection; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import java.util.HashSet; +import java.util.Set; +import java.util.logging.Level; +import org.eclipse.osee.ats.api.IAtsWorkItem; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; +import org.eclipse.osee.ats.core.internal.Activator; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLog; /** * @author Donald G. Dunne */ public class Versions { + private static Set<String> targetErrorLoggedForId = new HashSet<String>(10); + public static Collection<String> getNames(Collection<? extends IAtsVersion> versions) { ArrayList<String> names = new ArrayList<String>(); for (IAtsVersion version : versions) { @@ -22,4 +32,25 @@ public class Versions { return names; } + public static String getTargetedVersionStr(Object object) throws OseeCoreException { + if (object instanceof IAtsWorkItem) { + IAtsTeamWorkflow teamWf = ((IAtsWorkItem) object).getParentTeamWorkflow(); + if (teamWf != null) { + IAtsVersion version = AtsVersionService.get().getTargetedVersion(object); + if (!(teamWf.getWorkData().isCompleted() && !teamWf.getWorkData().isCancelled() && AtsVersionService.get().isReleased( + teamWf))) { + String errStr = + "Workflow " + teamWf.getHumanReadableId() + " targeted for released version, but not completed: " + version; + // only log error once + if (!targetErrorLoggedForId.contains(teamWf.getGuid())) { + OseeLog.log(Activator.class, Level.SEVERE, errStr, null); + targetErrorLoggedForId.add(teamWf.getGuid()); + } + return "!Error " + errStr; + } + return version.getName(); + } + } + return ""; + } } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/impl/ActionableItem.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/impl/ActionableItem.java index 0bb5ad0d2a8..0cc9378c268 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/impl/ActionableItem.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/impl/ActionableItem.java @@ -8,10 +8,10 @@ package org.eclipse.osee.ats.core.config.impl; import java.util.Collection; import java.util.HashSet; import java.util.Set; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.model.impl.AtsObject; /** diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/impl/TeamDefinition.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/impl/TeamDefinition.java index 4ca1acf9e72..64b56268db7 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/impl/TeamDefinition.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/impl/TeamDefinition.java @@ -5,15 +5,15 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.team.TeamDefinitionOptions; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.version.VersionLockedType; +import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; import org.eclipse.osee.ats.core.config.RuleManager; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.TeamDefinitionOptions; -import org.eclipse.osee.ats.core.model.VersionLockedType; -import org.eclipse.osee.ats.core.model.VersionReleaseType; import org.eclipse.osee.ats.core.model.impl.AtsObject; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/impl/Version.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/impl/Version.java index e9fe61bea14..eb19a2887f3 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/impl/Version.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/config/impl/Version.java @@ -6,10 +6,12 @@ import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.ICommitConfigArtifact; +import org.eclipse.osee.ats.api.commit.ICommitConfigArtifact; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.model.impl.AtsObject; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -36,7 +38,7 @@ public class Version extends AtsObject implements IAtsVersion { private List<IAtsVersion> parallelVersions = new ArrayList<IAtsVersion>(); private final Set<String> staticIds = new HashSet<String>(); - private IAtsTeamDefinition teamDefinition = null; + private final IAtsTeamDefinition teamDefinition = null; public Version(String name, String guid, String humanReadableId) { super(name, guid, humanReadableId); @@ -80,11 +82,6 @@ public class Version extends AtsObject implements IAtsVersion { this.released = released; } - @Override - public IAtsTeamDefinition getTeamDefinition() { - return teamDefinition; - } - public void setEstimatedReleaseDate(Date estimatedReleaseDate) { this.estimatedReleaseDate = estimatedReleaseDate; } @@ -126,7 +123,7 @@ public class Version extends AtsObject implements IAtsVersion { if (Strings.isValid(baselineBranchGuid)) { return baselineBranchGuid; } else { - return getTeamDefinition().getTeamBranchGuid(); + return AtsVersionService.get().getTeamDefinition(this).getTeamBranchGuid(); } } @@ -159,11 +156,6 @@ public class Version extends AtsObject implements IAtsVersion { } @Override - public void setTeamDefinition(IAtsTeamDefinition teamDefinition) { - this.teamDefinition = teamDefinition; - } - - @Override public String getDescription() { return description; } @@ -235,7 +227,11 @@ public class Version extends AtsObject implements IAtsVersion { @Override public void setName(String name) { - super.setName(name); + try { + super.setName(name); + } catch (OseeCoreException ex) { + throw new IllegalArgumentException("error setting name", ex); + } } @Override diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IActionGroup.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IActionGroup.java index ae0c2642406..3c848468036 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IActionGroup.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IActionGroup.java @@ -5,6 +5,9 @@ */ package org.eclipse.osee.ats.core.model; +import org.eclipse.osee.ats.api.IAtsObject; +import org.eclipse.osee.ats.api.workflow.HasActions; + /** * @author Donald G. Dunne */ diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsWorkItem.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsWorkItem.java deleted file mode 100644 index 1e32f74c3e1..00000000000 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/IAtsWorkItem.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Created on Feb 9, 2012 - * - * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE - */ -package org.eclipse.osee.ats.core.model; - -/** - * @author Donald G. Dunne - */ -public interface IAtsWorkItem extends IAtsObject, HasWorkData, HasAssignees, HasStateProvider { - // provided for subclass implementation -} diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/WorkStateFactory.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/WorkStateFactory.java index 7c4012dc239..f94e4780d9d 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/WorkStateFactory.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/WorkStateFactory.java @@ -6,6 +6,8 @@ package org.eclipse.osee.ats.core.model; import java.util.List; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.workflow.WorkState; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsActionGroup.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsActionGroup.java index 44b8668220a..f44d89c857f 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsActionGroup.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsActionGroup.java @@ -8,8 +8,8 @@ package org.eclipse.osee.ats.core.model.impl; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.core.model.IActionGroup; -import org.eclipse.osee.ats.core.model.IAtsWorkItem; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsObject.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsObject.java index a5a7b22148d..27c853e8078 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsObject.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsObject.java @@ -5,27 +5,20 @@ */ package org.eclipse.osee.ats.core.model.impl; -import org.eclipse.osee.ats.core.model.IAtsObject; +import org.eclipse.osee.ats.api.IAtsObject; +import org.eclipse.osee.framework.core.data.NamedIdentity; import org.eclipse.osee.framework.jdk.core.util.HumanReadableId; /** * @author Donald G. Dunne */ -public class AtsObject implements IAtsObject { +public class AtsObject extends NamedIdentity<String> implements IAtsObject { private String humanReadableId; - private String name; - private String guid; - - public void setGuid(String guid) { - this.guid = guid; - } - private String desc; public AtsObject(String name, String guid, String hrid) { - this.name = name; - this.guid = guid; + super(guid, name); this.humanReadableId = hrid; } @@ -34,16 +27,6 @@ public class AtsObject implements IAtsObject { } @Override - public String getName() { - return name; - } - - @Override - public String getGuid() { - return guid; - } - - @Override public String getDescription() { return desc; } @@ -61,10 +44,6 @@ public class AtsObject implements IAtsObject { this.humanReadableId = hrid; } - public void setName(String name) { - this.name = name; - } - @Override public String toString() { return getName(); @@ -74,36 +53,4 @@ public class AtsObject implements IAtsObject { return String.format("[%s][%s]", getHumanReadableId(), getName()); } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((guid == null) ? 0 : guid.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - AtsObject other = (AtsObject) obj; - if (guid == null) { - if (other.guid != null) { - return false; - } else { - return false; - } - } else if (!guid.equals(other.guid)) { - return false; - } - return true; - } - } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateImpl.java index 4f639978bbd..58709a85368 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateImpl.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateImpl.java @@ -7,8 +7,8 @@ package org.eclipse.osee.ats.core.model.impl; import java.util.LinkedList; import java.util.List; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.WorkState; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.workflow.WorkState; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImpl.java index 809b126dda6..ccac6d3a118 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImpl.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImpl.java @@ -17,10 +17,10 @@ import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.WorkState; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.workflow.WorkState; +import org.eclipse.osee.ats.api.workflow.WorkStateProvider; import org.eclipse.osee.ats.core.model.WorkStateFactory; -import org.eclipse.osee.ats.core.model.WorkStateProvider; import org.eclipse.osee.ats.core.notify.IAtsNotificationListener; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.ats.core.util.AtsObjects; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/notify/IAtsNotificationListener.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/notify/IAtsNotificationListener.java index 758cbe74faf..047884d46d9 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/notify/IAtsNotificationListener.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/notify/IAtsNotificationListener.java @@ -6,7 +6,7 @@ package org.eclipse.osee.ats.core.notify; import java.util.List; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AbstractAtsUser.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AbstractAtsUser.java index 76852708490..3b461d87a4c 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AbstractAtsUser.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AbstractAtsUser.java @@ -5,7 +5,8 @@ */ package org.eclipse.osee.ats.core.users; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.framework.core.data.Identity; import org.eclipse.osee.framework.core.exception.OseeCoreException; /** @@ -97,4 +98,14 @@ public abstract class AbstractAtsUser implements IAtsUser { return true; } + @Override + public boolean matches(Identity<?>... identities) { + for (Identity<?> identity : identities) { + if (equals(identity)) { + return true; + } + } + return false; + } + } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AtsUsers.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AtsUsers.java index c74bf2cee82..c11c1e86ce9 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AtsUsers.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/users/AtsUsers.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsObjects.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsObjects.java index ceb4ba73bda..7cac3767080 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsObjects.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsObjects.java @@ -8,7 +8,7 @@ package org.eclipse.osee.ats.core.util; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.eclipse.osee.ats.core.model.IAtsObject; +import org.eclipse.osee.ats.api.IAtsObject; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsUserGroup.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsUserGroup.java index 84b01df3235..24d02514c3c 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsUserGroup.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsUserGroup.java @@ -7,8 +7,8 @@ package org.eclipse.osee.ats.core.util; import java.util.LinkedList; import java.util.List; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsUserGroup; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUserGroup; /** * @author Donald G. Dunne diff --git a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF index 6a7c183b5fd..de89dd63438 100644 --- a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF @@ -10,7 +10,16 @@ Import-Package: com.google.inject, org.eclipse.emf.ecore, org.eclipse.emf.ecore.resource, org.eclipse.emf.ecore.resource.impl, + org.eclipse.osee.ats.api, + org.eclipse.osee.ats.api.ai, + org.eclipse.osee.ats.api.commit, + org.eclipse.osee.ats.api.data, + org.eclipse.osee.ats.api.rule, + org.eclipse.osee.ats.api.team, + org.eclipse.osee.ats.api.user, + org.eclipse.osee.ats.api.version, org.eclipse.osee.ats.api.workdef, + org.eclipse.osee.ats.api.workflow, org.eclipse.osee.ats.dsl, org.eclipse.osee.ats.dsl.atsDsl, org.eclipse.osee.ats.dsl.atsDsl.impl, diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenNewAtsWorldEditorActionTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenNewAtsWorldEditorActionTest.java index 62083eaec9a..1df97298cd6 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenNewAtsWorldEditorActionTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/actions/OpenNewAtsWorldEditorActionTest.java @@ -7,7 +7,7 @@ package org.eclipse.osee.ats.actions; import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData; import org.eclipse.osee.ats.actions.OpenNewAtsWorldEditorAction.IOpenNewAtsWorldEditorHandler; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.world.IWorldEditorProvider; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ActionableItemsColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ActionableItemsColumnTest.java index b5da5b6ff83..056fa4dcecd 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ActionableItemsColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/ActionableItemsColumnTest.java @@ -11,8 +11,8 @@ package org.eclipse.osee.ats.column; import java.util.Collection; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/NumberOfTasksAndInWorkTasksColumnsTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/NumberOfTasksAndInWorkTasksColumnsTest.java index 0e3f75a9f15..e659b245b8d 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/NumberOfTasksAndInWorkTasksColumnsTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/column/NumberOfTasksAndInWorkTasksColumnsTest.java @@ -12,10 +12,10 @@ package org.eclipse.osee.ats.column; import java.util.Collection; import java.util.HashSet; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.task.TaskManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.core.util.Result; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/AtsBranchConfigurationTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/AtsBranchConfigurationTest.java index 5e51095b208..83db27f7b85 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/AtsBranchConfigurationTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/AtsBranchConfigurationTest.java @@ -16,7 +16,10 @@ import java.util.Collections; import java.util.Date; import java.util.logging.Level; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; @@ -28,12 +31,11 @@ import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; +import org.eclipse.osee.ats.core.client.version.AtsVersionStore; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsBranchManager; @@ -167,8 +169,8 @@ public class AtsBranchConfigurationTest { ChangeType.Problem, "1", false, null, selectedActionableItems, new Date(), AtsUsersClient.getUser(), null, transaction); TeamWorkFlowArtifact teamWf = ActionManager.getTeams(actionArt).iterator().next(); - teamWf.setTargetedVersion(versionToTarget); - teamWf.setTargetedVersionLink(versionToTarget); + AtsVersionService.get().setTargetedVersion(teamWf, versionToTarget); + AtsVersionStore.setTargetedVersionLink(teamWf, versionToTarget); teamWf.persist(transaction); transaction.execute(); diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/ConfigDataTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/ConfigDataTest.java index 844984b1efe..fcb1e19cbab 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/ConfigDataTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/ConfigDataTest.java @@ -11,10 +11,10 @@ package org.eclipse.osee.ats.config.copy; import junit.framework.Assert; +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.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.support.test.util.DemoActionableItems; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperationTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperationTest.java index 1ad79948ece..ef6e2e4edcb 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperationTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperationTest.java @@ -14,12 +14,12 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; import junit.framework.Assert; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.config.AtsObjectsClient; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.health.ValidateAtsDatabase; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.Operations; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsValidationTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsValidationTest.java index ec4cd67d201..bd146107be2 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsValidationTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/config/copy/CopyAtsValidationTest.java @@ -11,8 +11,8 @@ package org.eclipse.osee.ats.config.copy; import junit.framework.Assert; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.XResultData; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java index 44e21ad9a94..1815d19d291 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java @@ -14,13 +14,13 @@ import static org.junit.Assert.assertFalse; import java.util.Collection; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; import org.eclipse.osee.ats.core.client.review.DecisionReviewManager; import org.eclipse.osee.ats.core.client.review.DecisionReviewState; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.mocks.MockStateDefinition; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java index 49e50d67e94..a26f683357b 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java @@ -12,6 +12,7 @@ package org.eclipse.osee.ats.editor.stateItem; import static org.junit.Assert.assertFalse; import java.util.Arrays; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; @@ -21,7 +22,6 @@ import org.eclipse.osee.ats.core.client.review.role.Role; import org.eclipse.osee.ats.core.client.review.role.UserRole; import org.eclipse.osee.ats.core.client.review.role.UserRoleManager; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToMassEditorTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToMassEditorTest.java index b1e5aa44067..1437c35f79c 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToMassEditorTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToMassEditorTest.java @@ -13,8 +13,8 @@ package org.eclipse.osee.ats.navigate; import java.util.Collection; import java.util.Collections; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.task.TaskEditor; import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.ats.util.NavigateTestUtil; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToTaskEditorTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToTaskEditorTest.java index d124d9f9b16..3a2a6481e68 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToTaskEditorTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToTaskEditorTest.java @@ -16,8 +16,8 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; 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.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.task.TaskEditor; import org.eclipse.osee.ats.task.TaskXViewer; import org.eclipse.osee.ats.util.AtsUtil; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java index cbdb97f9570..1483dc859c7 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java @@ -24,14 +24,14 @@ import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.task.TaskEditor; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java index 01f536e5821..52ecec0ee77 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java @@ -13,8 +13,8 @@ package org.eclipse.osee.ats.review; import static org.junit.Assert.assertTrue; import java.util.Collection; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.navigate.SearchNavigateItem; import org.eclipse.osee.ats.navigate.VisitedItems; import org.eclipse.osee.ats.util.DemoTestUtil; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewWorldSearchItemDemoTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewWorldSearchItemDemoTest.java index 30e0e6b74b2..4e37e5dca55 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewWorldSearchItemDemoTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewWorldSearchItemDemoTest.java @@ -15,11 +15,11 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Set; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.navigate.VisitedItems; import org.eclipse.osee.ats.util.DemoTestUtil; import org.eclipse.osee.ats.util.NavigateTestUtil; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsDeleteManagerTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsDeleteManagerTest.java index 3754b90b305..50256df51ae 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsDeleteManagerTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsDeleteManagerTest.java @@ -16,7 +16,9 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.List; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.action.ActionManager; @@ -27,8 +29,6 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.util.AtsDeleteManager.DeleteOption; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.Named; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsQueryPerformanceTests.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsQueryPerformanceTests.java index 65b82d1471e..b8b8a19989e 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsQueryPerformanceTests.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsQueryPerformanceTests.java @@ -14,9 +14,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.Collection; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.world.search.MyWorldSearchItem; import org.eclipse.osee.ats.world.search.TeamWorldSearchItem; import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/DemoTestUtil.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/DemoTestUtil.java index b560f7138fc..edd26177f2b 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/DemoTestUtil.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/DemoTestUtil.java @@ -20,7 +20,9 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.logging.Level; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; @@ -29,8 +31,6 @@ import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.data.IUserToken; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/ImportActionsViaSpreadsheetTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/ImportActionsViaSpreadsheetTest.java index 548ff810856..b715f3e168d 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/ImportActionsViaSpreadsheetTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/ImportActionsViaSpreadsheetTest.java @@ -20,6 +20,7 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.util.Import.ImportActionsViaSpreadsheetBlam; import org.eclipse.osee.ats.util.Import.ImportActionsViaSpreadsheetBlam.ImportOption; import org.eclipse.osee.framework.core.util.XResultData; @@ -95,6 +96,6 @@ public class ImportActionsViaSpreadsheetTest { Assert.assertEquals("5", testWf.getSoleAttributeValue(AtsAttributeTypes.PriorityType, "")); Assert.assertTrue(testWf.getSoleAttributeValue(AtsAttributeTypes.EstimatedHours, 0.0) == 4.0); Assert.assertEquals("Improvement", testWf.getSoleAttributeValue(AtsAttributeTypes.ChangeType, null)); - Assert.assertEquals("SAW_Bld_3", testWf.getTargetedVersionStr()); + Assert.assertEquals("SAW_Bld_3", AtsVersionService.get().getTargetedVersion(testWf).getName()); } } diff --git a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF index dcceb7157cf..827133c4e6c 100644 --- a/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats/META-INF/MANIFEST.MF @@ -66,8 +66,16 @@ Export-Package: org.eclipse.osee.ats, Import-Package: com.google.inject, javax.mail, javax.mail.internet, + org.eclipse.osee.ats.api, + org.eclipse.osee.ats.api.ai, + org.eclipse.osee.ats.api.commit, org.eclipse.osee.ats.api.data, + org.eclipse.osee.ats.api.rule, + org.eclipse.osee.ats.api.team, + org.eclipse.osee.ats.api.user, + org.eclipse.osee.ats.api.version, org.eclipse.osee.ats.api.workdef, + org.eclipse.osee.ats.api.workflow, org.eclipse.osee.ats.core.client.access, org.eclipse.osee.ats.core.client.action, org.eclipse.osee.ats.core.client.actions, diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java index 5c8f9eb86b2..3c4c7bfbcab 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java @@ -20,12 +20,12 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.logging.Level; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.core.client.access.AtsBranchAccessContextId; import org.eclipse.osee.ats.core.client.config.store.ActionableItemArtifactStore; import org.eclipse.osee.ats.core.client.config.store.TeamDefinitionArtifactStore; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.data.IAccessContextId; 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 f10ceb8ea6e..559d03ed334 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 @@ -18,14 +18,14 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.column.ActionableItemsColumn; import org.eclipse.osee.ats.core.client.action.ActionArtifactRollup; import org.eclipse.osee.ats.core.client.actions.ISelectedAtsArtifacts; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowManager; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.widgets.dialog.AICheckTreeDialog; 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 3f7c2e04f75..40ea53425d0 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 @@ -12,6 +12,7 @@ package org.eclipse.osee.ats.actions; import org.eclipse.osee.ats.core.client.config.AtsObjectsClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; @@ -34,8 +35,9 @@ public class OpenVersionArtifactAction extends AbstractAtsAction { @Override public void runWithException() throws OseeCoreException { - if (sma.getTargetedVersion() != null) { - RendererManager.open(AtsObjectsClient.getSoleArtifact(sma.getTargetedVersion()), PresentationType.DEFAULT_OPEN); + if (AtsVersionService.get().hasTargetedVersion(sma)) { + RendererManager.open(AtsObjectsClient.getSoleArtifact(AtsVersionService.get().getTargetedVersion(sma)), + PresentationType.DEFAULT_OPEN); } } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/PrivilegedEditAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/PrivilegedEditAction.java index b16e7740985..fec947759a5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/PrivilegedEditAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/PrivilegedEditAction.java @@ -15,10 +15,10 @@ import java.util.Set; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.util.PrivilegedUserManager; import org.eclipse.osee.ats.util.ReadOnlyHyperlinkListener; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ActionableItemFilter.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ActionableItemFilter.java index 7c0eba3d162..e42d725bcd0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ActionableItemFilter.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ActionableItemFilter.java @@ -13,7 +13,7 @@ package org.eclipse.osee.ats.actions.wizard; import java.util.Locale; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.framework.ui.swt.OSEEFilteredTree; /** diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java index 18087b44456..b73430f7df9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java @@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.osee.ats.core.model.IAtsObject; +import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.ats.util.AtsUtil; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/IAtsWizardItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/IAtsWizardItem.java index 1267b7ebdf9..4b2a17d527c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/IAtsWizardItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/IAtsWizardItem.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.actions.wizard; import java.util.Collection; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionJob.java index dc6995da39e..d84ff31b759 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionJob.java @@ -19,11 +19,11 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.ats.AtsOpenOption; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.action.INewActionListener; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.ChangeType; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeArgumentException; 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 305b8532b22..fc65210f216 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 @@ -21,12 +21,12 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.help.ui.AtsHelpContext; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage3.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage3.java index 401dc4f6149..03fb300b034 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage3.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage3.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.workflow.ATSXWidgetOptionResolver; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionWizard.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionWizard.java index e5b3e9832b4..f43b4e614c0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionWizard.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionWizard.java @@ -16,9 +16,9 @@ import java.util.Set; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.core.client.action.INewActionListener; import org.eclipse.osee.ats.core.client.workflow.ChangeType; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/TeamWorkflowProviderAdapter.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/TeamWorkflowProviderAdapter.java index 06b3b359cb5..89d3977196c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/TeamWorkflowProviderAdapter.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/TeamWorkflowProviderAdapter.java @@ -11,11 +11,11 @@ package org.eclipse.osee.ats.actions.wizard; import java.util.Collection; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ITeamWorkflowProvider; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/EditActionableItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/EditActionableItems.java index d90cca84a19..024a25ba486 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/EditActionableItems.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/EditActionableItems.java @@ -15,14 +15,14 @@ import java.util.Collection; import java.util.Date; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.action.ActionArtifact; 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.AtsUsersClient; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.widgets.dialog.AICheckTreeDialog; 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 59b95927ac8..8dc75a4f218 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,6 +11,8 @@ 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.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; @@ -26,10 +28,10 @@ public class TeamWorkflowLabelProvider extends ArtifactLabelProvider { public String getText(Object element) { TeamWorkFlowArtifact teamWf = (TeamWorkFlowArtifact) element; try { - if (teamWf.getTargetedVersion() == null) { + if (!AtsVersionService.get().hasTargetedVersion(teamWf)) { return "[" + teamWf.getTeamName() + "] - " + teamWf.getName(); } else { - return "[" + teamWf.getTeamName() + "][" + teamWf.getTargetedVersionStr() + "] - " + teamWf.getName(); + return "[" + teamWf.getTeamName() + "][" + Versions.getTargetedVersionStr(teamWf) + "] - " + teamWf.getName(); } } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); 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 df64966c786..634e5254ce5 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 @@ -15,6 +15,8 @@ import java.util.Collection; import java.util.Date; import java.util.List; import java.util.logging.Level; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; import org.eclipse.osee.ats.column.CancelledDateColumn; @@ -31,8 +33,7 @@ import org.eclipse.osee.ats.core.client.workflow.HoursSpentUtil; import org.eclipse.osee.ats.core.client.workflow.PriorityUtil; import org.eclipse.osee.ats.core.client.workflow.StateManager; import org.eclipse.osee.ats.core.client.workflow.log.LogItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.workdef.AtsWorkDefinitionService; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; @@ -280,10 +281,10 @@ public class WorkflowManager { if (awa.getParentTeamWorkflow() == null) { continue; } - if (awa.getTargetedVersion() == null) { + if (!AtsVersionService.get().hasTargetedVersion(awa)) { continue; } - if (versionArts.contains(awa.getTargetedVersion())) { + if (versionArts.contains(AtsVersionService.get().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 007bce898c5..61f9b38e8c4 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 @@ -16,11 +16,11 @@ import java.util.Set; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +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.version.TargetedVersionUtil; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.exception.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 = TargetedVersionUtil.getTargetedVersion(teamArt); + IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(teamArt); if (verArt != null) { if (attributeType == AtsAttributeTypes.ReleaseDate) { return verArt.getReleaseDate(); @@ -106,8 +106,8 @@ public abstract class AbstractWorkflowVersionDateColumn extends XViewerAtsAttrib String workflowDate = getDateStrFromWorkflow(attributeType, artifact); String versionDate = getDateStrFromTargetedVersion(attributeType, artifact); if (Strings.isValid(workflowDate) && Strings.isValid(versionDate)) { - return String.format("%s; [%s - %s]", workflowDate, TargetedVersionUtil.getTargetedVersion(artifact), - versionDate); + return String.format("%s; [%s - %s]", workflowDate, + AtsVersionService.get().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/ActionableItemOwner.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemOwner.java index d0e8602810c..92b1101847f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemOwner.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemOwner.java @@ -14,12 +14,12 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.config.store.ActionableItemArtifactStore; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemsColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemsColumn.java index 930d0195c0f..6343a575c3b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemsColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemsColumn.java @@ -16,12 +16,12 @@ import java.util.HashSet; import java.util.Set; import java.util.logging.Level; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; 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.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AssigneeColumnUI.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AssigneeColumnUI.java index a842d03a69d..603068c49ae 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AssigneeColumnUI.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AssigneeColumnUI.java @@ -20,12 +20,12 @@ import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.column.AssigneeColumn; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CancelledByColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CancelledByColumn.java index eaab1fab74b..42fc0d73c42 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CancelledByColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CancelledByColumn.java @@ -15,10 +15,10 @@ import java.util.Set; import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; 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 d2616903660..d1c50264e4b 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 @@ -24,6 +24,7 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeType; 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.util.AtsUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; @@ -79,7 +80,7 @@ public class ChangeTypeColumn extends XViewerAtsAttributeValueColumn { public static boolean promptChangeType(final Collection<? extends TeamWorkFlowArtifact> teams, boolean persist) { for (TeamWorkFlowArtifact team : teams) { - if (team.isReleased() || team.isVersionLocked()) { + if (AtsVersionService.get().isReleased(team) || AtsVersionService.get().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/CompletedByColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedByColumn.java index 3efa3d6488e..f217a78c882 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedByColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedByColumn.java @@ -15,10 +15,10 @@ import java.util.Set; import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedCancelledByColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedCancelledByColumn.java index ad7e9397d50..cd7817c6d99 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedCancelledByColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedCancelledByColumn.java @@ -15,10 +15,10 @@ import java.util.Set; import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GoalsColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GoalsColumn.java index 7cff29e7aeb..41584440de2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GoalsColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GoalsColumn.java @@ -22,10 +22,10 @@ import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; 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.model.IAtsTeamDefinition; import org.eclipse.osee.ats.goal.GoalCheckTreeDialog; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OriginatorColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OriginatorColumn.java index 341dff5b7c7..2d504d6c88f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OriginatorColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OriginatorColumn.java @@ -21,11 +21,11 @@ import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; 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 38220bde0a2..45c8040f1dc 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,6 +20,7 @@ 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.util.PromptChangeUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; @@ -62,7 +63,7 @@ public class PriorityColumn extends XViewerAtsAttributeValueColumn { public static boolean promptChangePriority(final Collection<? extends TeamWorkFlowArtifact> teams, boolean persist) { for (TeamWorkFlowArtifact team : teams) { - if (team.isReleased() || team.isVersionLocked()) { + if (AtsVersionService.get().isReleased(team) || AtsVersionService.get().isVersionLocked(team)) { AWorkbench.popup("ERROR", "Team Workflow\n \"" + team.getName() + "\"\n version is locked or already released."); return false; @@ -97,7 +98,7 @@ public class PriorityColumn extends XViewerAtsAttributeValueColumn { return false; } TeamWorkFlowArtifact team = (TeamWorkFlowArtifact) useArt; - if (team.isReleased() || team.isVersionLocked()) { + if (AtsVersionService.get().isReleased(team) || AtsVersionService.get().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/StateAssigneesColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/StateAssigneesColumn.java index e3e42771860..13ef667b984 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/StateAssigneesColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/StateAssigneesColumn.java @@ -15,10 +15,10 @@ import java.util.Set; import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; 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 595873c8c9d..8ce855909a4 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 @@ -23,15 +23,17 @@ import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.version.VersionLockedType; +import org.eclipse.osee.ats.api.version.VersionReleaseType; 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.AtsUtilCore; -import org.eclipse.osee.ats.core.client.version.TargetedVersionUtil; +import org.eclipse.osee.ats.core.client.version.AtsVersionStore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.VersionLockedType; -import org.eclipse.osee.ats.core.model.VersionReleaseType; +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.util.widgets.dialog.VersionListDialog; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; @@ -127,7 +129,7 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV AWorkbench.popup("ERROR", "Team \"" + teamArt.getTeamDefinition().getName() + "\" doesn't use versions."); return false; } - if (teamArt.isReleased() || teamArt.isVersionLocked()) { + if (AtsVersionService.get().isReleased(teamArt) || AtsVersionService.get().isVersionLocked(teamArt)) { String error = "Team Workflow\n \"" + teamArt.getName() + "\"\n targeted version is locked or already released."; if (AtsUtilCore.isAtsAdmin() && !MessageDialog.openConfirm(Displays.getActiveShell(), "Change Version", @@ -150,12 +152,13 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV AWorkbench.popup("ERROR", "No versions configured for impacted team(s)."); return false; } + TeamWorkFlowArtifact teamArt = awas.iterator().next(); final VersionListDialog vld = new VersionListDialog("Select Version", "Select Version", teamDefHoldingVersions.getVersions( versionReleaseType, versionLockType)); - if (awas.size() == 1 && awas.iterator().next().getTargetedVersion() != null) { + if (awas.size() == 1 && AtsVersionService.get().hasTargetedVersion(teamArt)) { Object[] objs = new Object[1]; - objs[0] = awas.iterator().next().getTargetedVersion(); + objs[0] = AtsVersionService.get().getTargetedVersion(teamArt); vld.setInitialSelections(objs); } int result = vld.open(); @@ -175,9 +178,9 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV } } - for (TeamWorkFlowArtifact teamArt : awas) { - teamArt.setTargetedVersion(newVersion); - teamArt.setTargetedVersionLink(newVersion); + for (TeamWorkFlowArtifact teamArt1 : awas) { + AtsVersionService.get().setTargetedVersion(teamArt1, newVersion); + AtsVersionStore.setTargetedVersionLink(teamArt1, newVersion); } Artifacts.persistInTransaction("ATS Prompt Change Version", awas); return true; @@ -189,7 +192,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 = team.getTargetedVersionStr(); + String str = Versions.getTargetedVersionStr(team); if (Strings.isValid(str)) { strs.add(str); } @@ -197,7 +200,7 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV return Collections.toString(";", strs); } else { - return TargetedVersionUtil.getTargetedVersionStr(element); + return Versions.getTargetedVersionStr(element); } } catch (OseeCoreException ex) { return LogUtil.getCellExceptionString(ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java index 515e03bd216..79d3a2816ee 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java @@ -18,7 +18,10 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.ats.AtsOpenOption; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.core.client.config.AtsArtifactToken; import org.eclipse.osee.ats.core.client.config.store.ActionableItemArtifactStore; @@ -30,12 +33,10 @@ import org.eclipse.osee.ats.core.client.workdef.AtsWorkDefinitionStore; import org.eclipse.osee.ats.core.client.workdef.WorkDefinitionFactory; import org.eclipse.osee.ats.core.config.ActionableItemFactory; import org.eclipse.osee.ats.core.config.AtsConfigCache; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitionFactory; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.core.config.VersionFactory; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.core.workdef.AtsWorkDefinitionService; import org.eclipse.osee.ats.core.workdef.WorkDefinitionMatch; import org.eclipse.osee.ats.internal.Activator; @@ -178,7 +179,7 @@ public class AtsConfigManager extends AbstractOperation { if (versionNames != null) { for (String name : versionNames) { IAtsVersion version = VersionFactory.createVersion(name); - version.setTeamDefinition(teamDef); + AtsVersionService.get().setTeamDefinition(version, teamDef); teamDef.getVersions().add(version); VersionArtifactStore verStore = new VersionArtifactStore(version); verStore.getArtifactOrCreate(transaction); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java index babadba46e6..bdc81fccc9a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java @@ -11,13 +11,13 @@ package org.eclipse.osee.ats.config; import java.util.Arrays; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.config.AtsArtifactToken; import org.eclipse.osee.ats.core.client.config.store.ActionableItemArtifactStore; import org.eclipse.osee.ats.core.client.config.store.TeamDefinitionArtifactStore; import org.eclipse.osee.ats.core.client.util.AtsGroup; import org.eclipse.osee.ats.core.client.workdef.WorkDefinitionFactory; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.workdef.AtsWorkDefinitionSheetProviders; import org.eclipse.osee.framework.core.data.IArtifactToken; 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 75d0712bd63..73921d7ff58 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 @@ -11,10 +11,10 @@ package org.eclipse.osee.ats.config.copy; import java.util.Collection; +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.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationBlam.java index b403fcdcd31..ce158d54921 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationBlam.java @@ -13,8 +13,8 @@ package org.eclipse.osee.ats.config.copy; import java.util.Arrays; import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.util.widgets.XActionableItemCombo; import org.eclipse.osee.ats.util.widgets.XTeamDefinitionCombo; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java index 46b57271c14..86aad516cd4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationOperation.java @@ -17,17 +17,17 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.ats.api.IAtsConfigObject; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; import org.eclipse.osee.ats.core.client.config.AtsLoadConfigArtifactsOperation; import org.eclipse.osee.ats.core.client.config.store.ActionableItemArtifactStore; import org.eclipse.osee.ats.core.client.config.store.TeamDefinitionArtifactStore; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsConfigObject; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeArgumentException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java index 2175d92337f..f0c95224a21 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsValidation.java @@ -12,11 +12,11 @@ package org.eclipse.osee.ats.config.copy; import java.util.HashSet; import java.util.Set; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.config.AtsObjectsClient; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.health.ValidateAtsDatabase; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.XResultData; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigContentProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigContentProvider.java index a6f527b2544..36151527721 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigContentProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigContentProvider.java @@ -6,8 +6,8 @@ import java.util.LinkedList; import java.util.List; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.framework.ui.skynet.results.table.IResultsXViewerRow; /** diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigLabelProvider.java index 9c80446184d..1277bfadd20 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigLabelProvider.java @@ -6,11 +6,11 @@ package org.eclipse.osee.ats.config.editor; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; +import org.eclipse.osee.ats.api.IAtsConfigObject; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsConfigObject; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; import org.eclipse.osee.framework.ui.skynet.results.table.IResultsXViewerRow; import org.eclipse.osee.framework.ui.skynet.results.table.ResultsXViewerRow; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigResultsEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigResultsEditor.java index 542e4b44b4a..db976936080 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigResultsEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/editor/AtsConfigResultsEditor.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType; import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider; -import org.eclipse.osee.ats.core.model.IAtsConfigObject; +import org.eclipse.osee.ats.api.IAtsConfigObject; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.ui.skynet.results.IResultsEditorProvider; import org.eclipse.osee.framework.ui.skynet.results.IResultsEditorTab; 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 b6e37e0d75a..f12201960bc 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 @@ -16,9 +16,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.ats.AtsImage; +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.core.model.IAtsConfigObject; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java index 282cee4dc1d..cc886cd690f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java @@ -18,13 +18,13 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.osee.ats.AtsOpenOption; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.config.AtsConfigManager; import org.eclipse.osee.ats.config.AtsConfigManager.Display; import org.eclipse.osee.ats.core.client.config.AtsObjectsClient; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; 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 7bf6f94a24a..cd7af87302e 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 @@ -26,6 +26,7 @@ import org.eclipse.osee.ats.actions.AccessControlAction; import org.eclipse.osee.ats.actions.DirtyReportAction; import org.eclipse.osee.ats.actions.IDirtyReportable; import org.eclipse.osee.ats.actions.ResourceHistoryAction; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.core.client.actions.ISelectedAtsArtifacts; import org.eclipse.osee.ats.core.client.artifact.GoalArtifact; @@ -33,7 +34,7 @@ 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.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.navigate.VisitedItems; import org.eclipse.osee.ats.task.IXTaskViewer; @@ -616,8 +617,8 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtyReportabl } @Override - public IAtsVersion getMetricsVersionArtifact() throws OseeCoreException { - return awa.getTargetedVersion(); + public IAtsVersion getMetricsVersionArtifact() { + return AtsVersionService.get().getTargetedVersion(awa); } @Override diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorOutlinePage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorOutlinePage.java index c73cd9fe376..1e7439a9066 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorOutlinePage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditorOutlinePage.java @@ -23,6 +23,8 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsCompositeLayoutItem; import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewDefinition; import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewOption; @@ -36,8 +38,6 @@ import org.eclipse.osee.ats.artifact.WorkflowManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.ats.core.workdef.AtsWorkDefinitionService; import org.eclipse.osee.ats.core.workdef.WorkDefinitionMatch; 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 c4a3a5bd0bb..4fdd87e1c9c 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 @@ -11,11 +11,12 @@ package org.eclipse.osee.ats.editor; import java.util.logging.Level; +import org.eclipse.osee.ats.api.version.VersionLockedType; +import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.column.TargetedVersionColumn; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.VersionLockedType; -import org.eclipse.osee.ats.core.model.VersionReleaseType; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; @@ -97,11 +98,11 @@ public class SMATargetedVersionHeader extends Composite { } - private void updateLabel(AbstractWorkflowArtifact sma) throws OseeCoreException { + private void updateLabel(AbstractWorkflowArtifact sma) { if (Widgets.isAccessible(valueLabel)) { String value = "Not Set"; - if (sma.getTargetedVersion() != null) { - value = sma.getTargetedVersion().getName(); + if (AtsVersionService.get().hasTargetedVersion(sma)) { + value = AtsVersionService.get().getTargetedVersion(sma).getName(); } valueLabel.setText(value); valueLabel.getParent().layout(); 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 eb81c78b7a1..c0fa88cb564 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 @@ -23,6 +23,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; @@ -33,7 +34,6 @@ import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelperAdap import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionStatusData; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionToOperation; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.workdef.AtsWorkDefinitionService; import org.eclipse.osee.ats.editor.stateItem.AtsStateItemManager; import org.eclipse.osee.ats.editor.stateItem.IAtsStateItem; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/column/EventColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/column/EventColumn.java index 1bc6ff00fb4..40ec59a6f4a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/column/EventColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/history/column/EventColumn.java @@ -18,10 +18,10 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerValueColumn; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AtsWorkStateFactory; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.core.model.impl.WorkStateImpl; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.internal.Activator; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItem.java index e23a149cee4..389d5c6ff4c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewDecisionStateItem.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.List; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.artifact.WorkflowManager; import org.eclipse.osee.ats.core.client.review.DecisionOption; @@ -22,7 +23,6 @@ import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; import org.eclipse.osee.ats.core.client.review.DecisionReviewState; import org.eclipse.osee.ats.core.client.review.XDecisionOptions; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.editor.SMAWorkFlowSection; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewPrepareStateItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewPrepareStateItem.java index 3331178bc74..b548646e677 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewPrepareStateItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsDecisionReviewPrepareStateItem.java @@ -12,13 +12,13 @@ package org.eclipse.osee.ats.editor.stateItem; import java.util.Collection; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.core.client.review.DecisionReviewState; import org.eclipse.osee.ats.core.client.review.XDecisionOptions; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.transition.ITransitionListener; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItem.java index 111ea88a368..8be31842e9d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItem.java @@ -11,6 +11,7 @@ package org.eclipse.osee.ats.editor.stateItem; import java.util.Collection; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; @@ -18,7 +19,6 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.transition.ITransitionListener; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItem.java index 2af87b5c212..14304ee3427 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsPeerToPeerReviewReviewStateItem.java @@ -14,6 +14,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewState; @@ -22,7 +23,6 @@ import org.eclipse.osee.ats.core.client.review.role.UserRoleManager; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.transition.ITransitionListener; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsStateItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsStateItem.java index 116b8d61cf3..c85e17ec1a3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsStateItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/AtsStateItem.java @@ -13,9 +13,9 @@ package org.eclipse.osee.ats.editor.stateItem; import java.util.Collection; import java.util.Collections; import java.util.List; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.editor.SMAWorkFlowSection; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/IAtsStateItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/IAtsStateItem.java index b8987b2bf4c..ac2c7de5b4b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/IAtsStateItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/stateItem/IAtsStateItem.java @@ -12,9 +12,9 @@ package org.eclipse.osee.ats.editor.stateItem; import java.util.Collection; import java.util.List; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.editor.SMAWorkFlowSection; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalSearchWorkflowSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalSearchWorkflowSearchItem.java index 0245aa28107..d35220f928f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalSearchWorkflowSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalSearchWorkflowSearchItem.java @@ -14,8 +14,8 @@ import java.util.Collection; import java.util.concurrent.Callable; import java.util.logging.Level; import org.eclipse.osee.ats.AtsImage; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.XHyperlabelTeamDefinitionSelection; import org.eclipse.osee.ats.world.WorldEditor; 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 e8e71fca00f..022211f2cdd 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 @@ -27,9 +27,14 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.ats.api.IAtsConfigObject; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; @@ -47,12 +52,8 @@ import org.eclipse.osee.ats.core.client.workflow.log.AtsLog; import org.eclipse.osee.ats.core.client.workflow.log.LogItem; import org.eclipse.osee.ats.core.client.workflow.log.LogType; import org.eclipse.osee.ats.core.config.AtsConfigCache; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsConfigObject; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.core.users.AtsUsers; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.internal.Activator; @@ -823,7 +824,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { } // Test that targeted version belongs to teamDefHoldingVersion else { - IAtsVersion verArt = teamArt.getTargetedVersion(); + IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(teamArt); if (verArt != null && teamArt.getTeamDefinition().getTeamDefinitionHoldingVersions() != null) { if (!teamArt.getTeamDefinition().getTeamDefinitionHoldingVersions().getVersions().contains(verArt)) { testNameToResultsMap.put( @@ -852,7 +853,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { try { if (artifact.isOfType(AtsArtifactTypes.TeamWorkflow)) { TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) artifact; - IAtsVersion verArt = teamArt.getTargetedVersion(); + IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(teamArt); if (verArt != null && teamArt.getTeamDefinition().getTeamDefinitionHoldingVersions() != null) { if (!teamArt.getTeamDefinition().getTeamDefinitionHoldingVersions().getVersions().contains(verArt)) { testNameToResultsMap.put( 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 b2069359ffd..4b2df7813c2 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 @@ -19,6 +19,7 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.actions.wizard.NewActionJob; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; @@ -26,7 +27,6 @@ import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.WorldEditorSimpleProvider; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java index c2826e41dff..f7f77dadaa2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java @@ -27,11 +27,11 @@ import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.actions.NewAction; import org.eclipse.osee.ats.actions.NewGoal; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.config.editor.AtsConfigResultsEditorNavigateItem; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.goal.GoalSearchWorkflowSearchItem; import org.eclipse.osee.ats.health.ValidateAtsDatabase; import org.eclipse.osee.ats.internal.ATSPerspective; 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 64df5e1387d..6e9bfe118be 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 @@ -19,10 +19,12 @@ import org.eclipse.osee.ats.AtsOpenOption; import org.eclipse.osee.ats.actions.wizard.NewActionJob; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +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.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; +import org.eclipse.osee.ats.core.client.version.AtsVersionStore; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelper; @@ -31,7 +33,7 @@ import org.eclipse.osee.ats.core.client.workflow.transition.TransitionOption; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.WorldXNavigateItemAction; @@ -180,8 +182,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { private void makeChanges6(TeamWorkFlowArtifact teamArt) throws OseeCoreException { // Make changes and transition - teamArt.setTargetedVersion(getVersion257()); - teamArt.setTargetedVersionLink(getVersion257()); + AtsVersionStore.setTargetedVersionLink(teamArt, getVersion257()); teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "no"); teamArt.persist("Remote Event Test"); } @@ -199,15 +200,13 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { teamArt.setSoleAttributeFromString(AtsAttributeTypes.Description, "description 4"); ChangeTypeUtil.setChangeType(teamArt, ChangeType.Support); teamArt.setSoleAttributeFromString(AtsAttributeTypes.PriorityType, "3"); - teamArt.setTargetedVersion(getVersion258()); - teamArt.setTargetedVersionLink(getVersion258()); + AtsVersionStore.setTargetedVersionLink(teamArt, getVersion258()); teamArt.persist("Remote Event Test"); } private void makeChanges3(TeamWorkFlowArtifact teamArt) throws OseeCoreException { // Make changes and persist - teamArt.setTargetedVersion(getVersion257()); - teamArt.setTargetedVersionLink(getVersion257()); + AtsVersionStore.setTargetedVersionLink(teamArt, getVersion257()); teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "no"); teamArt.persist(getClass().getSimpleName()); } @@ -225,8 +224,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { ChangeTypeUtil.setChangeType(teamArt, ChangeType.Problem); teamArt.setSoleAttributeFromString(AtsAttributeTypes.PriorityType, "2"); teamArt.setSoleAttributeFromString(AtsAttributeTypes.ValidationRequired, "yes"); - teamArt.setTargetedVersion(getVersion256()); - teamArt.setTargetedVersionLink(getVersion256()); + AtsVersionStore.setTargetedVersionLink(teamArt, getVersion256()); teamArt.persist("Remote Event Test"); } @@ -275,7 +273,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { testEquals("Validation Required", "false", String.valueOf(teamArt.getSoleAttributeValue(AtsAttributeTypes.ValidationRequired, null))); - IAtsVersion verArt = teamArt.getTargetedVersion(); + IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(teamArt); String expectedTargetedVersion; if (verArt != null) { expectedTargetedVersion = verArt.toString(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/EmailTeamsItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/EmailTeamsItem.java index a5b065b89f6..9de9fd68601 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/EmailTeamsItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/EmailTeamsItem.java @@ -15,9 +15,9 @@ import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.Set; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionTreeWithChildrenDialog; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.OseeCoreException; 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 d3ccfa239ed..1c71b054bef 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 @@ -18,6 +18,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.ChangeType; @@ -25,7 +26,6 @@ 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.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.ats.version.VersionMetrics; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByActionableItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByActionableItem.java index 2a1e8e3519c..a9dafe6c000 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByActionableItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByActionableItem.java @@ -14,10 +14,10 @@ package org.eclipse.osee.ats.navigate; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.core.client.config.AtsObjectsClient; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.AICheckTreeDialog; import org.eclipse.osee.framework.core.enums.Active; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByTeamDefinition.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByTeamDefinition.java index d3a8b4f4107..ca0353875ae 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByTeamDefinition.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeByTeamDefinition.java @@ -15,9 +15,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.config.AtsObjectsClient; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionCheckTreeDialog; import org.eclipse.osee.framework.core.enums.Active; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java index 6a9913f376f..a63dd2e1e46 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java @@ -14,11 +14,11 @@ import java.util.Collection; import java.util.concurrent.Callable; import java.util.logging.Level; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.config.Versions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.XHyperlabelTeamDefinitionSelection; import org.eclipse.osee.ats.util.widgets.XStateSearchCombo; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UserSearchWorkflowSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UserSearchWorkflowSearchItem.java index 0763cd62d4d..214e1443a40 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UserSearchWorkflowSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/UserSearchWorkflowSearchItem.java @@ -17,13 +17,13 @@ import java.util.List; import java.util.Set; import java.util.concurrent.Callable; import java.util.logging.Level; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.version.VersionLockedType; +import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.config.Versions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.VersionLockedType; -import org.eclipse.osee.ats.core.model.VersionReleaseType; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.XHyperlabelTeamDefinitionSelection; import org.eclipse.osee.ats.util.widgets.XStateSearchCombo; 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 53d361565b6..23d94d25ef5 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 @@ -18,9 +18,9 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.ats.util.widgets.dialog.AtsObjectNameSorter; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java index 410696b4a2f..c0dd1a7c22c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java @@ -20,10 +20,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.osee.ats.api.commit.ICommitConfigArtifact; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.ICommitConfigArtifact; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsBranchManager; import org.eclipse.osee.framework.core.data.IAttributeType; 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 8dd32dd9c13..0672807ae3d 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 @@ -28,6 +28,7 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeType; 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.framework.core.exception.OseeCoreException; @@ -169,7 +170,7 @@ 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(sma.getTargetedVersionStr()) ? "." : sma.getTargetedVersionStr())); + values.add((!Strings.isValid(Versions.getTargetedVersionStr(sma)) ? "." : Versions.getTargetedVersionStr(sma))); } } 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 8c525b55846..064f3e15d15 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 @@ -16,9 +16,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.ats.version.VersionReportJob; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationTransitionListener.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationTransitionListener.java index 98678a9a7a9..fa11e587d55 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationTransitionListener.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/AtsNotificationTransitionListener.java @@ -11,13 +11,13 @@ package org.eclipse.osee.ats.notify; import java.util.Collection; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IStateToken; import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager; import org.eclipse.osee.ats.core.client.notify.AtsNotifyType; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.transition.ITransitionListener; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateActionFromTaskBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateActionFromTaskBlam.java index d43d02f0b7d..dc2306d5786 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateActionFromTaskBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateActionFromTaskBlam.java @@ -18,6 +18,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.action.ActionArtifact; @@ -27,7 +28,6 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.ChangeType; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; 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 dc419e696df..231d787b52c 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 @@ -36,14 +36,14 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.config.IAtsProgram; import org.eclipse.osee.ats.core.client.config.VersionsClient; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.PercentCompleteTotalUtil; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.VersionList; 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 f3e7638716d..9d7d388da06 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 @@ -34,6 +34,8 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.config.IAtsProgram; import org.eclipse.osee.ats.core.client.config.VersionsClient; import org.eclipse.osee.ats.core.client.config.store.VersionArtifactStore; @@ -41,8 +43,6 @@ import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.PercentCompleteTotalUtil; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.VersionList; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java index 8a0b016aef9..4a01b76a708 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java @@ -20,6 +20,7 @@ import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.task.TaskArtifact; @@ -30,7 +31,6 @@ import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.ITeamWorkflowProvider; import org.eclipse.osee.ats.core.client.workflow.log.LogType; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSimpleList.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSimpleList.java index b7552f482c5..546c7f312e0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSimpleList.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSimpleList.java @@ -17,10 +17,10 @@ import java.util.Date; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; 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 f1a76b91546..00772cf2717 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 @@ -20,14 +20,14 @@ import java.util.Map.Entry; import java.util.Set; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.config.VersionsClient; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsObject; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.XHyperlabelTeamDefinitionSelection; import org.eclipse.osee.ats.util.widgets.dialog.AtsObjectMultiChoiceSelect; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java index cd574db2bc1..38c244cd85f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java @@ -17,11 +17,11 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.column.LegacyPcrIdColumn; import org.eclipse.osee.ats.column.RelatedToStateColumn; import org.eclipse.osee.ats.column.StateColumn; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.xviewer.column.XViewerReviewRoleColumn; import org.eclipse.osee.ats.util.xviewer.column.XViewerSmaCompletedDateColumn; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/NewDecisionReviewJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/NewDecisionReviewJob.java index 7a30a9d8d23..2b87485735b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/NewDecisionReviewJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/NewDecisionReviewJob.java @@ -18,12 +18,12 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.ats.AtsOpenOption; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewOption; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.core.client.review.DecisionReviewArtifact; import org.eclipse.osee.ats.core.client.review.DecisionReviewManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java index 922e241656e..4d6c611b267 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java @@ -16,8 +16,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.navigate.SearchNavigateItem; import org.eclipse.osee.ats.world.search.MyReviewWorkflowItem; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewSearchWorkflowSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewSearchWorkflowSearchItem.java index 9f29dd40493..dcbe0cdba2a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewSearchWorkflowSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewSearchWorkflowSearchItem.java @@ -16,14 +16,14 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.logging.Level; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.review.ReviewFormalType; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.core.config.Versions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.XHyperlabelActionableItemSelection; import org.eclipse.osee.ats.util.widgets.XReviewStateSearchCombo; 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 4899e86f6bb..05ca58cb492 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 @@ -18,8 +18,11 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.artifact.WorkflowManager; import org.eclipse.osee.ats.column.ReviewFormalTypeColumn; @@ -30,9 +33,7 @@ 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.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.search.WorldUISearchItem; @@ -202,7 +203,8 @@ 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(); - if (team != null && (team.getTargetedVersion() == null || !team.getTargetedVersion().equals(versionArt))) { + IAtsVersion version = AtsVersionService.get().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 d06a89a90f5..ed608f7da2a 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 @@ -22,11 +22,12 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.version.IAtsVersion; 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.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.AtsMetricsComposite; @@ -325,10 +326,10 @@ public class TaskEditor extends AbstractArtifactEditor implements IAtsMetricsPro } @Override - public IAtsVersion getMetricsVersionArtifact() throws OseeCoreException { + public IAtsVersion getMetricsVersionArtifact() { for (TaskArtifact taskArt : tasks) { - if (taskArt.getTargetedVersion() != null) { - return taskArt.getTargetedVersion(); + if (AtsVersionService.get().hasTargetedVersion(taskArt)) { + return AtsVersionService.get().getTargetedVersion(taskArt); } } return null; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java index 92f7c961933..3ff6b9d896d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactChecks.java @@ -17,12 +17,12 @@ import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.world.search.ActionableItemWorldSearchItem; import org.eclipse.osee.ats.world.search.UserRelatedToAtsObjectSearch; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java index da503bb81a6..0cf40db8f72 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java @@ -18,9 +18,9 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; +import org.eclipse.osee.ats.api.commit.ICommitConfigArtifact; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.ICommitConfigArtifact; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.exception.OseeArgumentException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsObjectLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsObjectLabelProvider.java index 7e4dbed3ef5..7fb923a70dc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsObjectLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsObjectLabelProvider.java @@ -3,11 +3,11 @@ package org.eclipse.osee.ats.util; import java.util.ArrayList; import java.util.List; import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.osee.ats.api.IAtsObject; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsObject; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java index aba562d1acc..fcf00cb1586 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java @@ -22,7 +22,9 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.osee.ats.AtsOpenOption; import org.eclipse.osee.ats.actions.NewAction; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.artifact.EditActionableItems; import org.eclipse.osee.ats.artifact.TeamWorkflowLabelProvider; import org.eclipse.osee.ats.core.client.action.ActionArtifact; @@ -32,8 +34,6 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.StateManager; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.task.TaskEditor; 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 a980975e8ba..c04ccd47970 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 @@ -11,12 +11,12 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.AtsOpenOption; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/FavoritesManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/FavoritesManager.java index e8531e1b659..c8a559b93a1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/FavoritesManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/FavoritesManager.java @@ -16,9 +16,9 @@ import java.util.Collection; import java.util.List; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; 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 dc703b891b9..74ec8dd4bf9 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 @@ -26,7 +26,11 @@ import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager; import org.eclipse.osee.ats.core.client.notify.AtsNotifyType; @@ -34,14 +38,11 @@ import org.eclipse.osee.ats.core.client.team.CreateTeamOption; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.client.version.AtsVersionStore; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -195,8 +196,7 @@ public class ExcelAtsActionArtifactExtractor { throw new OseeArgumentException("No version [%s] configured for Team Definition [%s]", aData.version, team.getTeamDefinition()); } - team.setTargetedVersion(version); - team.setTargetedVersionLink(version); + AtsVersionStore.setTargetedVersionLink(team, version); } } if (aData.estimatedHours != null) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java index 602b5d0b44c..2270e7b015c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java @@ -21,6 +21,7 @@ import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.notify.AtsNotificationManager; import org.eclipse.osee.ats.core.client.notify.AtsNotifyType; import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; @@ -30,7 +31,6 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/LegacyPCRActions.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/LegacyPCRActions.java index bea4d4817c1..6ab76005230 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/LegacyPCRActions.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/LegacyPCRActions.java @@ -16,9 +16,9 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.world.search.LegacyPCRActionsWorldSearchItem; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PrivilegedUserManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PrivilegedUserManager.java index 7c0cc94b8e2..92c33336ed5 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PrivilegedUserManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PrivilegedUserManager.java @@ -12,15 +12,15 @@ package org.eclipse.osee.ats.util; import java.util.HashSet; import java.util.Set; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/TeamBasedDefaultBranchProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/TeamBasedDefaultBranchProvider.java index 947a7262ed7..2bb6dbfc9fd 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/TeamBasedDefaultBranchProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/TeamBasedDefaultBranchProvider.java @@ -16,10 +16,10 @@ import java.util.Collections; import java.util.LinkedList; import java.util.logging.Level; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionList.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionList.java index 29affcba024..1b21c091515 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionList.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionList.java @@ -3,7 +3,7 @@ package org.eclipse.osee.ats.util; import java.util.ArrayList; import java.util.Collection; import org.eclipse.jface.viewers.ArrayContentProvider; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.ui.skynet.widgets.XListViewer; 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 8a5e457cb8e..4fa024330ae 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 @@ -18,6 +18,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; 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.column.RemainingHoursColumn; import org.eclipse.osee.ats.column.WorkDaysNeededColumn; import org.eclipse.osee.ats.core.client.artifact.GoalArtifact; @@ -28,8 +30,6 @@ import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.EstimatedHoursUtil; import org.eclipse.osee.ats.core.client.workflow.HoursSpentUtil; import org.eclipse.osee.ats.core.client.workflow.PercentCompleteTotalUtil; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.jdk.core.util.DateUtil; 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 88ac472fb14..c4bd5390ec4 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 @@ -14,9 +14,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +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.core.model.IAtsActionableItem; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.ui.skynet.widgets.XComboViewer; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelActionableItemSelection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelActionableItemSelection.java index 122a7b34e73..3f2508e4f26 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelActionableItemSelection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelActionableItemSelection.java @@ -13,7 +13,7 @@ package org.eclipse.osee.ats.util.widgets; import java.util.Collection; import java.util.HashSet; import java.util.List; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.ActionableItemTreeWithChildrenDialog; import org.eclipse.osee.ats.world.WorldEditor; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java index 17b1d47af07..d39c77e4947 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java @@ -13,7 +13,7 @@ package org.eclipse.osee.ats.util.widgets; import java.util.Collection; import java.util.HashSet; import java.util.List; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionTreeWithChildrenDialog; import org.eclipse.osee.ats.world.WorldEditor; 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 7a9cdbfc32b..85008f79a8f 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 @@ -14,9 +14,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +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.core.model.IAtsTeamDefinition; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.widgets.XComboViewer; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java index e4a0eb26bf0..04722a09bdf 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/CommitXManager.java @@ -16,9 +16,9 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.nebula.widgets.xviewer.XViewer; +import org.eclipse.osee.ats.api.commit.ICommitConfigArtifact; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.branch.CommitStatus; -import org.eclipse.osee.ats.core.model.ICommitConfigArtifact; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsBranchManager; import org.eclipse.osee.framework.core.exception.OseeArgumentException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java index b1adda326e5..9ddece64ff2 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/commit/XCommitLabelProvider.java @@ -14,11 +14,11 @@ import java.util.logging.Level; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider; +import org.eclipse.osee.ats.api.commit.ICommitConfigArtifact; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.branch.CommitStatus; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.ICommitConfigArtifact; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; 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 d3bbe48e990..7af508cbb13 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 @@ -17,8 +17,8 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.jface.viewers.ISelectionChangedListener; 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.core.model.IAtsActionableItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AITreeContentProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AITreeContentProvider.java index b32503f104a..f32aeee57ac 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AITreeContentProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AITreeContentProvider.java @@ -16,8 +16,8 @@ import java.util.List; import java.util.logging.Level; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.logging.OseeLog; 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 00884d64543..b817a85bb77 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 @@ -15,8 +15,8 @@ import java.util.Collection; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.Viewer; 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.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamVersionListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamVersionListDialog.java index 174aba30992..f1282ecbae1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamVersionListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamVersionListDialog.java @@ -17,10 +17,10 @@ import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.VersionLockedType; -import org.eclipse.osee.ats.core.model.VersionReleaseType; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.version.VersionLockedType; +import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.logging.OseeLog; 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 0edf0629297..df6ef9f8e03 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 @@ -12,8 +12,8 @@ package org.eclipse.osee.ats.util.widgets.dialog; 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.core.model.IAtsActionableItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemTreeContentProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemTreeContentProvider.java index 58862039ef1..4fed7c4bad0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemTreeContentProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemTreeContentProvider.java @@ -14,8 +14,8 @@ package org.eclipse.osee.ats.util.widgets.dialog; import java.util.Collection; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.core.config.ActionableItems; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.framework.core.enums.Active; /** 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 251475d9f3b..8cc39877158 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 @@ -14,8 +14,8 @@ package org.eclipse.osee.ats.util.widgets.dialog; import java.util.Collection; 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.core.model.IAtsActionableItem; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectMultiChoiceSelect.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectMultiChoiceSelect.java index 1804aa00b4a..0329d6b054f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectMultiChoiceSelect.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectMultiChoiceSelect.java @@ -2,7 +2,7 @@ package org.eclipse.osee.ats.util.widgets.dialog; import java.util.Collections; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.osee.ats.core.model.IAtsObject; +import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.MinMaxOSEECheckedFilteredTreeDialog; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.SimpleCheckFilteredTreeDialog; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameReverseSorter.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameReverseSorter.java index fe0b88481ac..141d21e2681 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameReverseSorter.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameReverseSorter.java @@ -2,7 +2,7 @@ package org.eclipse.osee.ats.util.widgets.dialog; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.osee.ats.core.model.IAtsObject; +import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; /** diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameSorter.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameSorter.java index ec8b869440e..ebc7e279f6a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameSorter.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AtsObjectNameSorter.java @@ -2,7 +2,7 @@ package org.eclipse.osee.ats.util.widgets.dialog; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.osee.ats.core.model.IAtsObject; +import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; /** 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 10d49684541..3cc42ae7d83 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 @@ -18,9 +18,9 @@ import java.util.List; import java.util.Set; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; +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.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionDialog.java index 9e90dca36c1..86073702cbe 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionDialog.java @@ -14,7 +14,7 @@ import java.util.Collection; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; import org.eclipse.osee.framework.ui.swt.Displays; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java index 4ef611ec038..3f36ddb75ad 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java @@ -14,8 +14,8 @@ package org.eclipse.osee.ats.util.widgets.dialog; import java.util.Collection; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.framework.core.enums.Active; /** 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 3d09d3427b4..8a33446bcb7 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 @@ -14,8 +14,8 @@ package org.eclipse.osee.ats.util.widgets.dialog; import java.util.Collection; 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.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.OseeCoreException; 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 4a2593fca0a..102fdd0ab20 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 @@ -12,11 +12,11 @@ package org.eclipse.osee.ats.util.widgets.dialog; import java.util.ArrayList; import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; +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.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.VersionLockedType; -import org.eclipse.osee.ats.core.model.VersionReleaseType; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.framework.core.enums.Active; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionLabelProvider.java index 4ec5f8d24a1..24a92b77d83 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionLabelProvider.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.util.widgets.dialog; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.osee.ats.AtsImage; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.swt.ImageManager; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionListDialog.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionListDialog.java index d3c6bb63b81..b649d07ecfa 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionListDialog.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionListDialog.java @@ -13,8 +13,8 @@ package org.eclipse.osee.ats.util.widgets.dialog; import java.util.Collection; import java.util.LinkedList; import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerReviewRoleColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerReviewRoleColumn.java index 94818dac0ed..68d3c8751ec 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerReviewRoleColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerReviewRoleColumn.java @@ -13,10 +13,10 @@ package org.eclipse.osee.ats.util.xviewer.column; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.util.XViewerException; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; import org.eclipse.osee.ats.core.client.review.role.UserRole; import org.eclipse.osee.ats.core.client.review.role.UserRoleManager; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.swt.SWT; 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 16de00e6129..3870ea0c3ce 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 @@ -17,12 +17,13 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.config.AtsObjectsClient; import org.eclipse.osee.ats.core.client.config.store.VersionArtifactStore; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; import org.eclipse.osee.ats.core.config.VersionFactory; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; @@ -122,7 +123,7 @@ public class CreateNewVersionItem extends XNavigateItemAction { try { for (String newVer : newVersionNames) { IAtsVersion version = VersionFactory.createVersion(newVer); - version.setTeamDefinition(teamDefHoldingVersions); + AtsVersionService.get().setTeamDefinition(version, teamDefHoldingVersions); new VersionArtifactStore(version).saveToArtifact(transaction); } } catch (Exception ex) { @@ -132,7 +133,7 @@ public class CreateNewVersionItem extends XNavigateItemAction { return verArts; } - public IAtsTeamDefinition getReleaseableTeamDefinition() throws OseeCoreException { + public IAtsTeamDefinition getReleaseableTeamDefinition() { if (teamDefHoldingVersions != null) { return teamDefHoldingVersions; } 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 26e6b0275d1..7700733c7a7 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 @@ -16,9 +16,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.framework.core.enums.Active; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateVersionReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateVersionReportItem.java index 9c935f448e6..18b3fd3e30e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateVersionReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/GenerateVersionReportItem.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.version; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.util.widgets.dialog.TeamVersionListDialog; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; 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 a8848c01ee1..650f9a3d094 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 @@ -11,10 +11,10 @@ package org.eclipse.osee.ats.version; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.core.client.config.AtsObjectsClient; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.framework.core.enums.Active; 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 b665c1101f5..9e08ad34c9d 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 @@ -13,16 +13,17 @@ package org.eclipse.osee.ats.version; import java.util.Date; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.version.VersionLockedType; +import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.core.client.config.VersionsClient; import org.eclipse.osee.ats.core.client.config.store.VersionArtifactStore; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.VersionLockedType; -import org.eclipse.osee.ats.core.model.VersionReleaseType; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.ats.util.widgets.dialog.VersionListDialog; @@ -69,7 +70,8 @@ public class ReleaseVersionItem extends XNavigateItemAction { IAtsVersion verArt = (IAtsVersion) ld.getResult()[0]; // Validate team lead status - if (!AtsUtilCore.isAtsAdmin() && !verArt.getTeamDefinition().getLeads().contains(AtsUsersClient.getUser())) { + if (!AtsUtilCore.isAtsAdmin() && !AtsVersionService.get().getTeamDefinition(verArt).getLeads().contains( + AtsUsersClient.getUser())) { AWorkbench.popup("ERROR", "Only lead can release version."); return; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionMetrics.java index ff66ea4e521..3a82c9b3c7f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionMetrics.java @@ -17,11 +17,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.logging.Level; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.config.VersionsClient; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.DateUtil; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionReportJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionReportJob.java index b0c952fd9a9..5771930b0c6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionReportJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionReportJob.java @@ -21,13 +21,13 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.config.VersionsClient; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeTypeUtil; import org.eclipse.osee.ats.core.client.workflow.PriorityUtil; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AHTML; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionTeamMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionTeamMetrics.java index 00b92c27e21..385012a7b87 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionTeamMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionTeamMetrics.java @@ -21,11 +21,11 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.config.VersionsClient; import org.eclipse.osee.ats.core.client.config.store.TeamDefinitionArtifactStore; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; 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 ee21440508c..a0560c6c594 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 @@ -27,6 +27,7 @@ import org.eclipse.osee.ats.core.client.review.PeerToPeerReviewManager; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.core.config.Versions; import org.eclipse.osee.ats.core.util.AtsObjects; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.help.ui.AtsHelpContext; @@ -380,7 +381,7 @@ public class ActionWalkerView extends GenericViewPart implements IPartListener, private String getTargetedVersion(Artifact artifact) { try { if (artifact.isOfType(AtsArtifactTypes.TeamWorkflow)) { - String str = ((TeamWorkFlowArtifact) artifact).getTargetedVersionStr(); + String str = Versions.getTargetedVersionStr(artifact); return str.isEmpty() ? "" : str; } } catch (OseeCoreException ex) { 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 6406cb5f665..4d6291576ef 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 @@ -12,12 +12,12 @@ package org.eclipse.osee.ats.workdef.provider; import java.util.HashMap; import java.util.Map; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.dsl.atsDsl.ActionableItemDef; import org.eclipse.osee.ats.dsl.atsDsl.AtsDsl; import org.eclipse.osee.ats.dsl.atsDsl.BooleanDef; 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 a13ddff7e09..303d2fd9431 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 @@ -23,6 +23,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.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.core.client.team.TeamState; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; @@ -31,7 +32,6 @@ import org.eclipse.osee.ats.core.client.workflow.transition.TransitionHelperAdap import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionStatusData; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionToOperation; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.editor.SMAPromptChangeStatus; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.TransitionStatusDialog; 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 760b16eecf5..1a7d6ac8345 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 @@ -18,10 +18,11 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; 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.client.workflow.PercentCompleteTotalUtil; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.WorkflowMetrics; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -163,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 = ((TeamWorkFlowArtifact) art).getTargetedVersion(); + IAtsVersion verArt = AtsVersionService.get().getTargetedVersion(art); if (verArt != null) { Date estRelDate = verArt.getEstimatedReleaseDate(); if (estRelDate != null) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsMetricsProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsMetricsProvider.java index 3ee69005568..225a7b7deff 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsMetricsProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsMetricsProvider.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.world; import java.util.Collection; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java index 3df9db7574f..28f3332d7d1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.world; import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; 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 a5963e49638..45420ef533e 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 @@ -16,8 +16,9 @@ import java.util.List; import java.util.logging.Level; 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.model.IAtsVersion; +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.util.AtsUtil; @@ -224,8 +225,8 @@ public class WorldEditor extends FormEditor implements IWorldEditor, IDirtiableE return verArt; } for (Artifact artifact : getLoadedArtifacts()) { - if (artifact instanceof AbstractWorkflowArtifact && ((AbstractWorkflowArtifact) artifact).getTargetedVersion() != null) { - return ((AbstractWorkflowArtifact) artifact).getTargetedVersion(); + if (artifact instanceof AbstractWorkflowArtifact && AtsVersionService.get().hasTargetedVersion(artifact)) { + return AtsVersionService.get().getTargetedVersion(artifact); } } return null; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorProvider.java index 4ffad284e6f..649437523ce 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorProvider.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.world; import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java index 462a62bc784..d257d9b0a3e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData; -import org.eclipse.osee.ats.core.model.IAtsVersion; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.world.search.NextVersionSearchItem; import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ActionableItemWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ActionableItemWorldSearchItem.java index f1e71de1bd7..9f1fffb23ef 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ActionableItemWorldSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ActionableItemWorldSearchItem.java @@ -17,12 +17,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.config.ActionableItems; import org.eclipse.osee.ats.core.config.AtsConfigCache; -import org.eclipse.osee.ats.core.model.IAtsActionableItem; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.widgets.dialog.ActionActionableItemListDialog; import org.eclipse.osee.framework.core.enums.Active; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GoalSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GoalSearchItem.java index 89b67fe0faf..86afbebb88d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GoalSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GoalSearchItem.java @@ -19,11 +19,11 @@ import java.util.Set; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.artifact.GoalManager; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/LegacyPCRActionsWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/LegacyPCRActionsWorldSearchItem.java index 4435c009937..c7248d7e18f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/LegacyPCRActionsWorldSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/LegacyPCRActionsWorldSearchItem.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.List; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java index 1383e6e93a4..5c6235d7341 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java @@ -20,11 +20,11 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.osee.ats.AtsOpenOption; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.artifact.SmaWorkflowLabelProvider; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsBranchManager; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyFavoritesGoalsSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyFavoritesGoalsSearchItem.java index 4d8df9c18bf..f8b4564156b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyFavoritesGoalsSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyFavoritesGoalsSearchItem.java @@ -13,9 +13,9 @@ package org.eclipse.osee.ats.world.search; import java.util.Collection; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.artifact.GoalArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyFavoritesSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyFavoritesSearchItem.java index 143122104b8..d8518ef382e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyFavoritesSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyFavoritesSearchItem.java @@ -13,8 +13,8 @@ package org.eclipse.osee.ats.world.search; import java.util.Collection; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyGoalWorkflowItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyGoalWorkflowItem.java index 78904202ff4..d2f61939a37 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyGoalWorkflowItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyGoalWorkflowItem.java @@ -19,8 +19,8 @@ import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyReviewWorkflowItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyReviewWorkflowItem.java index b8a91f2fa35..1ca60fb8f2b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyReviewWorkflowItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyReviewWorkflowItem.java @@ -18,9 +18,9 @@ import java.util.Set; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MySubscribedSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MySubscribedSearchItem.java index a9ae0f3efcc..e1dd2751c66 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MySubscribedSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MySubscribedSearchItem.java @@ -13,8 +13,8 @@ package org.eclipse.osee.ats.world.search; import java.util.Collection; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyWorldSearchItem.java index 3020240815d..e736c609363 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyWorldSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MyWorldSearchItem.java @@ -16,9 +16,9 @@ import java.util.List; import java.util.Set; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; import org.eclipse.osee.ats.core.client.task.TaskArtifact; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; 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 47caeb5406c..1ec4a8f01b8 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 @@ -15,10 +15,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.logging.Level; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.core.client.config.VersionsClient; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.framework.core.enums.Active; 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 556ed1684d4..5555df3b60a 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 @@ -19,17 +19,18 @@ import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.version.VersionLockedType; +import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.core.client.config.VersionsClient; 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.client.util.AtsUsersClient; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.Versions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.VersionLockedType; -import org.eclipse.osee.ats.core.model.VersionReleaseType; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.task.ITaskEditorProvider; import org.eclipse.osee.ats.task.TaskEditor; @@ -123,7 +124,8 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem { } Set<TaskArtifact> removeTaskArts = new HashSet<TaskArtifact>(); for (TaskArtifact taskArt : userTaskArts) { - if (verArt != null && !verArt.equals(taskArt.getParentTeamWorkflow().getTargetedVersion())) { + if (verArt != null && !verArt.equals(AtsVersionService.get().getTargetedVersion( + taskArt.getParentTeamWorkflow()))) { removeTaskArts.add(taskArt); } if (!teamDefs.isEmpty() && !teamDefs.contains(taskArt.getParentTeamWorkflow().getTeamDefinition())) { 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 79c456ba1bf..4ab053dbf9a 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 @@ -20,6 +20,9 @@ import java.util.logging.Level; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.artifact.WorkflowManager; import org.eclipse.osee.ats.core.client.team.TeamState; @@ -27,10 +30,8 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.ChangeType; import org.eclipse.osee.ats.core.config.AtsConfigCache; +import org.eclipse.osee.ats.core.config.AtsVersionService; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.data.IAttributeType; @@ -189,7 +190,8 @@ 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 && (team.getTargetedVersion() == null || !team.getTargetedVersion().equals(versionArt))) { + if (team != null && (!AtsVersionService.get().hasTargetedVersion(team) || !AtsVersionService.get().getTargetedVersion( + team).equals(versionArt))) { continue; } } @@ -198,7 +200,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 = team.getTargetedVersion(); + IAtsVersion setVerArt = AtsVersionService.get().getTargetedVersion(team); if (setVerArt == null && releasedOption == ReleasedOption.Released) { continue; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserRelatedToAtsObjectSearch.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserRelatedToAtsObjectSearch.java index 0828e24c57a..7d7c7bebe01 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserRelatedToAtsObjectSearch.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserRelatedToAtsObjectSearch.java @@ -16,8 +16,8 @@ import java.util.Collection; import java.util.List; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java index 188e094f09e..685344eb149 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserSearchItem.java @@ -11,8 +11,8 @@ package org.eclipse.osee.ats.world.search; import java.util.Collection; +import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; -import org.eclipse.osee.ats.core.model.IAtsUser; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserWorldSearchItem.java index 606191bd02c..f151a5b57e9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserWorldSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserWorldSearchItem.java @@ -16,15 +16,15 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.artifact.WorkflowManager; import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUsersClient; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsUser; -import org.eclipse.osee.ats.core.model.IAtsVersion; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; 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 b6adce924ed..6bdf5c7f6a9 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 @@ -13,14 +13,14 @@ package org.eclipse.osee.ats.world.search; import java.util.ArrayList; import java.util.Collection; +import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; +import org.eclipse.osee.ats.api.version.IAtsVersion; +import org.eclipse.osee.ats.api.version.VersionLockedType; +import org.eclipse.osee.ats.api.version.VersionReleaseType; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.config.VersionsClient; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.config.TeamDefinitions; -import org.eclipse.osee.ats.core.model.IAtsTeamDefinition; -import org.eclipse.osee.ats.core.model.IAtsVersion; -import org.eclipse.osee.ats.core.model.VersionLockedType; -import org.eclipse.osee.ats.core.model.VersionReleaseType; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.ats.util.widgets.dialog.VersionListDialog; diff --git a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF index fcc188ffbc7..579d2577043 100644 --- a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF @@ -36,6 +36,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.osee.framework.help.ui Bundle-ActivationPolicy: lazy Import-Package: org.apache.commons.lang;version="2.4.0", + org.eclipse.osee.ats.api.user, org.eclipse.osee.ats.core.model, org.eclipse.osee.framework.access, org.eclipse.osee.framework.core.data, diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/RequirementStatus.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/RequirementStatus.java index 73fdb23ffd7..bc95f1aa791 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/RequirementStatus.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/RequirementStatus.java @@ -14,7 +14,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import org.eclipse.osee.ats.core.model.IAtsUser; +import org.eclipse.osee.ats.api.user.IAtsUser; public class RequirementStatus implements Comparable<RequirementStatus> { private final String requirementName; |