diff options
| author | ddunne | 2011-03-08 16:11:34 +0000 |
|---|---|---|
| committer | Ryan D. Brooks | 2011-03-08 16:11:34 +0000 |
| commit | b27c61f67c111c055430c91987f2171195a68d8f (patch) | |
| tree | 8cb122776b2413fdff1ffad779e12749e93d9cfe /plugins | |
| parent | 9729e8cc5e4e46877024998aa5228089da246b68 (diff) | |
| download | org.eclipse.osee-b27c61f67c111c055430c91987f2171195a68d8f.tar.gz org.eclipse.osee-b27c61f67c111c055430c91987f2171195a68d8f.tar.xz org.eclipse.osee-b27c61f67c111c055430c91987f2171195a68d8f.zip | |
refactor: Remove VersionArtifact as subclass of Artifact
Diffstat (limited to 'plugins')
86 files changed, 616 insertions, 522 deletions
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 67e04c396db..5bb3d30c501 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 @@ -22,7 +22,6 @@ import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkflowManager; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.config.AtsBulkLoad; import org.eclipse.osee.ats.config.demo.config.DemoDbActionData; import org.eclipse.osee.ats.config.demo.config.DemoDbActionData.CreateReview; @@ -39,6 +38,7 @@ import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.FavoritesManager; import org.eclipse.osee.ats.util.SubscribeManager; import org.eclipse.osee.ats.util.TeamState; +import org.eclipse.osee.ats.util.VersionManager; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.IRelationTypeSide; @@ -292,7 +292,8 @@ public class PopulateDemoActions extends XNavigateItemAction { DemoDbUtil.sleep(2000L); OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Committing branch"); Job job = - reqTeam.getBranchMgr().commitWorkingBranch(false, true, reqTeam.getTargetedVersion().getParentBranch(), true); + reqTeam.getBranchMgr().commitWorkingBranch(false, true, + VersionManager.getParentBranch(reqTeam.getTargetedVersion()), true); try { job.join(); } catch (InterruptedException ex) { @@ -446,8 +447,8 @@ public class PopulateDemoActions extends XNavigateItemAction { dtwm.transitionTo((toStateOverride != null ? toStateOverride : aData.toState), null, false, transaction); teamWf.persist(transaction); if (Strings.isValid(versionStr)) { - VersionArtifact verArt = - (VersionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Version, versionStr, + Artifact verArt = + ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Version, versionStr, AtsUtil.getAtsBranch()); teamWf.addRelation(AtsRelationTypes.TeamWorkflowTargetedForVersion_Version, verArt); teamWf.persist(transaction); diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/config/AtsBranchConfigurationTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/config/AtsBranchConfigurationTest.java index 03a7fc3d84b..fbd0782e31a 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/config/AtsBranchConfigurationTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/config/AtsBranchConfigurationTest.java @@ -21,7 +21,6 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkflowManager; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.config.AtsBulkLoad; import org.eclipse.osee.ats.config.AtsConfigManager; import org.eclipse.osee.ats.editor.SMAEditor; @@ -119,8 +118,8 @@ public class AtsBranchConfigurationTest { TeamDefinitionArtifact teamDef = (TeamDefinitionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.TeamDefinition, BRANCH_VIA_VERSIONS.getName(), AtsUtil.getAtsBranch()); - VersionArtifact verArtToTarget = null; - for (VersionArtifact vArt : teamDef.getVersionsArtifacts()) { + Artifact verArtToTarget = null; + for (Artifact vArt : teamDef.getVersionsArtifacts()) { if (vArt.getName().contains("Ver1")) { verArtToTarget = vArt; } diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToMassEditorTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToMassEditorTest.java index 67f8adbd827..cd9603ca19f 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToMassEditorTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToMassEditorTest.java @@ -14,7 +14,7 @@ import java.util.Collection; import java.util.Collections; import org.junit.Assert; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; +import org.eclipse.osee.ats.artifact.VersionCommitConfigArtifact; import org.eclipse.osee.ats.navigate.AtsXNavigateItemLauncher; import org.eclipse.osee.ats.navigate.MassEditTeamVersionItem; import org.eclipse.osee.ats.task.TaskEditor; @@ -54,7 +54,7 @@ public class AtsNavigateItemsToMassEditorTest { Assert.assertFalse(teamDefs.isEmpty()); massEditItem.setSelectedTeamDef(teamDefs.iterator().next()); - handleGeneralDoubleClickAndTestResults(item, VersionArtifact.class, 3); + handleGeneralDoubleClickAndTestResults(item, VersionCommitConfigArtifact.class, 3); } private void handleGeneralDoubleClickAndTestResults(XNavigateItem item, Class<?> clazz, int numOfType) throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToWorldViewTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToWorldViewTest.java index dd48caf1766..c18d6403e5c 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToWorldViewTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToWorldViewTest.java @@ -30,7 +30,6 @@ import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.navigate.AtsXNavigateItemLauncher; @@ -46,6 +45,7 @@ import org.eclipse.osee.ats.test.util.NavigateTestUtil; import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.TeamState; +import org.eclipse.osee.ats.util.VersionManager; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.WorldXViewer; import org.eclipse.osee.ats.world.search.ActionableItemWorldSearchItem; @@ -443,7 +443,7 @@ public class AtsNavigateItemsToWorldViewTest { // First one is the global one XNavigateItem item = items.iterator().next(); assertTrue(((SearchNavigateItem) item).getWorldSearchItem() instanceof VersionTargetedForTeamSearchItem); - ((VersionTargetedForTeamSearchItem) ((SearchNavigateItem) item).getWorldSearchItem()).setSelectedVersionArt(VersionArtifact.getVersions( + ((VersionTargetedForTeamSearchItem) ((SearchNavigateItem) item).getWorldSearchItem()).setSelectedVersionArt(VersionManager.getVersions( Arrays.asList(DemoSawBuilds.SAW_Bld_2.getName())).iterator().next()); runGeneralLoadingTest(item, TeamWorkFlowArtifact.class, 14, null, TableLoadOption.DontCopySearchItem); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java index b397785a1c7..606d427f7d1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java @@ -36,6 +36,7 @@ import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.StateManager; import org.eclipse.osee.ats.util.TeamState; +import org.eclipse.osee.ats.util.VersionManager; import org.eclipse.osee.ats.util.widgets.ReviewManager; import org.eclipse.osee.ats.workdef.RuleDefinitionOption; import org.eclipse.osee.ats.workdef.StateDefinition; @@ -563,9 +564,9 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple */ public boolean isReleased() { try { - VersionArtifact verArt = getTargetedVersion(); + Artifact verArt = getTargetedVersion(); if (verArt != null) { - return verArt.isReleased(); + return VersionManager.isReleased(verArt); } } catch (Exception ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); @@ -575,9 +576,9 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple public boolean isVersionLocked() { try { - VersionArtifact verArt = getTargetedVersion(); + Artifact verArt = getTargetedVersion(); if (verArt != null) { - return verArt.isVersionLocked(); + return VersionManager.isVersionLocked(verArt); } } catch (Exception ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); @@ -585,7 +586,7 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple return false; } - public VersionArtifact getTargetedVersion() throws OseeCoreException { + public Artifact getTargetedVersion() throws OseeCoreException { return TargetedVersionColumn.getTargetedVersion(this); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactFactory.java index 8503a302ba2..698efb4f4b8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactFactory.java @@ -33,8 +33,7 @@ public class AtsArtifactFactory extends ArtifactFactory { public AtsArtifactFactory() { super(AtsArtifactTypes.PeerToPeerReview, AtsArtifactTypes.DecisionReview, AtsArtifactTypes.ActionableItem, - AtsArtifactTypes.Task, AtsArtifactTypes.TeamWorkflow, AtsArtifactTypes.TeamDefinition, - AtsArtifactTypes.Version, AtsArtifactTypes.Goal); + AtsArtifactTypes.Task, AtsArtifactTypes.TeamWorkflow, AtsArtifactTypes.TeamDefinition, AtsArtifactTypes.Goal); for (ITeamWorkflowProvider atsTeamWorkflow : TeamWorkflowProviders.getAtsTeamWorkflowExtensions()) { try { for (IArtifactType teamWorkflowTypeName : atsTeamWorkflow.getTeamWorkflowArtifactTypes()) { @@ -54,8 +53,6 @@ public class AtsArtifactFactory extends ArtifactFactory { return new TeamWorkFlowArtifact(this, guid, humandReadableId, branch, artifactType); } else if (artifactType.equals(AtsArtifactTypes.TeamDefinition)) { return new TeamDefinitionArtifact(this, guid, humandReadableId, branch, artifactType); - } else if (artifactType.equals(AtsArtifactTypes.Version)) { - return new VersionArtifact(this, guid, humandReadableId, branch, artifactType); } else if (artifactType.equals(AtsArtifactTypes.ActionableItem)) { return new ActionableItemArtifact(this, guid, humandReadableId, branch, artifactType); } else if (artifactType.equals(AtsArtifactTypes.DecisionReview)) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java index 0d90ac4b83c..bd03a80562f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java @@ -17,13 +17,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.logging.Level; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionLockedType; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; import org.eclipse.osee.ats.config.AtsCacheManager; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.ats.util.VersionLockedType; +import org.eclipse.osee.ats.util.VersionManager; +import org.eclipse.osee.ats.util.VersionReleaseType; import org.eclipse.osee.ats.util.widgets.commit.ICommitConfigArtifact; import org.eclipse.osee.ats.workdef.RuleDefinition; import org.eclipse.osee.ats.workdef.RuleDefinitionOption; @@ -182,9 +183,8 @@ public class TeamDefinitionArtifact extends Artifact implements ICommitConfigArt return null; } - public VersionArtifact getNextReleaseVersion() throws OseeCoreException { - for (VersionArtifact verArt : getRelatedArtifacts(AtsRelationTypes.TeamDefinitionToVersion_Version, - VersionArtifact.class)) { + public Artifact getNextReleaseVersion() throws OseeCoreException { + for (Artifact verArt : getRelatedArtifacts(AtsRelationTypes.TeamDefinitionToVersion_Version)) { if (verArt.getSoleAttributeValue(AtsAttributeTypes.NextVersion, false)) { return verArt; } @@ -192,10 +192,10 @@ public class TeamDefinitionArtifact extends Artifact implements ICommitConfigArt return null; } - public Collection<VersionArtifact> getVersionsFromTeamDefHoldingVersions(VersionReleaseType releaseType, VersionLockedType lockedType) throws OseeCoreException { + public Collection<Artifact> getVersionsFromTeamDefHoldingVersions(VersionReleaseType releaseType, VersionLockedType lockedType) throws OseeCoreException { TeamDefinitionArtifact teamDef = getTeamDefinitionHoldingVersions(); if (teamDef == null) { - return new ArrayList<VersionArtifact>(); + return new ArrayList<Artifact>(); } return teamDef.getVersionsArtifacts(releaseType, lockedType); } @@ -439,8 +439,8 @@ public class TeamDefinitionArtifact extends Artifact implements ICommitConfigArt return getRelatedArtifacts(AtsRelationTypes.TeamMember_Member, User.class); } - public VersionArtifact getVersionArtifact(String name, boolean create) throws OseeCoreException { - for (VersionArtifact verArt : getVersionsArtifacts()) { + public Artifact getVersionArtifact(String name, boolean create) throws OseeCoreException { + for (Artifact verArt : getVersionsArtifacts()) { if (verArt.getName().equals(name)) { return verArt; } @@ -451,39 +451,38 @@ public class TeamDefinitionArtifact extends Artifact implements ICommitConfigArt return null; } - public VersionArtifact createVersion(String name) throws OseeCoreException { - VersionArtifact versionArt = - (VersionArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), name); + public Artifact createVersion(String name) throws OseeCoreException { + Artifact versionArt = ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), name); addRelation(AtsRelationTypes.TeamDefinitionToVersion_Version, versionArt); return versionArt; } - public Collection<VersionArtifact> getVersionsArtifacts() throws OseeCoreException { - return getRelatedArtifacts(AtsRelationTypes.TeamDefinitionToVersion_Version, VersionArtifact.class); + public Collection<Artifact> getVersionsArtifacts() throws OseeCoreException { + return getRelatedArtifacts(AtsRelationTypes.TeamDefinitionToVersion_Version); } - public Collection<VersionArtifact> getVersionsArtifacts(VersionReleaseType releaseType, VersionLockedType lockType) throws OseeCoreException { + public Collection<Artifact> getVersionsArtifacts(VersionReleaseType releaseType, VersionLockedType lockType) throws OseeCoreException { return Collections.setIntersection(getVersionsArtifacts(releaseType), getVersionsArtifacts(lockType)); } - private Collection<VersionArtifact> getVersionsArtifacts(VersionReleaseType releaseType) throws OseeCoreException { - ArrayList<VersionArtifact> versions = new ArrayList<VersionArtifact>(); - for (VersionArtifact version : getVersionsArtifacts()) { - if (version.isReleased() && (releaseType == VersionReleaseType.Released || releaseType == VersionReleaseType.Both)) { + private Collection<Artifact> getVersionsArtifacts(VersionReleaseType releaseType) throws OseeCoreException { + ArrayList<Artifact> versions = new ArrayList<Artifact>(); + for (Artifact version : getVersionsArtifacts()) { + if (VersionManager.isReleased(version) && (releaseType == VersionReleaseType.Released || releaseType == VersionReleaseType.Both)) { versions.add(version); - } else if ((!version.isReleased() && releaseType == VersionReleaseType.UnReleased) || releaseType == VersionReleaseType.Both) { + } else if ((!VersionManager.isReleased(version) && releaseType == VersionReleaseType.UnReleased) || releaseType == VersionReleaseType.Both) { versions.add(version); } } return versions; } - private Collection<VersionArtifact> getVersionsArtifacts(VersionLockedType lockType) throws OseeCoreException { - ArrayList<VersionArtifact> versions = new ArrayList<VersionArtifact>(); - for (VersionArtifact version : getVersionsArtifacts()) { - if (version.isVersionLocked() && (lockType == VersionLockedType.Locked || lockType == VersionLockedType.Both)) { + private Collection<Artifact> getVersionsArtifacts(VersionLockedType lockType) throws OseeCoreException { + ArrayList<Artifact> versions = new ArrayList<Artifact>(); + for (Artifact version : getVersionsArtifacts()) { + if (VersionManager.isVersionLocked(version) && (lockType == VersionLockedType.Locked || lockType == VersionLockedType.Both)) { versions.add(version); - } else if ((!version.isVersionLocked() && lockType == VersionLockedType.UnLocked) || lockType == VersionLockedType.Both) { + } else if ((!VersionManager.isVersionLocked(version) && lockType == VersionLockedType.UnLocked) || lockType == VersionLockedType.Both) { versions.add(version); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java deleted file mode 100644 index 28bb92343c9..00000000000 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java +++ /dev/null @@ -1,201 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 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.artifact; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.logging.Level; -import org.eclipse.osee.ats.config.AtsCacheManager; -import org.eclipse.osee.ats.internal.AtsPlugin; -import org.eclipse.osee.ats.util.AtsArtifactTypes; -import org.eclipse.osee.ats.util.AtsRelationTypes; -import org.eclipse.osee.ats.util.widgets.commit.ICommitConfigArtifact; -import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; -import org.eclipse.osee.framework.core.exception.BranchDoesNotExist; -import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.model.Branch; -import org.eclipse.osee.framework.jdk.core.util.Collections; -import org.eclipse.osee.framework.jdk.core.util.GUID; -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.ArtifactFactory; -import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.ui.plugin.util.Result; - -public class VersionArtifact extends Artifact implements ICommitConfigArtifact { - public static enum VersionReleaseType { - Released, - UnReleased, - Both - }; - public static enum VersionLockedType { - Locked, - UnLocked, - Both - }; - - public VersionArtifact(ArtifactFactory parentFactory, String guid, String humandReadableId, Branch branch, IArtifactType artifactType) throws OseeCoreException { - super(parentFactory, guid, humandReadableId, branch, artifactType); - } - - @Override - public Result isCreateBranchAllowed() throws OseeCoreException { - if (!getSoleAttributeValue(AtsAttributeTypes.AllowCreateBranch, false)) { - return new Result(false, "Branch creation disabled for Version [" + this + "]"); - } - if (getParentBranch() == null) { - return new Result(false, "Parent Branch not configured for Version [" + this + "]"); - } - return Result.TrueResult; - } - - @Override - public Result isCommitBranchAllowed() throws OseeCoreException { - if (!getSoleAttributeValue(AtsAttributeTypes.AllowCommitBranch, false)) { - return new Result(false, "Version [" + this + "] not configured to allow branch commit."); - } - if (getParentBranch() == null) { - return new Result(false, "Parent Branch not configured for Version [" + this + "]"); - } - return Result.TrueResult; - } - - @Override - public Branch getParentBranch() throws OseeCoreException { - try { - String guid = getSoleAttributeValue(AtsAttributeTypes.BaselineBranchGuid, ""); - if (GUID.isValid(guid)) { - return BranchManager.getBranchByGuid(guid); - } - } catch (BranchDoesNotExist ex) { - OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); - } - return null; - } - - public TeamDefinitionArtifact getParentTeamDefinition() throws OseeCoreException { - return getRelatedArtifacts(AtsRelationTypes.TeamDefinitionToVersion_TeamDefinition, TeamDefinitionArtifact.class).iterator().next(); - } - - public Boolean isReleased() throws OseeCoreException { - return getSoleAttributeValue(AtsAttributeTypes.Released, false); - } - - public Boolean isNextVersion() throws OseeCoreException { - return getSoleAttributeValue(AtsAttributeTypes.NextVersion, false); - } - - public void getParallelVersions(Set<ICommitConfigArtifact> configArts) throws OseeCoreException { - configArts.add(this); - for (VersionArtifact verArt : getRelatedArtifacts(AtsRelationTypes.ParallelVersion_Child, VersionArtifact.class)) { - verArt.getParallelVersions(configArts); - } - } - - public Boolean isVersionLocked() throws OseeCoreException { - return getSoleAttributeValue(AtsAttributeTypes.VersionLocked, false); - } - - @Override - public String toString() { - return getName(); - } - - public void setReleased(boolean released) throws OseeCoreException { - setSoleAttributeValue(AtsAttributeTypes.Released, released); - } - - public void setNextVersion(boolean nextVersion) throws OseeCoreException { - setSoleAttributeValue(AtsAttributeTypes.NextVersion, nextVersion); - } - - public void setVersionLocked(boolean locked) throws OseeCoreException { - setSoleAttributeValue(AtsAttributeTypes.VersionLocked, locked); - } - - public String getFullName() throws OseeCoreException { - return getSoleAttributeValue(AtsAttributeTypes.FullName, ""); - } - - public void setFullName(String name) throws OseeCoreException { - setSoleAttributeValue(AtsAttributeTypes.FullName, name); - } - - public void setDescription(String desc) throws OseeCoreException { - setSoleAttributeValue(AtsAttributeTypes.Description, desc); - } - - public Collection<TeamWorkFlowArtifact> getTargetedForTeamArtifacts() throws OseeCoreException { - return getRelatedArtifacts(AtsRelationTypes.TeamWorkflowTargetedForVersion_Workflow, TeamWorkFlowArtifact.class); - } - - @Override - public String getFullDisplayName() throws OseeCoreException { - List<String> strs = new ArrayList<String>(); - if (!getName().equals(Artifact.UNNAMED)) { - strs.add(getName()); - } - if (Strings.isValid(getFullName())) { - strs.add(getFullName()); - } - String description = getSoleAttributeValue(AtsAttributeTypes.Description, ""); - if (Strings.isValid(description)) { - strs.add(description); - } - return Collections.toString(" - ", strs); - } - - public TeamDefinitionArtifact getTeamDefinitionArtifact() throws OseeCoreException { - try { - return (TeamDefinitionArtifact) getRelatedArtifact(AtsRelationTypes.TeamDefinitionToVersion_TeamDefinition); - } catch (ArtifactDoesNotExist ex) { - return null; - } - } - - public Branch getBaselineBranch() throws OseeCoreException { - String branchGuid = getSoleAttributeValue(AtsAttributeTypes.BaselineBranchGuid, ""); - if (Strings.isValid(branchGuid)) { - return BranchManager.getBranchByGuid(branchGuid); - } else { - return getTeamDefinitionArtifact().getTeamBranch(); - } - } - - public Date getEstimatedReleaseDate() throws OseeCoreException { - return getSoleAttributeValue(AtsAttributeTypes.EstimatedReleaseDate, null); - } - - public Date getReleaseDate() throws OseeCoreException { - return getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null); - } - - public static Set<VersionArtifact> getVersions(Collection<String> teamDefNames) { - Set<VersionArtifact> teamDefs = new HashSet<VersionArtifact>(); - for (String teamDefName : teamDefNames) { - teamDefs.add(getSoleVersion(teamDefName)); - } - return teamDefs; - } - - /** - * Refrain from using this method as Version Artifact names can be changed by the user. - */ - public static VersionArtifact getSoleVersion(String name) { - return (VersionArtifact) AtsCacheManager.getArtifactsByName(AtsArtifactTypes.Version, name).iterator().next(); - } -} diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionCommitConfigArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionCommitConfigArtifact.java new file mode 100644 index 00000000000..5dc0cfa435f --- /dev/null +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionCommitConfigArtifact.java @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 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.artifact; + +import org.eclipse.osee.ats.util.VersionManager; +import org.eclipse.osee.ats.util.widgets.commit.ICommitConfigArtifact; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.plugin.util.Result; + +public class VersionCommitConfigArtifact implements ICommitConfigArtifact { + + private final Artifact verArt; + + public VersionCommitConfigArtifact(Artifact verArt) throws OseeCoreException { + this.verArt = verArt; + VersionManager.ensureVersionArtifact(verArt); + } + + @Override + public Result isCreateBranchAllowed() throws OseeCoreException { + return VersionManager.isCreateBranchAllowed(verArt); + } + + @Override + public Result isCommitBranchAllowed() throws OseeCoreException { + return VersionManager.isCommitBranchAllowed(verArt); + } + + @Override + public Branch getParentBranch() throws OseeCoreException { + return VersionManager.getParentBranch(verArt); + } + + @Override + public String toString() { + return verArt.getName(); + } + + @Override + public String getFullDisplayName() throws OseeCoreException { + return VersionManager.getFullDisplayName(verArt); + } + + public Artifact getVersionArt() { + return verArt; + } +} 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 f86554bd088..60f872f4f25 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 @@ -12,14 +12,16 @@ import org.eclipse.nebula.widgets.xviewer.XViewerCells; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; 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; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; /** @@ -34,7 +36,7 @@ public abstract class AbstractWorkflowVersionDateColumn extends XViewerAtsAttrib @Override public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { - if (ActionManager.isOfTypeAction(element)) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { String str = getColumnText(team, column, columnIndex); @@ -68,7 +70,7 @@ public abstract class AbstractWorkflowVersionDateColumn extends XViewerAtsAttrib public static Date getDateFromTargetedVersion(IAttributeType attributeType, Object object) throws OseeCoreException { if (object instanceof TeamWorkFlowArtifact) { TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) object; - VersionArtifact verArt = TargetedVersionColumn.getTargetedVersion(teamArt); + Artifact verArt = TargetedVersionColumn.getTargetedVersion(teamArt); if (verArt != null) { return verArt.getSoleAttributeValue(attributeType, null); } 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 2f581841e8f..84a2055d753 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 @@ -17,6 +17,7 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -63,7 +64,7 @@ public class ActionableItemsColumn extends XViewerAtsAttributeValueColumn { } public static Collection<ActionableItemArtifact> getActionableItems(Object element) throws OseeCoreException { - if (ActionManager.isOfTypeAction(element)) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<ActionableItemArtifact> aias = new HashSet<ActionableItemArtifact>(); // Roll up if same for all children for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AnnualCostAvoidanceColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AnnualCostAvoidanceColumn.java index de00da05655..b727cfb5781 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AnnualCostAvoidanceColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AnnualCostAvoidanceColumn.java @@ -13,6 +13,7 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; @@ -20,6 +21,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.swt.SWT; @@ -69,7 +71,7 @@ public class AnnualCostAvoidanceColumn extends XViewerAtsColumn implements IXVie } public static double getWorldViewAnnualCostAvoidance(Object object) throws OseeCoreException { - if (ActionManager.isOfTypeAction(object)) { + if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { double hours = 0; // Add up hours for all children for (TeamWorkFlowArtifact team : ActionManager.getTeams(object)) { @@ -88,7 +90,7 @@ public class AnnualCostAvoidanceColumn extends XViewerAtsColumn implements IXVie } public static Result isWorldViewAnnualCostAvoidanceValid(Object object) throws OseeCoreException { - if (ActionManager.isOfTypeAction(object)) { + if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { for (TeamWorkFlowArtifact team : ActionManager.getTeams(object)) { Result result = isWorldViewAnnualCostAvoidanceValid(team); if (result.isFalse()) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/BranchStatusColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/BranchStatusColumn.java index 87456965d6f..7509edaeec9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/BranchStatusColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/BranchStatusColumn.java @@ -12,11 +12,13 @@ import org.eclipse.nebula.widgets.xviewer.XViewerCells; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class BranchStatusColumn extends XViewerAtsColumn implements IXViewerValueColumn { @@ -46,7 +48,7 @@ public class BranchStatusColumn extends XViewerAtsColumn implements IXViewerValu @Override public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { - if (ActionManager.isOfTypeAction(element)) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { String str = getColumnText(team, column, columnIndex); 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 13f61a1202b..41e5c6f09eb 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 @@ -13,6 +13,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -52,7 +53,7 @@ public class CancelledByColumn extends XViewerAtsColumn implements IXViewerValue if (user != null) { return user.getName(); } - } else if (ActionManager.isOfTypeAction(element)) { + } else if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<User> users = new HashSet<User>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { User user = team.getCancelledBy(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CancelledDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CancelledDateColumn.java index f782c803ff0..d3caa34acad 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CancelledDateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CancelledDateColumn.java @@ -15,6 +15,7 @@ import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -23,6 +24,7 @@ import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class CancelledDateColumn extends XViewerAtsColumn implements IXViewerValueColumn { @@ -60,7 +62,7 @@ public class CancelledDateColumn extends XViewerAtsColumn implements IXViewerVal } public static Date getDate(Object object) throws OseeCoreException { - if (ActionManager.isOfTypeAction(object)) { + if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { getDate(ActionManager.getFirstTeam(object)); } else if (object instanceof AbstractWorkflowArtifact) { AbstractWorkflowArtifact awa = (AbstractWorkflowArtifact) object; @@ -77,7 +79,7 @@ public class CancelledDateColumn extends XViewerAtsColumn implements IXViewerVal } public static String getDateStr(Object object) throws OseeCoreException { - if (ActionManager.isOfTypeAction(object)) { + if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(object)) { String str = getDateStr(team); 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 31fb8061cfd..fe0f05d3912 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 @@ -13,6 +13,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -52,7 +53,7 @@ public class CompletedByColumn extends XViewerAtsColumn implements IXViewerValue if (user != null) { return user.getName(); } - } else if (ActionManager.isOfTypeAction(element)) { + } else if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<User> users = new HashSet<User>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { User user = team.getCompletedBy(); 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 0da65eecc08..84fec02a359 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 @@ -13,6 +13,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -53,7 +54,7 @@ public class CompletedCancelledByColumn extends XViewerAtsColumn implements IXVi } else if (((AbstractWorkflowArtifact) element).isCancelled()) { return CancelledByColumn.getInstance().getColumnText(element, column, columnIndex); } - } else if (ActionManager.isOfTypeAction(element)) { + } else if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<User> users = new HashSet<User>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { User user = team.getCompletedBy(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedDateColumn.java index cc907af1433..f82e101b6a7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedDateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedDateColumn.java @@ -15,6 +15,7 @@ import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -23,6 +24,7 @@ import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class CompletedDateColumn extends XViewerAtsColumn implements IXViewerValueColumn { @@ -60,7 +62,7 @@ public class CompletedDateColumn extends XViewerAtsColumn implements IXViewerVal } public static Date getDate(Object object) throws OseeCoreException { - if (ActionManager.isOfTypeAction(object)) { + if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { getDate(ActionManager.getFirstTeam(object)); } else if (object instanceof AbstractWorkflowArtifact) { AbstractWorkflowArtifact awa = (AbstractWorkflowArtifact) object; @@ -77,7 +79,7 @@ public class CompletedDateColumn extends XViewerAtsColumn implements IXViewerVal } public static String getDateStr(Object object) throws OseeCoreException { - if (ActionManager.isOfTypeAction(object)) { + if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(object)) { String str = getDateStr(team); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CreatedDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CreatedDateColumn.java index edddd42e695..8f08704d0c3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CreatedDateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CreatedDateColumn.java @@ -14,11 +14,13 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.DateUtil; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class CreatedDateColumn extends XViewerAtsColumn implements IXViewerValueColumn { @@ -56,7 +58,7 @@ public class CreatedDateColumn extends XViewerAtsColumn implements IXViewerValue } public static Date getDate(Object object) throws OseeCoreException { - if (ActionManager.isOfTypeAction(object)) { + if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { return getDate(ActionManager.getFirstTeam(object)); } else if (object instanceof AbstractWorkflowArtifact) { return ((AbstractWorkflowArtifact) object).getCreatedDate(); @@ -66,7 +68,7 @@ public class CreatedDateColumn extends XViewerAtsColumn implements IXViewerValue public static String getDateStr(Object object) throws OseeCoreException { Set<String> strs = new HashSet<String>(); - if (ActionManager.isOfTypeAction(object)) { + if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { for (TeamWorkFlowArtifact team : ActionManager.getTeams(object)) { Date date = getDate(team); if (date == null) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DaysInCurrentStateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DaysInCurrentStateColumn.java index a4da0b171ab..1d4ede364d1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DaysInCurrentStateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DaysInCurrentStateColumn.java @@ -13,6 +13,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; @@ -20,6 +21,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class DaysInCurrentStateColumn extends XViewerAtsColumn implements IXViewerValueColumn { @@ -55,7 +57,7 @@ public class DaysInCurrentStateColumn extends XViewerAtsColumn implements IXView return "0.0"; } return AtsUtil.doubleToI18nString(timeInCurrState / DateUtil.MILLISECONDS_IN_A_DAY); - } else if (ActionManager.isOfTypeAction(element)) { + } else if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { String str = getColumnText(team, column, columnIndex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DeadlineColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DeadlineColumn.java index 9be8d3b875e..b542cad6554 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DeadlineColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DeadlineColumn.java @@ -11,12 +11,14 @@ import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.DeadlineManager; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -65,7 +67,7 @@ public class DeadlineColumn extends XViewerAtsAttributeValueColumn { public static Result isDeadlineAlerting(Object object) throws OseeCoreException { if (object instanceof AbstractWorkflowArtifact) { return DeadlineManager.isDeadlineDateAlerting((AbstractWorkflowArtifact) object); - } else if (ActionManager.isOfTypeAction(object)) { + } else if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { for (TeamWorkFlowArtifact team : ActionManager.getTeams(object)) { Result result = isDeadlineAlerting(team); if (result.isTrue()) { @@ -77,7 +79,7 @@ public class DeadlineColumn extends XViewerAtsAttributeValueColumn { } public static Date getDate(Object object) throws OseeCoreException { - if (ActionManager.isOfTypeAction(object)) { + if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { return getDate(ActionManager.getFirstTeam(object)); } else if (object instanceof TeamWorkFlowArtifact) { return ((TeamWorkFlowArtifact) object).getSoleAttributeValue(AtsAttributeTypes.NeedBy, null); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DecisionColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DecisionColumn.java index 47423db2f1b..aa87579d4d3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DecisionColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/DecisionColumn.java @@ -7,8 +7,9 @@ package org.eclipse.osee.ats.column; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; -import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class DecisionColumn extends XViewerAtsAttributeValueColumn { @@ -36,7 +37,7 @@ public class DecisionColumn extends XViewerAtsAttributeValueColumn { @Override public String getColumnText(Object element, XViewerColumn column, int columnIndex) { - if (ActionManager.isOfTypeAction(element)) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { return ""; } return super.getColumnText(element, column, columnIndex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedCompletionDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedCompletionDateColumn.java index 81edcf4e04d..3f4d1840d2c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedCompletionDateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedCompletionDateColumn.java @@ -13,6 +13,7 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.DeadlineManager; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; @@ -20,6 +21,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -68,7 +70,7 @@ public class EstimatedCompletionDateColumn extends XViewerAtsAttributeValueColum } public static Result isWorldViewEcdAlerting(Object object) throws OseeCoreException { - if (ActionManager.isOfTypeAction(object)) { + if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { for (TeamWorkFlowArtifact team : ActionManager.getTeams(object)) { Result result = isWorldViewEcdAlerting(team); if (result.isTrue()) { @@ -82,7 +84,7 @@ public class EstimatedCompletionDateColumn extends XViewerAtsAttributeValueColum } public static Date getDate(Object object) throws OseeCoreException { - if (ActionManager.isOfTypeAction(object)) { + if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { return getDate((ActionManager.getFirstTeam(object))); } else if (object instanceof TeamWorkFlowArtifact) { Date date = diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursColumn.java index 32e4e806ed1..137c48047ef 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/EstimatedHoursColumn.java @@ -12,11 +12,13 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsAttributeValueColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class EstimatedHoursColumn extends XViewerAtsAttributeValueColumn { @@ -56,7 +58,7 @@ public class EstimatedHoursColumn extends XViewerAtsAttributeValueColumn { public static double getEstimatedHours(Object object) throws OseeCoreException { if (object instanceof AbstractWorkflowArtifact) { return ((AbstractWorkflowArtifact) object).getEstimatedHoursTotal(); - } else if (ActionManager.isOfTypeAction(object)) { + } else if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { double total = 0; for (TeamWorkFlowArtifact team : ActionManager.getTeams(object)) { total += team.getEstimatedHoursTotal(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GroupsColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GroupsColumn.java index 9fbe325230c..af2ed2b4ce7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GroupsColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/GroupsColumn.java @@ -120,7 +120,7 @@ public class GroupsColumn extends XViewerAtsColumn implements IXViewerValueColum @Override public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { - if (ActionManager.isOfTypeAction(element)) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<Artifact> groups = new HashSet<Artifact>(); Artifact actionArt = (Artifact) element; groups.addAll(actionArt.getRelatedArtifacts(CoreRelationTypes.Universal_Grouping__Group)); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ImplementorColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ImplementorColumn.java index 6b811187ea6..3f0fcb1f4b7 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ImplementorColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ImplementorColumn.java @@ -13,6 +13,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -49,7 +50,7 @@ public class ImplementorColumn extends XViewerAtsColumn implements IXViewerValue try { if (element instanceof AbstractWorkflowArtifact) { return Artifacts.toString("; ", ((AbstractWorkflowArtifact) element).getImplementers()); - } else if (ActionManager.isOfTypeAction(element)) { + } else if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<User> users = new HashSet<User>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { users.addAll(team.getImplementers()); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/LastStatusedColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/LastStatusedColumn.java index dd05a5243f0..9ff9c3eef62 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/LastStatusedColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/LastStatusedColumn.java @@ -9,11 +9,12 @@ import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn; import org.eclipse.nebula.widgets.xviewer.XViewerCells; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.DateUtil; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class LastStatusedColumn extends XViewerAtsColumn implements IXViewerValueColumn { @@ -45,7 +46,7 @@ public class LastStatusedColumn extends XViewerAtsColumn implements IXViewerValu try { if (element instanceof AbstractWorkflowArtifact) { return DateUtil.getMMDDYYHHMM(((AbstractWorkflowArtifact) element).getLog().getLastStatusedDate()); - } else if (ActionManager.isOfTypeAction(element)) { + } else if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { return "(see children)"; } } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/NumberOfTasksColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/NumberOfTasksColumn.java index 3acb89642fe..acad624e7bc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/NumberOfTasksColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/NumberOfTasksColumn.java @@ -13,11 +13,13 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AbstractTaskableArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class NumberOfTasksColumn extends XViewerAtsColumn implements IXViewerValueColumn { @@ -47,7 +49,7 @@ public class NumberOfTasksColumn extends XViewerAtsColumn implements IXViewerVal @Override public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { - if (ActionManager.isOfTypeAction(element)) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { String str = getColumnText(team, column, columnIndex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/NumberOfTasksRemainingColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/NumberOfTasksRemainingColumn.java index fd8ac641460..13adcb8091e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/NumberOfTasksRemainingColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/NumberOfTasksRemainingColumn.java @@ -13,11 +13,13 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AbstractTaskableArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class NumberOfTasksRemainingColumn extends XViewerAtsColumn implements IXViewerValueColumn { @@ -47,7 +49,7 @@ public class NumberOfTasksRemainingColumn extends XViewerAtsColumn implements IX @Override public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { - if (ActionManager.isOfTypeAction(element)) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { String str = getColumnText(team, column, columnIndex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactColumn.java index 0172de49125..b32a0a3be4e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactColumn.java @@ -16,10 +16,12 @@ import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class OperationalImpactColumn extends XViewerValueColumn { @@ -64,7 +66,7 @@ public class OperationalImpactColumn extends XViewerValueColumn { return ((TeamWorkFlowArtifact) wva).getArtifact().getSoleAttributeValue(AtsAttributeTypes.OperationalImpact, ""); } - if (ActionManager.isOfTypeAction(wva)) { + if (Artifacts.isOfType(wva, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(wva)) { strs.add(getOperationalImpact(team)); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactDesciptionColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactDesciptionColumn.java index 4b5708a55d4..b9944d4a726 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactDesciptionColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactDesciptionColumn.java @@ -13,8 +13,10 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class OperationalImpactDesciptionColumn extends XViewerValueColumn { @@ -48,7 +50,7 @@ public class OperationalImpactDesciptionColumn extends XViewerValueColumn { return ((TeamWorkFlowArtifact) element).getArtifact().getSoleAttributeValue( AtsAttributeTypes.OperationalImpactDescription, ""); } - if (ActionManager.isOfTypeAction(element) && ActionManager.getTeams(element).size() == 1) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action) && ActionManager.getTeams(element).size() == 1) { return getColumnText(ActionManager.getFirstTeam(element), column, columnIndex); } } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWorkaroundColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWorkaroundColumn.java index ef12fb88c91..204bd78a2c6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWorkaroundColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWorkaroundColumn.java @@ -16,10 +16,12 @@ import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class OperationalImpactWorkaroundColumn extends XViewerValueColumn { @@ -64,7 +66,7 @@ public class OperationalImpactWorkaroundColumn extends XViewerValueColumn { return ((TeamWorkFlowArtifact) wva).getArtifact().getSoleAttributeValue( AtsAttributeTypes.OperationalImpactWorkaround, ""); } - if (ActionManager.isOfTypeAction(wva)) { + if (Artifacts.isOfType(wva, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(wva)) { strs.add(getOperationalImpact(team)); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWorkaroundDesciptionColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWorkaroundDesciptionColumn.java index 0bd8237cc27..71cbfe3193e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWorkaroundDesciptionColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OperationalImpactWorkaroundDesciptionColumn.java @@ -13,8 +13,10 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class OperationalImpactWorkaroundDesciptionColumn extends XViewerValueColumn { @@ -50,7 +52,7 @@ public class OperationalImpactWorkaroundDesciptionColumn extends XViewerValueCol return ((TeamWorkFlowArtifact) element).getArtifact().getSoleAttributeValue( AtsAttributeTypes.OperationalImpactWorkaroundDescription, ""); } - if (ActionManager.isOfTypeAction(element) && ActionManager.getTeams(element).size() == 1) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action) && ActionManager.getTeams(element).size() == 1) { return getColumnText(ActionManager.getFirstTeam(element), column, columnIndex); } } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OriginatingWorkFlowColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OriginatingWorkFlowColumn.java index fb6ed335743..ccc1bd1b1a4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OriginatingWorkFlowColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/OriginatingWorkFlowColumn.java @@ -16,11 +16,13 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; 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; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class OriginatingWorkFlowColumn extends XViewerAtsColumn implements IXViewerValueColumn { @@ -51,7 +53,7 @@ public class OriginatingWorkFlowColumn extends XViewerAtsColumn implements IXVie @Override public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { - if (ActionManager.isOfTypeAction(element)) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { getWorldViewOriginatingWorkflowStr((Artifact) element); } if (element instanceof AbstractWorkflowArtifact) { 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 bc77075eb65..b87f876777b 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 @@ -32,6 +32,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserListDialog; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; @@ -130,7 +131,7 @@ public class OriginatorColumn extends XViewerAtsColumn implements IXViewerValueC if (element instanceof AbstractWorkflowArtifact) { return ((AbstractWorkflowArtifact) element).getCreatedBy().getName(); } - if (ActionManager.isOfTypeAction(element)) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { strs.add(team.getCreatedBy().getName()); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/RemainingHoursColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/RemainingHoursColumn.java index c355124539f..0f13b2ef480 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/RemainingHoursColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/RemainingHoursColumn.java @@ -14,6 +14,7 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; @@ -21,6 +22,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.swt.SWT; @@ -74,7 +76,8 @@ public class RemainingHoursColumn extends XViewerAtsColumn implements IXViewerVa AbstractWorkflowArtifact aba = null; if (treeItem.getData() instanceof AbstractWorkflowArtifact) { aba = (AbstractWorkflowArtifact) treeItem.getData(); - } else if (ActionManager.isOfTypeAction(treeItem.getData()) && ActionManager.getTeams(treeItem.getData()).size() == 1) { + } else if (Artifacts.isOfType(treeItem.getData(), AtsArtifactTypes.Action) && ActionManager.getTeams( + treeItem.getData()).size() == 1) { aba = ActionManager.getFirstTeam((treeItem.getData())); } if (aba != null) { @@ -106,7 +109,7 @@ public class RemainingHoursColumn extends XViewerAtsColumn implements IXViewerVa return new Result( ex.getClass().getName() + ": " + ex.getLocalizedMessage() + "\n\n" + Lib.exceptionToString(ex)); } - } else if (ActionManager.isOfTypeAction(object)) { + } else if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { for (TeamWorkFlowArtifact team : ActionManager.getTeams(object)) { if (!isRemainingHoursValid(team).isFalse()) { return Result.FalseResult; @@ -119,7 +122,7 @@ public class RemainingHoursColumn extends XViewerAtsColumn implements IXViewerVa public static double getRemainingHours(Object object) throws OseeCoreException { if (object instanceof AbstractWorkflowArtifact) { return ((AbstractWorkflowArtifact) object).getRemainHoursTotal(); - } else if (ActionManager.isOfTypeAction(object)) { + } else if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { double hours = 0; // Add up hours for all children for (TeamWorkFlowArtifact team : ActionManager.getTeams(object)) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/StateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/StateColumn.java index eda6bf829ac..910de2b8b1e 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/StateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/StateColumn.java @@ -13,10 +13,12 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.swt.SWT; public class StateColumn extends XViewerAtsColumn implements IXViewerValueColumn { @@ -48,7 +50,7 @@ public class StateColumn extends XViewerAtsColumn implements IXViewerValueColumn try { if (element instanceof AbstractWorkflowArtifact) { return ((AbstractWorkflowArtifact) element).getCurrentStateName(); - } else if (ActionManager.isOfTypeAction(element)) { + } else if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { strs.add(team.getCurrentStateName()); 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 35709fb138a..3185a446212 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,14 +23,14 @@ import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionLockedType; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.ats.util.VersionLockedType; +import org.eclipse.osee.ats.util.VersionManager; +import org.eclipse.osee.ats.util.VersionReleaseType; import org.eclipse.osee.ats.util.widgets.dialog.VersionListDialog; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; @@ -158,10 +158,11 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV return false; } Object obj = vld.getResult()[0]; - VersionArtifact newVersion = (VersionArtifact) obj; + Artifact newVersion = (Artifact) obj; //now check selected version - if (newVersion.isVersionLocked()) { - String error = "Version \"" + newVersion.getFullDisplayName() + "\" is locked or already released."; + if (VersionManager.isVersionLocked(newVersion)) { + String error = + "Version \"" + VersionManager.getFullDisplayName(newVersion) + "\" is locked or already released."; if (AtsUtil.isAtsAdmin() && !MessageDialog.openConfirm(Displays.getActiveShell(), "Change Version", error + "\n\nOverride?")) { return false; @@ -182,7 +183,7 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV return true; } - public static VersionArtifact getTargetedVersion(Object object) throws OseeCoreException { + public static Artifact getTargetedVersion(Object object) throws OseeCoreException { if (object instanceof AbstractWorkflowArtifact) { TeamWorkFlowArtifact teamArt = ((AbstractWorkflowArtifact) object).getParentTeamWorkflow(); if (teamArt != null) { @@ -192,9 +193,9 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV if (verArts.size() > 1) { OseeLog.log(AtsPlugin.class, Level.SEVERE, "Multiple targeted versions for artifact " + teamArt.toStringWithId()); - return (VersionArtifact) verArts.iterator().next(); + return verArts.iterator().next(); } else { - return (VersionArtifact) verArts.iterator().next(); + return verArts.iterator().next(); } } } @@ -206,9 +207,8 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV if (object instanceof AbstractWorkflowArtifact) { TeamWorkFlowArtifact teamArt = ((AbstractWorkflowArtifact) object).getParentTeamWorkflow(); if (teamArt != null) { - Collection<VersionArtifact> verArts = - teamArt.getRelatedArtifacts(AtsRelationTypes.TeamWorkflowTargetedForVersion_Version, - VersionArtifact.class); + Collection<Artifact> verArts = + teamArt.getRelatedArtifacts(AtsRelationTypes.TeamWorkflowTargetedForVersion_Version); if (verArts.isEmpty()) { return ""; } @@ -218,7 +218,7 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV OseeLog.log(AtsPlugin.class, Level.SEVERE, errStr, null); return XViewerCells.getCellExceptionString(errStr); } - VersionArtifact verArt = verArts.iterator().next(); + Artifact verArt = verArts.iterator().next(); if (!teamArt.isCompleted() && !teamArt.isCancelled() && verArt.getSoleAttributeValue( AtsAttributeTypes.Released, false)) { String errStr = @@ -238,7 +238,7 @@ public class TargetedVersionColumn extends XViewerAtsColumn implements IXViewerV @Override public String getColumnText(Object element, XViewerColumn column, int columnIndex) { try { - if (ActionManager.isOfTypeAction(element)) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { String str = team.getTargetedVersionStr(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkDaysNeededColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkDaysNeededColumn.java index 32670357e3e..a8cb4946cf9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkDaysNeededColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/WorkDaysNeededColumn.java @@ -13,12 +13,14 @@ import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.swt.SWT; @@ -71,7 +73,8 @@ public class WorkDaysNeededColumn extends XViewerAtsColumn implements IXViewerVa AbstractWorkflowArtifact aba = null; if (treeItem.getData() instanceof AbstractWorkflowArtifact) { aba = (AbstractWorkflowArtifact) treeItem.getData(); - } else if (ActionManager.isOfTypeAction(treeItem.getData()) && ActionManager.getTeams(treeItem.getData()).size() == 1) { + } else if (Artifacts.isOfType(treeItem.getData(), AtsArtifactTypes.Action) && ActionManager.getTeams( + treeItem.getData()).size() == 1) { aba = ActionManager.getFirstTeam(treeItem.getData()); } if (aba != null) { @@ -97,7 +100,7 @@ public class WorkDaysNeededColumn extends XViewerAtsColumn implements IXViewerVa } return Result.TrueResult; - } else if (ActionManager.isOfTypeAction(object)) { + } else if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { for (TeamWorkFlowArtifact team : ActionManager.getTeams(object)) { if (!isWorldViewManDaysNeededValid(team).isFalse()) { return Result.FalseResult; @@ -115,7 +118,7 @@ public class WorkDaysNeededColumn extends XViewerAtsColumn implements IXViewerVa manDaysNeeded = hrsRemain / ((AbstractWorkflowArtifact) object).getManHrsPerDayPreference(); } return manDaysNeeded; - } else if (ActionManager.isOfTypeAction(object)) { + } else if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) { double hours = 0; // Add up hours for all children for (TeamWorkFlowArtifact team : ActionManager.getTeams(object)) { 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 773794da56d..4fe42b02be2 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 @@ -23,7 +23,6 @@ import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.artifact.AtsArtifactToken; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.dsl.atsDsl.AtsDsl; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsArtifactTypes; @@ -160,11 +159,10 @@ public class AtsConfigManager extends AbstractOperation { } private void createVersions(SkynetTransaction transaction, TeamDefinitionArtifact teamDefinition) throws OseeCoreException { - List<VersionArtifact> versions = new ArrayList<VersionArtifact>(); + List<Artifact> versions = new ArrayList<Artifact>(); if (versionNames != null) { for (String name : versionNames) { - VersionArtifact version = - (VersionArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), name); + Artifact version = ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), name); teamDefinition.addRelation(AtsRelationTypes.TeamDefinitionToVersion_Version, version); versions.add(version); version.persist(transaction); 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 0c9457e8709..e9309b4fc42 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 @@ -29,7 +29,6 @@ import org.eclipse.osee.ats.actions.ResourceHistoryAction; import org.eclipse.osee.ats.artifact.AbstractTaskableArtifact; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TaskArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.navigate.VisitedItems; import org.eclipse.osee.ats.task.IXTaskViewer; @@ -568,7 +567,7 @@ public class SMAEditor extends AbstractArtifactEditor implements ISMAEditorEvent } @Override - public VersionArtifact getMetricsVersionArtifact() throws OseeCoreException { + public Artifact getMetricsVersionArtifact() throws OseeCoreException { return awa.getTargetedVersion(); } 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 b70d5139a23..8d8c8b761f4 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 @@ -12,11 +12,11 @@ package org.eclipse.osee.ats.editor; import java.util.logging.Level; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionLockedType; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; import org.eclipse.osee.ats.column.TargetedVersionColumn; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.ats.util.VersionLockedType; +import org.eclipse.osee.ats.util.VersionReleaseType; 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/src/org/eclipse/osee/ats/export/AtsExportManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportManager.java index 019ba8282b1..c4da3901f23 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportManager.java @@ -36,6 +36,7 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLevel; 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; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; @@ -100,7 +101,7 @@ public class AtsExportManager extends Action { if (selectedObject instanceof AbstractWorkflowArtifact) { smaArts.add((AbstractWorkflowArtifact) selectedObject); - } else if (ActionManager.isOfTypeAction(selectedObject)) { + } else if (Artifacts.isOfType(selectedObject, AtsArtifactTypes.Action)) { smaArts.addAll(ActionManager.getTeams(selectedObject)); } else { OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Expected selection to be of type Artifact"); 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 17de7b58fff..2c3c471ae0d 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 @@ -32,7 +32,6 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.artifact.log.AtsLog; import org.eclipse.osee.ats.artifact.log.LogItem; import org.eclipse.osee.ats.internal.AtsPlugin; @@ -264,8 +263,8 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { private void testVersionArtifacts(Collection<Artifact> artifacts) { for (Artifact artifact : artifacts) { - if (artifact instanceof VersionArtifact) { - VersionArtifact verArt = (VersionArtifact) artifact; + if (artifact.isOfType(AtsArtifactTypes.Version)) { + Artifact verArt = artifact; try { String parentBranchGuid = verArt.getSoleAttributeValueAsString(AtsAttributeTypes.BaselineBranchGuid, null); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java index 277c5e87c32..47343f5e593 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java @@ -26,6 +26,7 @@ import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.help.ui.AtsHelpContext; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.util.widgets.ReviewManager; @@ -38,6 +39,7 @@ import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter; import org.eclipse.osee.framework.skynet.core.event.listener.IArtifactEventListener; import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent; import org.eclipse.osee.framework.skynet.core.event.model.Sender; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.OseeUiActions; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; @@ -149,7 +151,7 @@ public class ActionHyperView extends HyperView implements IActionable, IArtifact return; } ActionHyperItem topAHI = new ActionHyperItem(topArt); - if (ActionManager.isOfTypeAction(topArt)) { + if (Artifacts.isOfType(topArt, AtsArtifactTypes.Action)) { for (TeamWorkFlowArtifact team : ActionManager.getTeams(topArt)) { ActionHyperItem teamAHI = new ActionHyperItem(team); teamAHI.setRelationToolTip("Team"); 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 152d24d035e..812c0d67fed 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 @@ -20,7 +20,6 @@ import org.eclipse.osee.ats.actions.wizard.NewActionJob; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.column.ChangeTypeColumn; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.ActionManager; @@ -226,19 +225,16 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { transaction.execute(); } - private VersionArtifact getVersion256() throws OseeCoreException { - return (VersionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Version, "2.5.6", - AtsUtil.getAtsBranch()); + private Artifact getVersion256() throws OseeCoreException { + return ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Version, "2.5.6", AtsUtil.getAtsBranch()); } - private VersionArtifact getVersion257() throws OseeCoreException { - return (VersionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Version, "2.5.7", - AtsUtil.getAtsBranch()); + private Artifact getVersion257() throws OseeCoreException { + return ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Version, "2.5.7", AtsUtil.getAtsBranch()); } - private VersionArtifact getVersion258() throws OseeCoreException { - return (VersionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Version, "2.5.8", - AtsUtil.getAtsBranch()); + private Artifact getVersion258() throws OseeCoreException { + return ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Version, "2.5.8", AtsUtil.getAtsBranch()); } private void validateActionAtStart(Artifact actionArt) throws OseeCoreException { @@ -274,7 +270,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { testEquals("Validation Required", "false", String.valueOf(teamArt.getSoleAttributeValue(AtsAttributeTypes.ValidationRequired, null))); - VersionArtifact verArt = teamArt.getTargetedVersion(); + Artifact verArt = teamArt.getTargetedVersion(); String expectedTargetedVersion; if (verArt != null) { expectedTargetedVersion = verArt.toString(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java index 2487fd4b3c4..991d169a382 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java @@ -15,7 +15,6 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsRelationTypes; @@ -26,6 +25,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLevel; 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.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; @@ -81,7 +81,7 @@ public class CreateNewVersionItem extends XNavigateItemAction { if (!Strings.isValid(newVer)) { resultData.logError("Version name can't be blank"); } - for (VersionArtifact verArt : teamDefHoldingVersions.getVersionsArtifacts()) { + for (Artifact verArt : teamDefHoldingVersions.getVersionsArtifacts()) { if (verArt.getName().equals(newVer)) { resultData.logError(String.format("Version [%s] already exists", newVer)); } @@ -96,8 +96,7 @@ public class CreateNewVersionItem extends XNavigateItemAction { } try { SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "Create New Version(s)"); - Set<VersionArtifact> newVersions = - createNewVersionItemTx(transaction, teamDefHoldingVersions, newVersionNames); + Set<Artifact> newVersions = createNewVersionItemTx(transaction, teamDefHoldingVersions, newVersionNames); transaction.execute(); if (newVersions.size() == 1) { @@ -126,11 +125,10 @@ public class CreateNewVersionItem extends XNavigateItemAction { return null; } - private Set<VersionArtifact> createNewVersionItemTx(SkynetTransaction transaction, TeamDefinitionArtifact teamDefHoldingVersions, Set<String> newVersionNames) throws OseeCoreException { - Set<VersionArtifact> newVersions = new HashSet<VersionArtifact>(); + private Set<Artifact> createNewVersionItemTx(SkynetTransaction transaction, TeamDefinitionArtifact teamDefHoldingVersions, Set<String> newVersionNames) throws OseeCoreException { + Set<Artifact> newVersions = new HashSet<Artifact>(); for (String newVer : newVersionNames) { - VersionArtifact ver = - (VersionArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), newVer); + Artifact ver = ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), newVer); teamDefHoldingVersions.addRelation(AtsRelationTypes.TeamDefinitionToVersion_Version, ver); ver.persist(transaction); newVersions.add(ver); 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 3febcfd969c..83d28d7237f 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.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.ChangeTypeColumn; @@ -152,13 +153,13 @@ public class FirstTimeQualityMetricReportItem extends XNavigateItemAction { monitor.beginTask("Processing Versions", verMets.size()); for (VersionMetrics verMet : verMets) { Date thisReleaseStartDate = verMet.getReleaseStartDate(); - Date thisReleaseEndDate = verMet.getVerArt().getReleaseDate(); + Date thisReleaseEndDate = verMet.getVerArt().getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null); Date nextReleaseStartDate = null; Date nextReleaseEndDate = null; VersionMetrics nextVerMet = verMet.getNextVerMetViaReleaseDate(); if (nextVerMet != null) { nextReleaseStartDate = nextVerMet.getReleaseStartDate(); - nextReleaseEndDate = nextVerMet.getVerArt().getReleaseDate(); + nextReleaseEndDate = nextVerMet.getVerArt().getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null); } Integer numOrigDurningNextReleaseCycle = 0; if (nextReleaseStartDate != null && nextReleaseEndDate != null) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateVersionReportItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateVersionReportItem.java index 0a7b89a23de..348d9f8279f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateVersionReportItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateVersionReportItem.java @@ -11,10 +11,10 @@ package org.eclipse.osee.ats.navigate; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.util.VersionReportJob; import org.eclipse.osee.ats.util.widgets.dialog.TeamVersionListDialog; import org.eclipse.osee.framework.core.enums.Active; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; @@ -34,7 +34,7 @@ public class GenerateVersionReportItem extends XNavigateItemAction { TeamVersionListDialog ld = new TeamVersionListDialog(Active.Both); int result = ld.open(); if (result == 0) { - VersionArtifact verArt = ld.getSelectedVersion(); + Artifact verArt = ld.getSelectedVersion(); String title = ld.getSelectedTeamDef().getName() + " Version \"" + verArt.getName() + "\" Report"; VersionReportJob job = new VersionReportJob(title, verArt); job.setUser(true); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GoalSearchWorkflowSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GoalSearchWorkflowSearchItem.java index 92503a04b24..d313b5cd653 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GoalSearchWorkflowSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GoalSearchWorkflowSearchItem.java @@ -14,7 +14,6 @@ import java.util.Collection; import java.util.logging.Level; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.widgets.XHyperlabelTeamDefinitionSelection; import org.eclipse.osee.ats.world.WorldEditor; @@ -187,7 +186,7 @@ public class GoalSearchWorkflowSearchItem extends WorldEditorParameterSearchItem } @Override - public VersionArtifact getTargetedVersionArtifact() { + public Artifact getTargetedVersionArtifact() { return null; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java index 2e733e6cf6f..192754a0e06 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java @@ -16,11 +16,11 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionLockedType; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.ats.util.VersionLockedType; +import org.eclipse.osee.ats.util.VersionManager; +import org.eclipse.osee.ats.util.VersionReleaseType; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.ats.util.widgets.dialog.VersionListDialog; import org.eclipse.osee.framework.core.enums.Active; @@ -29,6 +29,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; @@ -65,16 +66,17 @@ public class ReleaseVersionItem extends XNavigateItemAction { teamDefHoldingVersions.getVersionsArtifacts(VersionReleaseType.UnReleased, VersionLockedType.Both)); int result = ld.open(); if (result == 0) { - VersionArtifact verArt = (VersionArtifact) ld.getResult()[0]; + Artifact verArt = (Artifact) ld.getResult()[0]; // Validate team lead status - if (!AtsUtil.isAtsAdmin() && !verArt.getParentTeamDefinition().getLeads().contains(UserManager.getUser())) { + if (!AtsUtil.isAtsAdmin() && !VersionManager.getParentTeamDefinition(verArt).getLeads().contains( + UserManager.getUser())) { AWorkbench.popup("ERROR", "Only lead can release version."); return; } // Validate that all Team Workflows are Completed or Cancelled String errorStr = null; - for (TeamWorkFlowArtifact team : verArt.getTargetedForTeamArtifacts()) { + for (TeamWorkFlowArtifact team : VersionManager.getTargetedForTeamArtifacts(verArt)) { if (!team.isCancelled() && !team.isCompleted()) { errorStr = "All Team Workflows must be either Completed or " + "Cancelled before releasing a version.\n\n" + team.getHumanReadableId() + " - is in the\"" + team.getStateMgr().getCurrentStateName() + "\" state."; @@ -92,7 +94,7 @@ public class ReleaseVersionItem extends XNavigateItemAction { verArt.setSoleAttributeValue(AtsAttributeTypes.Released, true); verArt.setSoleAttributeValue(AtsAttributeTypes.ReleaseDate, new Date()); - verArt.setNextVersion(false); + VersionManager.setNextVersion(verArt, false); verArt.persist(); if (MessageDialog.openQuestion(Displays.getActiveShell(), "Select NEW Next Release Version", @@ -102,8 +104,8 @@ public class ReleaseVersionItem extends XNavigateItemAction { teamDefHoldingVersions.getVersionsArtifacts()); result = ld.open(); if (result == 0) { - verArt = (VersionArtifact) ld.getResult()[0]; - verArt.setNextVersion(true); + verArt = (Artifact) ld.getResult()[0]; + VersionManager.setNextVersion(verArt, true); verArt.persist(); } } 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 0aacc0cb3ea..425834cc72c 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 @@ -18,7 +18,6 @@ import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.artifact.AbstractTaskableArtifact; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.widgets.ReviewManager; import org.eclipse.osee.ats.util.widgets.XHyperlabelTeamDefinitionSelection; @@ -287,7 +286,7 @@ public class TeamWorkflowSearchWorkflowSearchItem extends WorldEditorParameterSe } } - protected VersionArtifact getSelectedVersionArtifact() throws OseeCoreException { + protected Artifact getSelectedVersionArtifact() throws OseeCoreException { if (versionCombo == null) { return null; } @@ -301,7 +300,7 @@ public class TeamWorkflowSearchWorkflowSearchItem extends WorldEditorParameterSe if (teamDefHoldingVersions == null) { return null; } - for (VersionArtifact versionArtifact : teamDefHoldingVersions.getVersionsArtifacts()) { + for (Artifact versionArtifact : teamDefHoldingVersions.getVersionsArtifacts()) { if (versionArtifact.getName().equals(versionStr)) { return versionArtifact; } @@ -362,7 +361,7 @@ public class TeamWorkflowSearchWorkflowSearchItem extends WorldEditorParameterSe if (teamDefs.size() > 0) { selected = true; } - VersionArtifact verArt = getSelectedVersionArtifact(); + Artifact verArt = getSelectedVersionArtifact(); if (verArt != null) { selected = true; } @@ -393,7 +392,7 @@ public class TeamWorkflowSearchWorkflowSearchItem extends WorldEditorParameterSe } @Override - public VersionArtifact getTargetedVersionArtifact() throws OseeCoreException { + public Artifact getTargetedVersionArtifact() throws OseeCoreException { if (versionCombo == null) { return null; } 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 4b9046301a5..2d1c28cdde4 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,10 +17,9 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionLockedType; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.VersionLockedType; +import org.eclipse.osee.ats.util.VersionReleaseType; import org.eclipse.osee.ats.util.widgets.XHyperlabelTeamDefinitionSelection; import org.eclipse.osee.ats.util.widgets.XStateCombo; import org.eclipse.osee.ats.world.WorldEditor; @@ -393,7 +392,7 @@ public class UserSearchWorkflowSearchItem extends WorldEditorParameterSearchItem } } - private VersionArtifact getSelectedVersionArtifact() throws OseeCoreException { + private Artifact getSelectedVersionArtifact() throws OseeCoreException { if (versionCombo == null) { return null; } @@ -407,7 +406,7 @@ public class UserSearchWorkflowSearchItem extends WorldEditorParameterSearchItem if (teamDefHoldingVersions == null) { return null; } - for (VersionArtifact versionArtifact : teamDefHoldingVersions.getVersionsArtifacts(VersionReleaseType.Both, + for (Artifact versionArtifact : teamDefHoldingVersions.getVersionsArtifacts(VersionReleaseType.Both, VersionLockedType.Both)) { if (versionArtifact.getName().equals(versionStr)) { return versionArtifact; @@ -473,7 +472,7 @@ public class UserSearchWorkflowSearchItem extends WorldEditorParameterSearchItem } @Override - public VersionArtifact getTargetedVersionArtifact() throws OseeCoreException { + public Artifact getTargetedVersionArtifact() throws OseeCoreException { if (versionCombo == null) { return null; } 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 7821e4a13a7..52911fab43e 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 @@ -23,7 +23,6 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TaskArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.AtsMetricsComposite; @@ -320,7 +319,7 @@ public class TaskEditor extends AbstractArtifactEditor implements IActionable, I } @Override - public VersionArtifact getMetricsVersionArtifact() throws OseeCoreException { + public Artifact getMetricsVersionArtifact() throws OseeCoreException { for (TaskArtifact taskArt : tasks) { if (taskArt.getTargetedVersion() != null) { return taskArt.getTargetedVersion(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AWAUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AWAUtil.java index e43180eb55a..c03b0187b45 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AWAUtil.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AWAUtil.java @@ -17,7 +17,6 @@ import java.util.List; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.artifact.log.LogItem; import org.eclipse.osee.ats.column.CancelledDateColumn; import org.eclipse.osee.ats.column.ChangeTypeColumn; @@ -231,7 +230,7 @@ public class AWAUtil { return returnawas; } - public static Collection<AbstractWorkflowArtifact> getVersionWorkflows(Collection<? extends Artifact> artifacts, Collection<VersionArtifact> versionArts) throws OseeCoreException { + public static Collection<AbstractWorkflowArtifact> getVersionWorkflows(Collection<? extends Artifact> artifacts, Collection<Artifact> versionArts) throws OseeCoreException { List<AbstractWorkflowArtifact> returnawas = new ArrayList<AbstractWorkflowArtifact>(); for (AbstractWorkflowArtifact awa : getAwas(artifacts)) { if (awa.getParentTeamWorkflow() == null) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/ActionManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/ActionManager.java index 2b0bcdad073..ed3ecdc8a47 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/ActionManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/ActionManager.java @@ -229,10 +229,4 @@ public class ActionManager { return null; } - public static boolean isOfTypeAction(Object object) { - if (object instanceof Artifact) { - return ((Artifact) object).isOfType(AtsArtifactTypes.Action); - } - return false; - } } 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 4d8e1678810..520affa36b7 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 @@ -29,7 +29,7 @@ import org.eclipse.osee.ats.artifact.DecisionReviewArtifact; import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; +import org.eclipse.osee.ats.artifact.VersionCommitConfigArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.widgets.commit.CommitStatus; import org.eclipse.osee.ats.util.widgets.commit.ICommitConfigArtifact; @@ -59,6 +59,7 @@ import org.eclipse.osee.framework.plugin.core.util.IExceptionableRunnable; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.change.Change; import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal; @@ -363,15 +364,15 @@ public class AtsBranchManager { if (teamArt.getTargetedVersion() == null) { return new Result(false, "Workflow not targeted for Version"); } - Result result = teamArt.getTargetedVersion().isCreateBranchAllowed(); + Result result = VersionManager.isCreateBranchAllowed(teamArt.getTargetedVersion()); if (result.isFalse()) { return result; } - if (teamArt.getTargetedVersion().getParentBranch() == null) { + if (VersionManager.getParentBranch(teamArt.getTargetedVersion()) == null) { return new Result(false, "Parent Branch not configured for Version [" + teamArt.getTargetedVersion() + "]"); } - if (!teamArt.getTargetedVersion().getParentBranch().getBranchType().isBaselineBranch()) { + if (!VersionManager.getParentBranch(teamArt.getTargetedVersion()).getBranchType().isBaselineBranch()) { return new Result(false, "Parent Branch must be of Baseline branch type. See Admin for configuration."); } return Result.TrueResult; @@ -401,12 +402,12 @@ public class AtsBranchManager { if (teamArt.getTargetedVersion() == null) { return new Result(false, "Workflow not targeted for Version"); } - Result result = teamArt.getTargetedVersion().isCommitBranchAllowed(); + Result result = VersionManager.isCommitBranchAllowed(teamArt.getTargetedVersion()); if (result.isFalse()) { return result; } - if (teamArt.getTargetedVersion().getParentBranch() == null) { + if (VersionManager.getParentBranch(teamArt.getTargetedVersion()) == null) { return new Result(false, "Parent Branch not configured for Version [" + teamArt.getTargetedVersion() + "]"); } return Result.TrueResult; @@ -520,7 +521,7 @@ public class AtsBranchManager { Set<ICommitConfigArtifact> configObjects = new HashSet<ICommitConfigArtifact>(); if (teamArt.isTeamUsesVersions()) { if (teamArt.getTargetedVersion() != null) { - teamArt.getTargetedVersion().getParallelVersions(configObjects); + VersionManager.getParallelVersions(teamArt.getTargetedVersion(), configObjects); } } else { if (teamArt.isTeamWorkflow() && teamArt.getTeamDefinition().getParentBranch() != null) { @@ -533,7 +534,7 @@ public class AtsBranchManager { public ICommitConfigArtifact getParentBranchConfigArtifactConfiguredToCommitTo() throws OseeCoreException { if (teamArt.isTeamUsesVersions()) { if (teamArt.getTargetedVersion() != null) { - return teamArt.getTargetedVersion(); + return new VersionCommitConfigArtifact(teamArt.getTargetedVersion()); } } else { if (teamArt.isTeamWorkflow() && teamArt.getTeamDefinition().getParentBranch() != null) { @@ -561,8 +562,8 @@ public class AtsBranchManager { public Collection<Branch> getBranchesToCommitTo() throws OseeCoreException { Set<Branch> branches = new HashSet<Branch>(); for (Object obj : getConfigArtifactsConfiguredToCommitTo()) { - if (obj instanceof VersionArtifact && ((VersionArtifact) obj).getParentBranch() != null) { - branches.add(((VersionArtifact) obj).getParentBranch()); + if (obj instanceof VersionCommitConfigArtifact && ((VersionCommitConfigArtifact) obj).getParentBranch() != null) { + branches.add(((VersionCommitConfigArtifact) obj).getParentBranch()); } else if (obj instanceof TeamDefinitionArtifact && ((TeamDefinitionArtifact) obj).getParentBranch() != null) { branches.add(((TeamDefinitionArtifact) obj).getParentBranch()); } @@ -688,9 +689,9 @@ public class AtsBranchManager { // Check for parent branch id in Version artifact if (teamArt.isTeamUsesVersions()) { - VersionArtifact verArt = teamArt.getTargetedVersion(); + Artifact verArt = teamArt.getTargetedVersion(); if (verArt != null) { - parentBranch = verArt.getParentBranch(); + parentBranch = VersionManager.getParentBranch(verArt); } } 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 66a2a009938..729798f2842 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 @@ -29,7 +29,6 @@ import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.config.AtsCacheManager; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.operation.DuplicateWorkflowBlam.CreateTeamOption; @@ -186,7 +185,7 @@ public class ExcelAtsActionArtifactExtractor { } if (!aData.version.equals("")) { for (TeamWorkFlowArtifact team : newTeamArts) { - VersionArtifact verArt = + Artifact verArt = team.getTeamDefinition().getTeamDefinitionHoldingVersions().getVersionArtifact(aData.version, false); if (verArt == null) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/SMAMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/SMAMetrics.java index 38216d80c47..c69effad7a6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/SMAMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/SMAMetrics.java @@ -19,10 +19,10 @@ import java.util.List; import java.util.Set; import org.eclipse.osee.ats.artifact.AbstractReviewArtifact; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; +import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.GoalArtifact; import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.column.EstimatedHoursColumn; import org.eclipse.osee.ats.column.HoursSpentTotalColumn; import org.eclipse.osee.ats.column.PercentCompleteTotalColumn; @@ -48,7 +48,7 @@ public class SMAMetrics { Date estimatedReleaseDate; long daysTillRel = 0; - VersionArtifact versionArtifact = null; + Artifact versionArtifact = null; String str = ""; Set<TeamWorkFlowArtifact> teamArts = new HashSet<TeamWorkFlowArtifact>(); Set<Artifact> actionArts = new HashSet<Artifact>(); @@ -64,7 +64,7 @@ public class SMAMetrics { HashSet.class, 100); private final double manHoursPerDay; - public SMAMetrics(Collection<? extends Artifact> artifacts, VersionArtifact versionArtifact, double manHoursPerDay, Date estimatedReleaseDate) throws OseeCoreException { + public SMAMetrics(Collection<? extends Artifact> artifacts, Artifact versionArtifact, double manHoursPerDay, Date estimatedReleaseDate) throws OseeCoreException { this.manHoursPerDay = manHoursPerDay; this.versionArtifact = versionArtifact; this.estimatedReleaseDate = estimatedReleaseDate; @@ -132,7 +132,7 @@ public class SMAMetrics { Date today = new Date(); daysTillRel = 0; if (versionArtifact != null && estimatedReleaseDate == null) { - estimatedReleaseDate = versionArtifact.getEstimatedReleaseDate(); + estimatedReleaseDate = versionArtifact.getSoleAttributeValue(AtsAttributeTypes.EstimatedReleaseDate, null); } if (estimatedReleaseDate != null && estimatedReleaseDate.after(today)) { daysTillRel = DateUtil.getWorkingDaysBetween(today, estimatedReleaseDate); @@ -257,7 +257,7 @@ public class SMAMetrics { return str; } - public static String getEstRemainMetrics(Collection<? extends Artifact> awas, VersionArtifact versionArtifact, double manHoursPerDay, Date estimatedrelDate) throws OseeCoreException { + public static String getEstRemainMetrics(Collection<? extends Artifact> awas, Artifact versionArtifact, double manHoursPerDay, Date estimatedrelDate) throws OseeCoreException { return new SMAMetrics(awas, versionArtifact, manHoursPerDay, estimatedrelDate).str; } @@ -316,11 +316,11 @@ public class SMAMetrics { this.daysTillRel = daysTillRel; } - public VersionArtifact getVersionArtifact() { + public Artifact getVersionArtifact() { return versionArtifact; } - public void setVersionArtifact(VersionArtifact versionArtifact) { + public void setVersionArtifact(Artifact versionArtifact) { this.versionArtifact = versionArtifact; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionLockedType.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionLockedType.java new file mode 100644 index 00000000000..ca46e99442a --- /dev/null +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionLockedType.java @@ -0,0 +1,7 @@ +package org.eclipse.osee.ats.util; + +public enum VersionLockedType { + Locked, + UnLocked, + Both +}; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionManager.java new file mode 100644 index 00000000000..ffdbbb2acb0 --- /dev/null +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionManager.java @@ -0,0 +1,171 @@ +/* + * Created on Mar 7, 2011 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.ats.util; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.logging.Level; +import org.eclipse.osee.ats.artifact.AtsAttributeTypes; +import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; +import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.artifact.VersionCommitConfigArtifact; +import org.eclipse.osee.ats.config.AtsCacheManager; +import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.widgets.commit.ICommitConfigArtifact; +import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; +import org.eclipse.osee.framework.core.exception.BranchDoesNotExist; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.jdk.core.util.Collections; +import org.eclipse.osee.framework.jdk.core.util.GUID; +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.BranchManager; +import org.eclipse.osee.framework.ui.plugin.util.Result; + +public class VersionManager { + + public static TeamDefinitionArtifact getParentTeamDefinition(Artifact verArt) throws OseeCoreException { + return verArt.getRelatedArtifacts(AtsRelationTypes.TeamDefinitionToVersion_TeamDefinition, + TeamDefinitionArtifact.class).iterator().next(); + } + + public static void getParallelVersions(Artifact verArt, Set<ICommitConfigArtifact> configArts) throws OseeCoreException { + configArts.add(new VersionCommitConfigArtifact(verArt)); + for (Artifact childArt : verArt.getRelatedArtifacts(AtsRelationTypes.ParallelVersion_Child)) { + VersionManager.getParallelVersions(childArt, configArts); + } + } + + public static Collection<TeamWorkFlowArtifact> getTargetedForTeamArtifacts(Artifact verArt) throws OseeCoreException { + ensureVersionArtifact(verArt); + return verArt.getRelatedArtifacts(AtsRelationTypes.TeamWorkflowTargetedForVersion_Workflow, + TeamWorkFlowArtifact.class); + } + + public static void ensureVersionArtifact(Artifact verArt) throws OseeCoreException { + if (!verArt.isOfType(AtsArtifactTypes.Version)) { + throw new OseeArgumentException("Artifact should be Version not [%s]", verArt.getArtifactTypeName()); + } + } + + public static Boolean isVersionLocked(Artifact verArt) throws OseeCoreException { + ensureVersionArtifact(verArt); + return verArt.getSoleAttributeValue(AtsAttributeTypes.VersionLocked, false); + } + + public static void setVersionLocked(Artifact verArt, boolean locked) throws OseeCoreException { + ensureVersionArtifact(verArt); + verArt.setSoleAttributeValue(AtsAttributeTypes.VersionLocked, locked); + } + + public static Boolean isNextVersion(Artifact verArt) throws OseeCoreException { + ensureVersionArtifact(verArt); + return verArt.getSoleAttributeValue(AtsAttributeTypes.NextVersion, false); + } + + public static void setNextVersion(Artifact verArt, boolean nextVersion) throws OseeCoreException { + ensureVersionArtifact(verArt); + verArt.setSoleAttributeValue(AtsAttributeTypes.NextVersion, nextVersion); + } + + public static Boolean isReleased(Artifact verArt) throws OseeCoreException { + ensureVersionArtifact(verArt); + return verArt.getSoleAttributeValue(AtsAttributeTypes.Released, false); + } + + public static void setReleased(Artifact verArt, boolean released) throws OseeCoreException { + ensureVersionArtifact(verArt); + verArt.setSoleAttributeValue(AtsAttributeTypes.Released, released); + } + + public static TeamDefinitionArtifact getTeamDefinitionArtifact(Artifact verArt) throws OseeCoreException { + ensureVersionArtifact(verArt); + try { + return (TeamDefinitionArtifact) verArt.getRelatedArtifact(AtsRelationTypes.TeamDefinitionToVersion_TeamDefinition); + } catch (ArtifactDoesNotExist ex) { + return null; + } + } + + public static Branch getBaselineBranch(Artifact verArt) throws OseeCoreException { + ensureVersionArtifact(verArt); + String branchGuid = verArt.getSoleAttributeValue(AtsAttributeTypes.BaselineBranchGuid, ""); + if (Strings.isValid(branchGuid)) { + return BranchManager.getBranchByGuid(branchGuid); + } else { + return getTeamDefinitionArtifact(verArt).getTeamBranch(); + } + } + + public static Set<Artifact> getVersions(Collection<String> teamDefNames) { + Set<Artifact> teamDefs = new HashSet<Artifact>(); + for (String teamDefName : teamDefNames) { + teamDefs.add(getSoleVersion(teamDefName)); + } + return teamDefs; + } + + /** + * Refrain from using this method as Version Artifact names can be changed by the user. + */ + public static Artifact getSoleVersion(String name) { + return AtsCacheManager.getArtifactsByName(AtsArtifactTypes.Version, name).iterator().next(); + } + + public static Result isCreateBranchAllowed(Artifact verArt) throws OseeCoreException { + if (!verArt.getSoleAttributeValue(AtsAttributeTypes.AllowCreateBranch, false)) { + return new Result(false, "Branch creation disabled for Version [" + verArt + "]"); + } + if (getParentBranch(verArt) == null) { + return new Result(false, "Parent Branch not configured for Version [" + verArt + "]"); + } + return Result.TrueResult; + } + + public static Result isCommitBranchAllowed(Artifact verArt) throws OseeCoreException { + if (!verArt.getSoleAttributeValue(AtsAttributeTypes.AllowCommitBranch, false)) { + return new Result(false, "Version [" + verArt + "] not configured to allow branch commit."); + } + if (getParentBranch(verArt) == null) { + return new Result(false, "Parent Branch not configured for Version [" + verArt + "]"); + } + return Result.TrueResult; + } + + public static Branch getParentBranch(Artifact verArt) throws OseeCoreException { + try { + String guid = verArt.getSoleAttributeValue(AtsAttributeTypes.BaselineBranchGuid, ""); + if (GUID.isValid(guid)) { + return BranchManager.getBranchByGuid(guid); + } + } catch (BranchDoesNotExist ex) { + OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); + } + return null; + } + + public static String getFullDisplayName(Artifact verArt) throws OseeCoreException { + List<String> strs = new ArrayList<String>(); + if (!verArt.getName().equals(Artifact.UNNAMED)) { + strs.add(verArt.getName()); + } + String fullName = verArt.getSoleAttributeValue(AtsAttributeTypes.FullName, ""); + if (Strings.isValid(fullName)) { + strs.add(fullName); + } + String description = verArt.getSoleAttributeValue(AtsAttributeTypes.Description, ""); + if (Strings.isValid(description)) { + strs.add(description); + } + return Collections.toString(" - ", strs); + } +} diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionMetrics.java index c0e53a115f8..c252a9bcda0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionMetrics.java @@ -17,13 +17,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.logging.Level; +import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.column.ChangeTypeColumn; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.util.ChangeType; /** @@ -31,10 +32,10 @@ import org.eclipse.osee.framework.ui.skynet.util.ChangeType; */ public class VersionMetrics { - private final VersionArtifact verArt; + private final Artifact verArt; private final VersionTeamMetrics verTeamMet; - public VersionMetrics(VersionArtifact verArt, VersionTeamMetrics verTeamMet) { + public VersionMetrics(Artifact verArt, VersionTeamMetrics verTeamMet) { this.verArt = verArt; this.verTeamMet = verTeamMet; } @@ -45,7 +46,7 @@ public class VersionMetrics { sb.append("\n"); try { sb.append("Workflows: "); - sb.append(verArt.getTargetedForTeamArtifacts().size()); + sb.append(VersionManager.getTargetedForTeamArtifacts(verArt).size()); sb.append(" Problem: "); sb.append(getTeamWorkFlows(ChangeType.Problem).size()); sb.append(" Improve: "); @@ -53,7 +54,7 @@ public class VersionMetrics { sb.append(" Support: "); sb.append(getTeamWorkFlows(ChangeType.Support).size()); sb.append(" Release Date: "); - sb.append(verArt.getReleaseDate()); + sb.append(verArt.getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null)); VersionMetrics prevVerMet = getPreviousVerMetViaReleaseDate(); if (prevVerMet == null) { sb.append(" Prev Release Version: <not found>"); @@ -61,7 +62,7 @@ public class VersionMetrics { sb.append(" Prev Release Version \""); sb.append(prevVerMet); sb.append("\" Release Date: "); - sb.append(verArt.getReleaseDate()); + sb.append(verArt.getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null)); } sb.append(" Start Date: "); sb.append(getReleaseStartDate()); @@ -78,10 +79,11 @@ public class VersionMetrics { if (startDate == null) { return null; } - if (verArt.getReleaseDate() == null) { + Date relDate = verArt.getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null); + if (relDate == null) { return null; } - return DateUtil.getDifference(startDate, verArt.getReleaseDate()); + return DateUtil.getDifference(startDate, relDate); } public Date getReleaseStartDate() throws OseeCoreException { @@ -89,13 +91,14 @@ public class VersionMetrics { if (prevVerMet == null) { return null; } - return prevVerMet.getVerArt().getReleaseDate(); + Date relDate = prevVerMet.getVerArt().getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null); + return relDate; } public Collection<TeamWorkFlowArtifact> getTeamWorkFlows(ChangeType... changeType) throws OseeCoreException { List<ChangeType> changeTypes = Arrays.asList(changeType); Set<TeamWorkFlowArtifact> teams = new HashSet<TeamWorkFlowArtifact>(); - for (TeamWorkFlowArtifact team : verArt.getTargetedForTeamArtifacts()) { + for (TeamWorkFlowArtifact team : VersionManager.getTargetedForTeamArtifacts(verArt)) { if (changeTypes.contains(ChangeTypeColumn.getChangeType(team))) { teams.add(team); } @@ -104,7 +107,7 @@ public class VersionMetrics { } public VersionMetrics getPreviousVerMetViaReleaseDate() throws OseeCoreException { - if (verArt.getReleaseDate() == null) { + if (verArt.getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null) == null) { return null; } int index = verTeamMet.getReleasedOrderedVersions().indexOf(this); @@ -115,7 +118,7 @@ public class VersionMetrics { } public VersionMetrics getNextVerMetViaReleaseDate() throws OseeCoreException { - if (verArt.getReleaseDate() == null) { + if (verArt.getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null) == null) { return null; } int index = verTeamMet.getReleasedOrderedVersions().indexOf(this); @@ -125,16 +128,10 @@ public class VersionMetrics { return null; } - /** - * @return the verArt - */ - public VersionArtifact getVerArt() { + public Artifact getVerArt() { return verArt; } - /** - * @return the verTeamMet - */ public VersionTeamMetrics getVerTeamMet() { return verTeamMet; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionReleaseType.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionReleaseType.java new file mode 100644 index 00000000000..30059a16fc8 --- /dev/null +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionReleaseType.java @@ -0,0 +1,7 @@ +package org.eclipse.osee.ats.util; + +public enum VersionReleaseType { + Released, + UnReleased, + Both +}; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionReportJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionReportJob.java index 13c1d050d81..588d095eee1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionReportJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionReportJob.java @@ -25,13 +25,13 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.column.ChangeTypeColumn; import org.eclipse.osee.ats.column.PriorityColumn; import org.eclipse.osee.ats.internal.AtsPlugin; 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.DateUtil; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage; @@ -43,9 +43,9 @@ import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulatio public class VersionReportJob extends Job { protected final String title; - protected final VersionArtifact verArt; + protected final Artifact verArt; - public VersionReportJob(String title, VersionArtifact verArt) { + public VersionReportJob(String title, Artifact verArt) { super("Creating Release Report"); this.title = title; this.verArt = verArt; @@ -63,25 +63,27 @@ public class VersionReportJob extends Job { return Status.OK_STATUS; } - public static String getReleaseReportHtml(String title, VersionArtifact verArt, IProgressMonitor monitor) throws OseeCoreException { + public static String getReleaseReportHtml(String title, Artifact verArt, IProgressMonitor monitor) throws OseeCoreException { if (verArt == null) { AWorkbench.popup("ERROR", "Must select product, config and version."); return null; } StringBuilder sb = new StringBuilder(); sb.append(AHTML.heading(3, title + getReleasedString(verArt), verArt.getName())); - sb.append(getTeamWorkflowReport(verArt.getTargetedForTeamArtifacts(), null, monitor)); + sb.append(getTeamWorkflowReport(VersionManager.getTargetedForTeamArtifacts(verArt), null, monitor)); return sb.toString(); } public static String getFullReleaseReport(TeamDefinitionArtifact teamDef, IProgressMonitor monitor) throws OseeCoreException { // Sort by release date and estimated release date - Map<String, VersionArtifact> dateToVerArt = new HashMap<String, VersionArtifact>(); - for (VersionArtifact verArt : teamDef.getVersionsArtifacts()) { - if (verArt.getReleaseDate() != null) { - dateToVerArt.put(verArt.getReleaseDate().getTime() + verArt.getName(), verArt); - } else if (verArt.getEstimatedReleaseDate() != null) { - dateToVerArt.put(verArt.getEstimatedReleaseDate().getTime() + verArt.getName(), verArt); + Map<String, Artifact> dateToVerArt = new HashMap<String, Artifact>(); + for (Artifact verArt : teamDef.getVersionsArtifacts()) { + Date estRelDate = verArt.getSoleAttributeValue(AtsAttributeTypes.EstimatedReleaseDate, null); + Date relDate = verArt.getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null); + if (relDate != null) { + dateToVerArt.put(relDate.getTime() + verArt.getName(), verArt); + } else if (estRelDate != null) { + dateToVerArt.put(estRelDate.getTime() + verArt.getName(), verArt); } else { dateToVerArt.put("Un-Released - No Estimated Release " + verArt.getName(), verArt); } @@ -93,15 +95,16 @@ public class VersionReportJob extends Job { sb.append(AHTML.heading(2, teamDef + " Releases")); sb.append(AHTML.bold("Report generated by OSEE ATS on " + DateUtil.getDateNow()) + AHTML.newline(2)); for (int x = dateSort.length - 1; x >= 0; x--) { - VersionArtifact verArt = dateToVerArt.get(dateSort[x]); - if (verArt.isNextVersion() || verArt.isReleased()) { + Artifact verArt = dateToVerArt.get(dateSort[x]); + Date estRelDate = verArt.getSoleAttributeValue(AtsAttributeTypes.EstimatedReleaseDate, null); + if (VersionManager.isNextVersion(verArt) || VersionManager.isReleased(verArt)) { sb.append(AHTML.getHyperlink("#" + verArt.getName(), verArt.getName() + VersionReportJob.getReleasedString(verArt))); sb.append(AHTML.newline()); - } else if (verArt.getEstimatedReleaseDate() != null) { + } else if (estRelDate != null) { sb.append(verArt.getName()); sb.append(" - Un-Released - Estimated Release Date: "); - sb.append(getDateString(verArt.getEstimatedReleaseDate())); + sb.append(getDateString(estRelDate)); sb.append(AHTML.newline()); } else { sb.append(verArt.getName()); @@ -111,12 +114,12 @@ public class VersionReportJob extends Job { } sb.append(AHTML.addSpace(5)); int x = 1; - for (VersionArtifact verArt : teamDef.getVersionsArtifacts()) { + for (Artifact verArt : teamDef.getVersionsArtifacts()) { if (monitor != null) { String str = "Processing version " + x++ + "/" + teamDef.getVersionsArtifacts().size(); monitor.subTask(str); } - if (verArt.isReleased() || verArt.isNextVersion()) { + if (VersionManager.isReleased(verArt) || VersionManager.isNextVersion(verArt)) { String html = VersionReportJob.getReleaseReportHtml(verArt.getName(), verArt, null); sb.append(html); } @@ -131,14 +134,15 @@ public class VersionReportJob extends Job { return null; } - public static String getReleasedString(VersionArtifact verArt) throws OseeCoreException { + public static String getReleasedString(Artifact verArt) throws OseeCoreException { String released = ""; - if (verArt.isReleased() && verArt.getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null) != null) { + if (VersionManager.isReleased(verArt) && verArt.getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null) != null) { released = " - " + "Released: " + getDateString(verArt.getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, (Date) null)); } - if (verArt.isNextVersion() && verArt.getSoleAttributeValue(AtsAttributeTypes.EstimatedReleaseDate, null) != null) { + if (VersionManager.isNextVersion(verArt) && verArt.getSoleAttributeValue(AtsAttributeTypes.EstimatedReleaseDate, + null) != null) { released = " - " + "Next Release - Estimated Release Date: " + getDateString(verArt.getSoleAttributeValue( AtsAttributeTypes.EstimatedReleaseDate, (Date) null)); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionTeamMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionTeamMetrics.java index cabeaac8b68..4488c376f2c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionTeamMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/VersionTeamMetrics.java @@ -20,11 +20,12 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; /** @@ -59,8 +60,8 @@ public class VersionTeamMetrics { public Collection<TeamWorkFlowArtifact> getWorkflowsOriginatedBetween(Date startDate, Date endDate) throws OseeCoreException { if (teamWorkflowToOrigDate == null) { teamWorkflowToOrigDate = new HashMap<TeamWorkFlowArtifact, Date>(); - for (VersionArtifact verArt : verTeamDef.getVersionsArtifacts()) { - for (TeamWorkFlowArtifact team : verArt.getTargetedForTeamArtifacts()) { + for (Artifact verArt : verTeamDef.getVersionsArtifacts()) { + for (TeamWorkFlowArtifact team : VersionManager.getTargetedForTeamArtifacts(verArt)) { Date origDate = team.getCreatedDate(); teamWorkflowToOrigDate.put(team, origDate); } @@ -76,10 +77,11 @@ public class VersionTeamMetrics { } private void orderReleasedVersions() throws OseeCoreException { - for (VersionArtifact ver : verTeamDef.getVersionsArtifacts()) { - VersionMetrics verMet = new VersionMetrics(ver, this); - if (ver.getReleaseDate() != null) { - relDateToVerMet.put(ver.getReleaseDate(), verMet); + for (Artifact verArt : verTeamDef.getVersionsArtifacts()) { + VersionMetrics verMet = new VersionMetrics(verArt, this); + Date relDate = verArt.getSoleAttributeValue(AtsAttributeTypes.ReleaseDate, null); + if (relDate != null) { + relDateToVerMet.put(relDate, verMet); } verMets.add(verMet); } 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 3c67b2232d3..faf4b921c5e 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 @@ -15,7 +15,7 @@ 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.artifact.TeamDefinitionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; +import org.eclipse.osee.ats.artifact.VersionCommitConfigArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; @@ -133,7 +133,7 @@ public class XCommitLabelProvider extends XViewerLabelProvider { } private String handleDestBranchColumn(Object element, Branch branch) { - if (element instanceof VersionArtifact) { + if (element instanceof VersionCommitConfigArtifact) { return branch == null ? "Parent Branch Not Configured for Version [" + element + "]" : branch.getShortName(); } else if (element instanceof TeamDefinitionArtifact) { return branch == null ? "Parent Branch Not Configured for Team Definition [" + element + "]" : branch.getShortName(); 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 13925328f5b..5317fe145eb 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 @@ -18,10 +18,10 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionLockedType; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; +import org.eclipse.osee.ats.artifact.VersionCommitConfigArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.VersionLockedType; +import org.eclipse.osee.ats.util.VersionReleaseType; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -41,7 +41,7 @@ import org.eclipse.swt.widgets.Control; public class ActionTeamVersionListDialog extends ActionTeamListDialog { XListViewer versionList = new XListViewer("Version"); - VersionArtifact selectedVersion = null; + VersionCommitConfigArtifact selectedVersion = null; public ActionTeamVersionListDialog(Active active) { super(active); @@ -92,7 +92,7 @@ public class ActionTeamVersionListDialog extends ActionTeamListDialog { if (versionList.getSelected().isEmpty()) { selectedVersion = null; } else { - selectedVersion = (VersionArtifact) versionList.getSelected().iterator().next(); + selectedVersion = (VersionCommitConfigArtifact) versionList.getSelected().iterator().next(); } }; }); @@ -103,7 +103,7 @@ public class ActionTeamVersionListDialog extends ActionTeamListDialog { /** * @return the selectedVersion */ - public VersionArtifact getSelectedVersion() { + public VersionCommitConfigArtifact getSelectedVersion() { return selectedVersion; } 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 8f29045233a..199c250f441 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 @@ -13,10 +13,9 @@ package org.eclipse.osee.ats.util.widgets.dialog; import java.util.ArrayList; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionLockedType; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.VersionLockedType; +import org.eclipse.osee.ats.util.VersionReleaseType; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -41,7 +40,7 @@ public class TeamVersionListDialog extends SelectionDialog { XComboViewer teamCombo = new XComboViewer("Team", SWT.READ_ONLY); XComboViewer versionCombo = new XComboViewer("Version", SWT.READ_ONLY); - VersionArtifact selectedVersion = null; + Artifact selectedVersion = null; TeamDefinitionArtifact selectedTeamDef = null; private final Active active; private final TeamDefinitionArtifact teamDef; @@ -125,7 +124,7 @@ public class TeamVersionListDialog extends SelectionDialog { @Override public void widgetSelected(SelectionEvent e) { - selectedVersion = (VersionArtifact) versionCombo.getSelected(); + selectedVersion = (Artifact) versionCombo.getSelected(); }; }); if (teamDef != null) { @@ -143,7 +142,7 @@ public class TeamVersionListDialog extends SelectionDialog { return container; } - public VersionArtifact getSelectedVersion() { + public Artifact getSelectedVersion() { return selectedVersion; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionArtifactLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionArtifactLabelProvider.java index b0042373ae9..426ebb14968 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionArtifactLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/VersionArtifactLabelProvider.java @@ -10,12 +10,17 @@ *******************************************************************************/ package org.eclipse.osee.ats.util.widgets.dialog; +import java.util.Date; import java.util.logging.Level; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.osee.ats.artifact.VersionArtifact; +import org.eclipse.osee.ats.artifact.AtsAttributeTypes; +import org.eclipse.osee.ats.artifact.VersionCommitConfigArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.framework.jdk.core.util.DateUtil; 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; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; import org.eclipse.swt.graphics.Image; @@ -26,12 +31,14 @@ public class VersionArtifactLabelProvider extends LabelProvider { @Override public String getText(Object element) { - if (element instanceof VersionArtifact) { - VersionArtifact verArt = (VersionArtifact) element; + if (element instanceof VersionCommitConfigArtifact) { + Artifact verArt = (Artifact) element; String str = verArt.getName(); try { - if (verArt.getEstimatedReleaseDate() != null) { - str += " - Estimated Release: " + DateUtil.getMMDDYY(verArt.getEstimatedReleaseDate()); + if (verArt.getSoleAttributeValue(AtsAttributeTypes.EstimatedReleaseDate, null) != null) { + str += + " - Estimated Release: " + DateUtil.getMMDDYY((Date) verArt.getSoleAttributeValue( + AtsAttributeTypes.EstimatedReleaseDate, null)); } } catch (Exception ex) { OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); @@ -43,8 +50,8 @@ public class VersionArtifactLabelProvider extends LabelProvider { @Override public Image getImage(Object element) { - if (element instanceof VersionArtifact) { - return ArtifactImageManager.getImage((VersionArtifact) element); + if (Artifacts.isOfType(element, AtsArtifactTypes.Version)) { + return ArtifactImageManager.getImage((Artifact) element); } return null; } 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 9d7ce73591b..62a6d153715 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 @@ -12,7 +12,8 @@ package org.eclipse.osee.ats.util.widgets.dialog; import java.util.Collection; import org.eclipse.jface.viewers.ArrayContentProvider; -import org.eclipse.osee.ats.artifact.VersionArtifact; +import org.eclipse.osee.ats.artifact.VersionCommitConfigArtifact; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameReverseSorter; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.widgets.Composite; @@ -23,7 +24,7 @@ import org.eclipse.swt.widgets.Control; */ public class VersionListDialog extends org.eclipse.ui.dialogs.ListDialog { - public VersionListDialog(String title, String message, Collection<VersionArtifact> verArts) { + public VersionListDialog(String title, String message, Collection<Artifact> verArts) { super(Displays.getActiveShell()); this.setTitle(title); this.setMessage(message); @@ -33,7 +34,7 @@ public class VersionListDialog extends org.eclipse.ui.dialogs.ListDialog { public Object[] getElements(Object inputElement) { if (inputElement instanceof Collection) { Collection list = (Collection) inputElement; - return list.toArray(new VersionArtifact[list.size()]); + return list.toArray(new VersionCommitConfigArtifact[list.size()]); } return super.getElements(inputElement); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsAttributeValueColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsAttributeValueColumn.java index 9a5656894c8..74ff2b262bc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsAttributeValueColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsAttributeValueColumn.java @@ -28,6 +28,7 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; @@ -74,7 +75,7 @@ public class XViewerAtsAttributeValueColumn extends XViewerAtsAttributeColumn im if (element instanceof AbstractWorkflowArtifact) { return ((AbstractWorkflowArtifact) element).getAttributesToStringUnique(getAttributeType(), ";"); } - if (ActionManager.isOfTypeAction(element)) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { Set<String> strs = new HashSet<String>(); for (TeamWorkFlowArtifact team : ActionManager.getTeams(element)) { String str = getColumnText(team, column, columnIndex); 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 2b91a1bc7cb..a98d4e42a4b 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 @@ -10,7 +10,6 @@ import java.util.Map; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.dsl.atsDsl.ActionableItemDef; import org.eclipse.osee.ats.dsl.atsDsl.AtsDsl; import org.eclipse.osee.ats.dsl.atsDsl.BooleanDef; @@ -128,7 +127,7 @@ public class ConvertAIsAndTeamsToAtsDsl { if (match.isMatched()) { dslTeamDef.setWorkDefinition(match.getWorkFlowDefinition().getName()); } - for (VersionArtifact verArt : teamDef.getVersionsArtifacts()) { + for (Artifact verArt : teamDef.getVersionsArtifacts()) { convertVersionArtifact(dslTeamDef, verArt, teamDef); } // process children @@ -138,7 +137,7 @@ public class ConvertAIsAndTeamsToAtsDsl { return dslTeamDef; } - private void convertVersionArtifact(TeamDef dslTeamDef, VersionArtifact art, TeamDefinitionArtifact teamDef) throws OseeCoreException { + private void convertVersionArtifact(TeamDef dslTeamDef, Artifact art, TeamDefinitionArtifact teamDef) throws OseeCoreException { VersionDef dslVerDef = AtsDslFactoryImpl.init().createVersionDef(); dslVerDef.setName(art.getName()); if (art.getSoleAttributeValue(AtsAttributeTypes.Active, false)) { 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 6cbb4f2725f..2a5359d8e3c 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 @@ -19,7 +19,6 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.column.PercentCompleteTotalColumn; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.SMAMetrics; @@ -132,8 +131,10 @@ public class AtsMetricsComposite extends ScrolledComposite { addSpace(); try { - if (estimatedReleaseXDate.getDate() == null && iAtsMetricsProvider.getMetricsVersionArtifact() != null && iAtsMetricsProvider.getMetricsVersionArtifact().getEstimatedReleaseDate() != null) { - estimatedReleaseXDate.setDate(iAtsMetricsProvider.getMetricsVersionArtifact().getEstimatedReleaseDate()); + if (estimatedReleaseXDate.getDate() == null && iAtsMetricsProvider.getMetricsVersionArtifact() != null && iAtsMetricsProvider.getMetricsVersionArtifact().getSoleAttributeValue( + AtsAttributeTypes.EstimatedReleaseDate, null) != null) { + estimatedReleaseXDate.setDate((Date) iAtsMetricsProvider.getMetricsVersionArtifact().getSoleAttributeValue( + AtsAttributeTypes.EstimatedReleaseDate, null)); } } catch (OseeCoreException ex) { OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); @@ -157,14 +158,18 @@ public class AtsMetricsComposite extends ScrolledComposite { return estimatedReleaseXDate.getDate(); } if (iAtsMetricsProvider.getMetricsVersionArtifact() != null) { - return iAtsMetricsProvider.getMetricsVersionArtifact().getEstimatedReleaseDate(); + return iAtsMetricsProvider.getMetricsVersionArtifact().getSoleAttributeValue( + AtsAttributeTypes.EstimatedReleaseDate, null); } // Try to find an estimated release date from one of the workflows for (Artifact art : iAtsMetricsProvider.getMetricsArtifacts()) { if (art instanceof TeamWorkFlowArtifact) { - VersionArtifact verArt = ((TeamWorkFlowArtifact) art).getTargetedVersion(); - if (verArt != null && verArt.getEstimatedReleaseDate() != null) { - return verArt.getEstimatedReleaseDate(); + Artifact verArt = ((TeamWorkFlowArtifact) art).getTargetedVersion(); + if (verArt != null) { + Date estRelDate = verArt.getSoleAttributeValue(AtsAttributeTypes.EstimatedReleaseDate, null); + if (estRelDate != null) { + return estRelDate; + } } } } 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 1a78764ab20..5f08ae6bf64 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,6 @@ package org.eclipse.osee.ats.world; import java.util.Collection; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -22,7 +21,7 @@ public interface IAtsMetricsProvider { public Collection<? extends Artifact> getMetricsArtifacts() throws OseeCoreException; - public VersionArtifact getMetricsVersionArtifact() throws OseeCoreException; + public Artifact getMetricsVersionArtifact() throws OseeCoreException; public double getManHoursPerDayPreference() throws OseeCoreException; } 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 3229a0525bb..0813d666d13 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,10 +11,10 @@ package org.eclipse.osee.ats.world; import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData; -import org.eclipse.osee.ats.artifact.VersionArtifact; 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; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; /** @@ -28,7 +28,7 @@ public interface IWorldEditorProvider { public String getName() throws OseeCoreException; - public VersionArtifact getTargetedVersionArtifact() throws OseeCoreException; + public Artifact getTargetedVersionArtifact() throws OseeCoreException; public IWorldEditorProvider copyProvider() throws OseeArgumentException; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldContentProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldContentProvider.java index d7440430685..5d3228382be 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldContentProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldContentProvider.java @@ -35,6 +35,7 @@ import org.eclipse.osee.framework.core.enums.DeletionFlag; 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; import org.eclipse.osee.framework.ui.swt.Displays; public class WorldContentProvider implements ITreeContentProvider { @@ -145,7 +146,7 @@ public class WorldContentProvider implements ITreeContentProvider { if (((Artifact) element).isDeleted()) { return false; } - if (ActionManager.isOfTypeAction(element)) { + if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) { return true; } if (element instanceof AbstractWorkflowArtifact) { 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 ab64ad4b341..0f0cb2e4b16 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 @@ -17,7 +17,6 @@ import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.Action; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.help.ui.AtsHelpContext; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsUtil; @@ -220,8 +219,8 @@ public class WorldEditor extends FormEditor implements IWorldEditor, IDirtiableE } @Override - public VersionArtifact getMetricsVersionArtifact() throws OseeCoreException { - VersionArtifact verArt = getWorldEditorProvider().getTargetedVersionArtifact(); + public Artifact getMetricsVersionArtifact() throws OseeCoreException { + Artifact verArt = getWorldEditorProvider().getTargetedVersionArtifact(); if (verArt != null) { return verArt; } 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 0cd0b6797d0..24bf191cd7f 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,9 +11,9 @@ package org.eclipse.osee.ats.world; import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; /** @@ -36,7 +36,7 @@ public abstract class WorldEditorProvider implements IWorldEditorProvider { @SuppressWarnings("unused") @Override - public VersionArtifact getTargetedVersionArtifact() throws OseeCoreException { + public Artifact getTargetedVersionArtifact() throws OseeCoreException { return null; } 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 386185669c0..bdc7a8519cf 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,6 @@ 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.artifact.VersionArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.world.search.NextVersionSearchItem; import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem; @@ -149,7 +148,7 @@ public class WorldEditorUISearchItemProvider extends WorldEditorProvider { } @Override - public VersionArtifact getTargetedVersionArtifact() { + public Artifact getTargetedVersionArtifact() { if (worldUISearchItem instanceof VersionTargetedForTeamSearchItem) { return ((VersionTargetedForTeamSearchItem) worldUISearchItem).getSearchVersionArtifact(); } else if (worldUISearchItem instanceof NextVersionSearchItem) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java index 40a0295c245..1a5f0665522 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java @@ -63,6 +63,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact; import org.eclipse.osee.framework.skynet.core.artifact.ISelectedArtifacts; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.ArtifactDoubleClick; import org.eclipse.osee.framework.ui.skynet.OpenContributionItem; @@ -267,7 +268,7 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IPer return false; } for (TreeItem item : treeItems) { - if (ActionManager.isOfTypeAction(item.getData())) { + if (Artifacts.isOfType(item.getData(), AtsArtifactTypes.Action)) { return false; } try { @@ -457,7 +458,7 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IPer TreeItem items[] = getTree().getSelection(); if (items.length > 0) { for (TreeItem item : items) { - if (ActionManager.isOfTypeAction(item.getData())) { + if (Artifacts.isOfType(item.getData(), AtsArtifactTypes.Action)) { try { if (ActionManager.getTeams(item.getData()).size() != 1) { return false; @@ -485,7 +486,7 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IPer if (item.getData() instanceof TeamWorkFlowArtifact) { teamArts.add((TeamWorkFlowArtifact) item.getData()); } - if (ActionManager.isOfTypeAction(item.getData())) { + if (Artifacts.isOfType(item.getData(), AtsArtifactTypes.Action)) { try { if (ActionManager.getTeams(item.getData()).size() == 1) { teamArts.addAll(ActionManager.getTeams(item.getData())); @@ -511,7 +512,7 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IPer Object obj = i.next(); if (obj instanceof AbstractWorkflowArtifact) { smaArts.add((AbstractWorkflowArtifact) obj); - } else if (ActionManager.isOfTypeAction(obj)) { + } else if (Artifacts.isOfType(obj, AtsArtifactTypes.Action)) { smaArts.addAll(ActionManager.getTeams(obj)); } } @@ -526,7 +527,7 @@ public class WorldXViewer extends XViewer implements ISelectedAtsArtifacts, IPer TreeItem items[] = getTree().getSelection(); if (items.length > 0) { for (TreeItem item : items) { - if (ActionManager.isOfTypeAction(item.getData())) { + if (Artifacts.isOfType(item.getData(), AtsArtifactTypes.Action)) { actionArts.add((Artifact) item.getData()); } } 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 c90bccfa97a..7874ab4ffcd 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,7 +15,6 @@ import java.util.Collection; import java.util.List; import java.util.logging.Level; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; @@ -34,7 +33,7 @@ public class NextVersionSearchItem extends WorldUISearchItem { private final TeamDefinitionArtifact teamDefHoldingVersions; private TeamDefinitionArtifact selectedTeamDef; - private VersionArtifact selectedVersionArt; + private Artifact selectedVersionArt; public NextVersionSearchItem(TeamDefinitionArtifact teamDefHoldingVersions, LoadView loadView) { this(null, teamDefHoldingVersions, loadView); @@ -133,7 +132,7 @@ public class NextVersionSearchItem extends WorldUISearchItem { /** * @return the selectedVersionArt */ - public VersionArtifact getSelectedVersionArt() { + public Artifact getSelectedVersionArt() { return selectedVersionArt; } 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 84f0331b639..fcccf5e7dd9 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 @@ -21,9 +21,6 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionLockedType; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.task.ITaskEditorProvider; import org.eclipse.osee.ats.task.TaskEditor; @@ -31,6 +28,8 @@ import org.eclipse.osee.ats.task.TaskEditorParameterSearchItem; import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.AtsUtil; +import org.eclipse.osee.ats.util.VersionLockedType; +import org.eclipse.osee.ats.util.VersionReleaseType; import org.eclipse.osee.ats.util.widgets.XHyperlabelTeamDefinitionSelection; import org.eclipse.osee.ats.util.widgets.XStateCombo; import org.eclipse.osee.ats.world.search.TeamWorldSearchItem.ReleasedOption; @@ -104,7 +103,7 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem { public Collection<? extends Artifact> getTaskEditorTaskArtifacts() throws OseeCoreException { List<Artifact> workflows = new ArrayList<Artifact>(); Collection<TeamDefinitionArtifact> teamDefs = getSelectedTeamDefinitions(); - VersionArtifact verArt = getSelectedVersionArtifact(); + Artifact verArt = getSelectedVersionArtifact(); Collection<Artifact> groups = getSelectedGroups(); User user = getSelectedUser(); @@ -387,7 +386,7 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem { return stateCombo.getSelectedState(); } - private VersionArtifact getSelectedVersionArtifact() throws OseeCoreException { + private Artifact getSelectedVersionArtifact() throws OseeCoreException { if (versionCombo == null) { return null; } @@ -401,7 +400,7 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem { if (teamDefHoldingVersions == null) { return null; } - for (VersionArtifact versionArtifact : teamDefHoldingVersions.getVersionsArtifacts(VersionReleaseType.Both, + for (Artifact versionArtifact : teamDefHoldingVersions.getVersionsArtifacts(VersionReleaseType.Both, VersionLockedType.Both)) { if (versionArtifact.getName().equals(versionStr)) { return versionArtifact; 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 06958bbbbab..4b26d4f87f5 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 @@ -22,14 +22,14 @@ import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.config.AtsCacheManager; import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.AWAUtil; import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.AWAUtil; import org.eclipse.osee.ats.util.TeamState; +import org.eclipse.osee.ats.util.VersionManager; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist; import org.eclipse.osee.framework.logging.OseeLog; @@ -60,13 +60,13 @@ public class TeamWorldSearchItem extends WorldUISearchItem { private boolean showAction; private final Collection<String> teamDefNames; private final ChangeType changeType; - private final VersionArtifact versionArt; + private final Artifact versionArt; private final User userArt; private final ReleasedOption releasedOption; private final boolean includeCancelled; private final String stateName; - public TeamWorldSearchItem(String displayName, List<String> teamDefNames, boolean includeCompleted, boolean includeCancelled, boolean showAction, boolean recurseChildren, ChangeType changeType, VersionArtifact versionArt, User userArt, ReleasedOption releasedOption, String stateName) { + public TeamWorldSearchItem(String displayName, List<String> teamDefNames, boolean includeCompleted, boolean includeCancelled, boolean showAction, boolean recurseChildren, ChangeType changeType, Artifact versionArt, User userArt, ReleasedOption releasedOption, String stateName) { super(displayName, AtsImage.TEAM_WORKFLOW); this.includeCancelled = includeCancelled; this.versionArt = versionArt; @@ -80,7 +80,7 @@ public class TeamWorldSearchItem extends WorldUISearchItem { this.stateName = stateName; } - public TeamWorldSearchItem(String displayName, Collection<TeamDefinitionArtifact> teamDefs, boolean includeCompleted, boolean includeCancelled, boolean showAction, boolean recurseChildren, VersionArtifact versionArt, User userArt, ReleasedOption releasedOption, String stateName) { + public TeamWorldSearchItem(String displayName, Collection<TeamDefinitionArtifact> teamDefs, boolean includeCompleted, boolean includeCancelled, boolean showAction, boolean recurseChildren, Artifact versionArt, User userArt, ReleasedOption releasedOption, String stateName) { super(displayName, AtsImage.TEAM_WORKFLOW); this.includeCancelled = includeCancelled; this.versionArt = versionArt; @@ -188,15 +188,15 @@ public class TeamWorldSearchItem extends WorldUISearchItem { TeamWorkFlowArtifact team = awa.getParentTeamWorkflow(); if (team != null) { // skip if released is desired and version artifact is not set - VersionArtifact setVerArt = team.getTargetedVersion(); + Artifact setVerArt = team.getTargetedVersion(); if (setVerArt == null && releasedOption == ReleasedOption.Released) { continue; } // skip of version release is opposite of desired if (setVerArt != null) { - if (releasedOption == ReleasedOption.Released && !setVerArt.isReleased()) { + if (releasedOption == ReleasedOption.Released && !VersionManager.isReleased(setVerArt)) { continue; - } else if (releasedOption == ReleasedOption.UnReleased && setVerArt.isReleased()) { + } else if (releasedOption == ReleasedOption.UnReleased && VersionManager.isReleased(setVerArt)) { continue; } } 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 9499c3780da..b915ff09132 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 @@ -20,14 +20,14 @@ import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; +import org.eclipse.osee.ats.util.AWAUtil; import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.AtsUtil; -import org.eclipse.osee.ats.util.AWAUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.User; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; /** @@ -36,7 +36,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; public class UserWorldSearchItem { private final Collection<TeamDefinitionArtifact> teamDefs; - private final Collection<VersionArtifact> versions; + private final Collection<Artifact> versions; private final Collection<UserSearchOption> options; private final User user; private final String selectedState; @@ -54,7 +54,7 @@ public class UserWorldSearchItem { IncludeTasks }; - public UserWorldSearchItem(User user, Collection<TeamDefinitionArtifact> teamDefs, Collection<VersionArtifact> versions, String selectedState, UserSearchOption... userSearchOption) { + public UserWorldSearchItem(User user, Collection<TeamDefinitionArtifact> teamDefs, Collection<Artifact> versions, String selectedState, UserSearchOption... userSearchOption) { this.user = user; this.teamDefs = teamDefs; this.versions = versions; 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 d70b3ad36eb..61849f79d2c 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 @@ -15,10 +15,10 @@ import java.util.ArrayList; import java.util.Collection; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionLockedType; -import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; import org.eclipse.osee.ats.internal.AtsPlugin; +import org.eclipse.osee.ats.util.VersionLockedType; +import org.eclipse.osee.ats.util.VersionManager; +import org.eclipse.osee.ats.util.VersionReleaseType; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.ats.util.widgets.dialog.VersionListDialog; import org.eclipse.osee.framework.core.enums.Active; @@ -33,16 +33,16 @@ import org.eclipse.osee.framework.ui.skynet.FrameworkImage; * @author Donald G. Dunne */ public class VersionTargetedForTeamSearchItem extends WorldUISearchItem { - private final VersionArtifact versionArt; - private VersionArtifact selectedVersionArt; + private final Artifact versionArt; + private Artifact selectedVersionArt; private final boolean returnAction; private final TeamDefinitionArtifact teamDef; - public VersionTargetedForTeamSearchItem(TeamDefinitionArtifact teamDef, VersionArtifact versionArt, boolean returnAction, LoadView loadView) { + public VersionTargetedForTeamSearchItem(TeamDefinitionArtifact teamDef, Artifact versionArt, boolean returnAction, LoadView loadView) { this(null, teamDef, versionArt, returnAction, loadView); } - public VersionTargetedForTeamSearchItem(String name, TeamDefinitionArtifact teamDef, VersionArtifact versionArt, boolean returnAction, LoadView loadView) { + public VersionTargetedForTeamSearchItem(String name, TeamDefinitionArtifact teamDef, Artifact versionArt, boolean returnAction, LoadView loadView) { super(name != null ? name : (returnAction ? "Actions" : "Workflows") + " Targeted-For Version", loadView, FrameworkImage.VERSION); this.teamDef = teamDef; @@ -65,7 +65,7 @@ public class VersionTargetedForTeamSearchItem extends WorldUISearchItem { return ""; } - public VersionArtifact getSearchVersionArtifact() { + public Artifact getSearchVersionArtifact() { if (versionArt != null) { return versionArt; } @@ -80,7 +80,7 @@ public class VersionTargetedForTeamSearchItem extends WorldUISearchItem { } ArrayList<Artifact> arts = new ArrayList<Artifact>(); - for (Artifact art : getSearchVersionArtifact().getTargetedForTeamArtifacts()) { + for (Artifact art : VersionManager.getTargetedForTeamArtifacts(getSearchVersionArtifact())) { if (returnAction) { arts.add(((TeamWorkFlowArtifact) art).getParentActionArtifact()); } else { @@ -119,7 +119,7 @@ public class VersionTargetedForTeamSearchItem extends WorldUISearchItem { new VersionListDialog("Select Version", "Select Version", selectedTeamDef.getVersionsArtifacts( VersionReleaseType.Both, VersionLockedType.Both)); if (vld.open() == 0) { - selectedVersionArt = (VersionArtifact) vld.getResult()[0]; + selectedVersionArt = (Artifact) vld.getResult()[0]; return; } } @@ -132,7 +132,7 @@ public class VersionTargetedForTeamSearchItem extends WorldUISearchItem { /** * @param selectedVersionArt the selectedVersionArt to set */ - public void setSelectedVersionArt(VersionArtifact selectedVersionArt) { + public void setSelectedVersionArt(Artifact selectedVersionArt) { this.selectedVersionArt = selectedVersionArt; } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Artifacts.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Artifacts.java index d3ef3082ae9..35a52e587c9 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Artifacts.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/Artifacts.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.logging.Level; +import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.type.HashCollection; @@ -209,4 +210,12 @@ public final class Artifacts { } return branchMap; } + + public static boolean isOfType(Object object, IArtifactType artifactType) { + if (object instanceof Artifact) { + return ((Artifact) object).isOfType(artifactType); + } + return false; + } + }
\ No newline at end of file |