Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoCISBuilds.java14
-rw-r--r--plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/PopulateDemoActions.java4
-rw-r--r--plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/config/AtsBranchConfigurationTest.java76
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsAccessContextIdFactory.java16
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java11
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactToken.java78
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsAttributeTypes.java164
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfigManager.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java30
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java8
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactTypes.java34
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsRelationTypes.java138
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java11
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationSetRule.java8
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java8
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldContentProvider.java4
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactTypes.java14
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributeTypes.java29
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageRelationTypes.java40
-rw-r--r--plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/jobs/ImportTraceUnitsOperationTest.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java14
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java6
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java6
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractArtifactRelationReport.java12
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactToRelatedArtifact.java10
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactTraceCount.java8
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactsWithoutRelations.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/OseeDslAccessModelTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/internal/AccessModelInterpreterImplTest.java11
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtil.java26
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java12
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockDataFactory.java10
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/DefaultBasicArtifact.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/IBasicArtifact.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java29
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/HasArtifactType.java (renamed from plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OseeBranch.java)11
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/HasBranch.java (renamed from plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/mocks/MockAccessContextId.java)16
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactToken.java7
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationTypeSide.java (renamed from plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/IRelationEnumeration.java)6
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java114
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java116
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java174
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java14
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java123
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventFiltersTest.java27
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderMergeUtilityTest.java3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java58
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteria.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java18
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLink.java14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLinkManager.java12
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/LoadedRelationTypes.java35
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/ArtifactProcessing.java5
-rw-r--r--plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java64
-rw-r--r--plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteRelationTypes.java23
-rw-r--r--plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoArtifactTypes.java14
-rw-r--r--plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoSawBuilds.java15
75 files changed, 908 insertions, 910 deletions
diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoCISBuilds.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoCISBuilds.java
index 7615f718c99..9998b1ef259 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoCISBuilds.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoCISBuilds.java
@@ -11,17 +11,17 @@
package org.eclipse.osee.ats.config.demo;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
/**
* @author Donald G. Dunne
*/
-public class DemoCISBuilds extends NamedIdentity implements IOseeBranch {
- public static final DemoCISBuilds CIS_Bld_1 = new DemoCISBuilds("AyH_f2sSKy3l07fIvDDD", "CIS_Bld_1");
- public static final DemoCISBuilds CIS_Bld_2 = new DemoCISBuilds("AyH_f2sSKy3l07fIvEEE", "CIS_Bld_2");
- public static final DemoCISBuilds CIS_Bld_3 = new DemoCISBuilds("AyH_f2sSKy3l07fIvFFF", "CIS_Bld_3");
+public final class DemoCISBuilds {
+ public static final IOseeBranch CIS_Bld_1 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvDDD", "CIS_Bld_1");
+ public static final IOseeBranch CIS_Bld_2 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvEEE", "CIS_Bld_2");
+ public static final IOseeBranch CIS_Bld_3 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvFFF", "CIS_Bld_3");
- private DemoCISBuilds(String guid, String name) {
- super(guid, name);
+ private DemoCISBuilds() {
+ // Constants
}
} \ No newline at end of file
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 92077c4eeb9..06f711f7092 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
@@ -42,12 +42,12 @@ import org.eclipse.osee.ats.util.SubscribeManager;
import org.eclipse.osee.ats.util.TeamState;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.data.SystemUser;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
@@ -494,7 +494,7 @@ public class PopulateDemoActions extends XNavigateItemAction {
}
}
- private void relate(IRelationEnumeration relationSide, Artifact artifact, Collection<Artifact> artifacts) throws OseeCoreException {
+ private void relate(IRelationTypeSide relationSide, Artifact artifact, Collection<Artifact> artifacts) throws OseeCoreException {
for (Artifact otherArtifact : artifacts) {
artifact.addRelation(relationSide, otherArtifact);
}
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 845608b36bd..68b4bc381ac 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
@@ -34,7 +34,7 @@ import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.TeamState;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -70,27 +70,21 @@ import org.junit.Before;
*/
public class AtsBranchConfigurationTest {
- public static class AtsTestBranches extends NamedIdentity implements IOseeBranch {
- public static final AtsTestBranches BranchViaTeamDef = new AtsTestBranches("AyH_e6damwQgvDhKfAAA",
- "BranchViaTeamDef");
- public static final AtsTestBranches BranchViaVersions = new AtsTestBranches("AyH_e6damwQgvDhKfBBB",
- "BranchViaVersions");
+ public static final IOseeBranch BRANCH_VIA_TEAM_DEFINITION = TokenFactory.createBranch("AyH_e6damwQgvDhKfAAA",
+ "BranchViaTeamDef");
+ public static final IOseeBranch BRANCH_VIA_VERSIONS = TokenFactory.createBranch("AyH_e6damwQgvDhKfBBB",
+ "BranchViaVersions");
- private AtsTestBranches(String guid, String name) {
- super(guid, name);
- }
-
- public String getNamespace() {
- return String.format("org.branchTest.%s", this.getName().toLowerCase());
+ private static Collection<String> appendToName(IOseeBranch branch, String... postFixes) {
+ Collection<String> data = new ArrayList<String>();
+ for (String postFix : postFixes) {
+ data.add(String.format("%s - %s", branch.getName(), postFix));
}
+ return data;
+ }
- public Collection<String> appendToName(String... postFixes) {
- Collection<String> data = new ArrayList<String>();
- for (String postFix : postFixes) {
- data.add(String.format("%s - %s", this.getName(), postFix));
- }
- return data;
- }
+ private static String asNamespace(IOseeBranch branch) {
+ return String.format("org.branchTest.%s", branch.getName().toLowerCase());
}
@Before
@@ -106,21 +100,21 @@ public class AtsBranchConfigurationTest {
OseeLog.log(AtsPlugin.class, Level.INFO, "Running testBranchViaVersions...");
// Cleanup from previous run
- cleanupBranchTest(AtsTestBranches.BranchViaVersions);
+ cleanupBranchTest(BRANCH_VIA_VERSIONS);
OseeLog.log(AtsPlugin.class, Level.INFO, "Configuring ATS for team org.branchTest.viaTeamDefs");
// create team definition and actionable item
- String name = AtsTestBranches.BranchViaVersions.getName();
- String namespace = AtsTestBranches.BranchViaVersions.getNamespace();
- Collection<String> versions = AtsTestBranches.BranchViaVersions.appendToName("Ver1", "Ver2");
- Collection<String> actionableItems = AtsTestBranches.BranchViaVersions.appendToName("A1", "A2");
+ String name = BRANCH_VIA_VERSIONS.getName();
+ String namespace = asNamespace(BRANCH_VIA_VERSIONS);
+ Collection<String> versions = appendToName(BRANCH_VIA_VERSIONS, "Ver1", "Ver2");
+ Collection<String> actionableItems = appendToName(BRANCH_VIA_VERSIONS, "A1", "A2");
configureAts(namespace, name, versions, actionableItems, namespace);
// create main branch
OseeLog.log(AtsPlugin.class, Level.INFO, "Creating root branch");
// Create SAW_Bld_2 branch off SAW_Bld_1
- Branch viaTeamDefBranch = BranchManager.createTopLevelBranch(AtsTestBranches.BranchViaVersions);
+ Branch viaTeamDefBranch = BranchManager.createTopLevelBranch(BRANCH_VIA_VERSIONS);
TestUtil.sleep(2000);
@@ -128,7 +122,7 @@ public class AtsBranchConfigurationTest {
OseeLog.log(AtsPlugin.class, Level.INFO, "Configuring version to use branch and allow create/commit");
TeamDefinitionArtifact teamDef =
(TeamDefinitionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.TeamDefinition,
- AtsTestBranches.BranchViaVersions.getName(), AtsUtil.getAtsBranch());
+ BRANCH_VIA_VERSIONS.getName(), AtsUtil.getAtsBranch());
VersionArtifact verArtToTarget = null;
for (VersionArtifact vArt : teamDef.getVersionsArtifacts()) {
if (vArt.getName().contains("Ver1")) {
@@ -150,12 +144,12 @@ public class AtsBranchConfigurationTest {
OseeLog.log(AtsPlugin.class, Level.INFO, "Create new Action and target for version " + verArtToTarget);
Collection<ActionableItemArtifact> selectedActionableItems =
- ActionableItemArtifact.getActionableItems(AtsTestBranches.BranchViaVersions.appendToName("A1"));
+ ActionableItemArtifact.getActionableItems(appendToName(BRANCH_VIA_VERSIONS, "A1"));
Assert.assertFalse(selectedActionableItems.isEmpty());
SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "Branch Configuration Test");
ActionArtifact actionArt =
- ActionManager.createAction(null, AtsTestBranches.BranchViaVersions.getName() + " Req Changes", "description",
+ ActionManager.createAction(null, BRANCH_VIA_VERSIONS.getName() + " Req Changes", "description",
ChangeType.Problem, "1", false, null, selectedActionableItems, new Date(), UserManager.getUser(),
transaction);
actionArt.getTeamWorkFlowArtifacts().iterator().next().addRelation(
@@ -184,7 +178,7 @@ public class AtsBranchConfigurationTest {
Artifact rootArtifact = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(teamWf.getWorkingBranch());
Artifact blk3MainArt =
ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, teamWf.getWorkingBranch(),
- AtsTestBranches.BranchViaVersions.getName() + " Requirement");
+ BRANCH_VIA_VERSIONS.getName() + " Requirement");
rootArtifact.addChild(blk3MainArt);
blk3MainArt.persist();
@@ -209,21 +203,21 @@ public class AtsBranchConfigurationTest {
OseeLog.log(AtsPlugin.class, Level.INFO, "Running testBranchViaTeamDefinition...");
// Cleanup from previous run
- cleanupBranchTest(AtsTestBranches.BranchViaTeamDef);
+ cleanupBranchTest(BRANCH_VIA_TEAM_DEFINITION);
OseeLog.log(AtsPlugin.class, Level.INFO, "Configuring ATS for team org.branchTest.viaTeamDefs");
// create team definition and actionable item
- String name = AtsTestBranches.BranchViaTeamDef.getName();
- String namespace = AtsTestBranches.BranchViaTeamDef.getNamespace();
+ String name = BRANCH_VIA_TEAM_DEFINITION.getName();
+ String namespace = asNamespace(BRANCH_VIA_TEAM_DEFINITION);
Collection<String> versions = null;
- Collection<String> actionableItems = AtsTestBranches.BranchViaTeamDef.appendToName("A1", "A2");
+ Collection<String> actionableItems = appendToName(BRANCH_VIA_TEAM_DEFINITION, "A1", "A2");
configureAts(namespace, name, versions, actionableItems, namespace);
// create main branch
OseeLog.log(AtsPlugin.class, Level.INFO, "Creating root branch");
// Create SAW_Bld_2 branch off SAW_Bld_1
- Branch viaTeamDefBranch = BranchManager.createTopLevelBranch(AtsTestBranches.BranchViaTeamDef);
+ Branch viaTeamDefBranch = BranchManager.createTopLevelBranch(BRANCH_VIA_TEAM_DEFINITION);
TestUtil.sleep(2000);
@@ -231,7 +225,7 @@ public class AtsBranchConfigurationTest {
OseeLog.log(AtsPlugin.class, Level.INFO, "Configuring team def to use branch and allow create/commit");
TeamDefinitionArtifact teamDef =
(TeamDefinitionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.TeamDefinition,
- AtsTestBranches.BranchViaTeamDef.getName(), AtsUtil.getAtsBranch());
+ BRANCH_VIA_TEAM_DEFINITION.getName(), AtsUtil.getAtsBranch());
teamDef.setSoleAttributeFromString(AtsAttributeTypes.BaselineBranchGuid, viaTeamDefBranch.getGuid());
// setup team def to allow create/commit of branch
teamDef.setSoleAttributeValue(AtsAttributeTypes.AllowCommitBranch, true);
@@ -247,12 +241,12 @@ public class AtsBranchConfigurationTest {
// create action,
OseeLog.log(AtsPlugin.class, Level.INFO, "Create new Action");
Collection<ActionableItemArtifact> selectedActionableItems =
- ActionableItemArtifact.getActionableItems(AtsTestBranches.BranchViaTeamDef.appendToName("A1"));
+ ActionableItemArtifact.getActionableItems(appendToName(BRANCH_VIA_TEAM_DEFINITION, "A1"));
Assert.assertFalse(selectedActionableItems.isEmpty());
SkynetTransaction transaction =
new SkynetTransaction(AtsUtil.getAtsBranch(), "Test branch via team definition: create action");
- String actionTitle = AtsTestBranches.BranchViaTeamDef.getName() + " Req Changes";
+ String actionTitle = BRANCH_VIA_TEAM_DEFINITION.getName() + " Req Changes";
ActionArtifact actionArt =
ActionManager.createAction(null, actionTitle, "description", ChangeType.Problem, "1", false, null,
selectedActionableItems, new Date(), UserManager.getUser(), transaction);
@@ -277,7 +271,7 @@ public class AtsBranchConfigurationTest {
Artifact rootArtifact = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(teamWf.getWorkingBranch());
Artifact blk3MainArt =
ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, teamWf.getWorkingBranch(),
- AtsTestBranches.BranchViaTeamDef.getName() + " Requirement");
+ BRANCH_VIA_TEAM_DEFINITION.getName() + " Requirement");
rootArtifact.addChild(blk3MainArt);
blk3MainArt.persist();
@@ -293,7 +287,7 @@ public class AtsBranchConfigurationTest {
Assert.assertTrue("Should be 1 new artifact in change report, found " + newArts.size(), newArts.size() == 1);
}
- public static void cleanupBranchTest(AtsTestBranches testType) throws Exception {
+ public static void cleanupBranchTest(IOseeBranch testType) throws Exception {
String namespace = "org.branchTest." + testType.getName().toLowerCase();
OseeLog.log(AtsPlugin.class, Level.INFO, "Cleanup from previous run of ATS for team " + namespace);
ActionArtifact aArt =
@@ -424,8 +418,8 @@ public class AtsBranchConfigurationTest {
@After
public void tearDown() throws Exception {
- cleanupBranchTest(AtsTestBranches.BranchViaVersions);
- cleanupBranchTest(AtsTestBranches.BranchViaTeamDef);
+ cleanupBranchTest(BRANCH_VIA_VERSIONS);
+ cleanupBranchTest(BRANCH_VIA_TEAM_DEFINITION);
}
public static void configureAts(String namespace, String teamDefName, Collection<String> versionNames, Collection<String> actionableItems, String workflowId) throws Exception {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsAccessContextIdFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsAccessContextIdFactory.java
index 33d25d9c522..326ed63fdaf 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsAccessContextIdFactory.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsAccessContextIdFactory.java
@@ -15,7 +15,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.framework.core.data.AccessContextId;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.logging.OseeLog;
/**
@@ -32,7 +32,7 @@ public final class AtsAccessContextIdFactory {
public static AccessContextId createContextId(final String guid, final String name) {
AccessContextId context = guidToIds.get(guid);
if (context == null) {
- context = new AtsAccessContextId(guid, name);
+ context = TokenFactory.createAccessContextId(guid, name);
guidToIds.put(guid, context);
} else {
OseeLog.log(
@@ -51,16 +51,4 @@ public final class AtsAccessContextIdFactory {
}
return context;
}
-
- private final static class AtsAccessContextId extends NamedIdentity implements AccessContextId {
-
- protected AtsAccessContextId(final String guid, final String name) {
- super(guid, name);
- }
-
- @Override
- public String toString() {
- return String.format("%s - %s", getName(), getGuid());
- }
- }
}
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 887b461617a..b14ce0e9573 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
@@ -32,7 +32,6 @@ import org.eclipse.osee.ats.help.ui.AtsHelpContext;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.notify.AtsNotification;
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.SimpleTeamState;
import org.eclipse.osee.ats.util.StateManager;
@@ -49,8 +48,8 @@ import org.eclipse.osee.ats.workflow.TransitionManager;
import org.eclipse.osee.ats.world.IWorldViewArtifact;
import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.data.IArtifactType;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.data.SystemUser;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -86,7 +85,7 @@ import org.osgi.framework.ServiceReference;
*/
public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact implements HasCmAccessControl, IGroupExplorerProvider, IWorldViewArtifact {
- private final Set<IRelationEnumeration> atsWorldRelations = new HashSet<IRelationEnumeration>();
+ private final Set<IRelationTypeSide> atsWorldRelations = new HashSet<IRelationTypeSide>();
private Collection<User> transitionAssignees;
protected AbstractWorkflowArtifact parentSma;
protected TeamWorkFlowArtifact parentTeamArt;
@@ -220,8 +219,8 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple
/**
* Registers relation as part of the parent/child hierarchy in ATS World
*/
- public void registerAtsWorldRelation(AtsRelationTypes side) {
- atsWorldRelations.add(side);
+ public void registerAtsWorldRelation(IRelationTypeSide typeSideToken) {
+ atsWorldRelations.add(typeSideToken);
}
@Override
@@ -707,7 +706,7 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple
return getPercentCompleteSMATotal();
}
- public Set<IRelationEnumeration> getAtsWorldRelations() {
+ public Set<IRelationTypeSide> getAtsWorldRelations() {
return atsWorldRelations;
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java
index 1bcab6346e8..c3fc7bd285b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java
@@ -62,7 +62,7 @@ public class ActionableItemArtifact extends Artifact {
}
public static ActionableItemArtifact getTopActionableItem() throws OseeCoreException {
- return (ActionableItemArtifact) AtsArtifactToken.get(AtsArtifactToken.TopActionableItem);
+ return (ActionableItemArtifact) AtsUtil.getFromToken(AtsArtifactToken.TopActionableItem);
}
public static List<ActionableItemArtifact> getActionableItems() throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactToken.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactToken.java
index 69980f56ec1..2e96c6ffe4a 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactToken.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsArtifactToken.java
@@ -1,56 +1,42 @@
-/*
- * Created on Feb 8, 2011
+/*******************************************************************************
+ * 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
*
- * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
- */
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
package org.eclipse.osee.ats.artifact;
import org.eclipse.osee.ats.util.AtsArtifactTypes;
-import org.eclipse.osee.ats.util.AtsUtil;
-import org.eclipse.osee.framework.core.data.ArtifactToken;
-import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.IArtifactToken;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-public class AtsArtifactToken extends ArtifactToken {
+public final class AtsArtifactToken {
- public static AtsArtifactToken HeadingFolder = new AtsArtifactToken("Action Tracking System",
- CoreArtifactTypes.Folder, "AAABER+3yR4A8O7WYQ+Xbw");
- public static AtsArtifactToken TopTeamDefinition = new AtsArtifactToken("Teams", AtsArtifactTypes.TeamDefinition,
- "AAABER+35b4A8O7WHrXTiA");
- public static AtsArtifactToken TopActionableItem = new AtsArtifactToken("Actionable Items",
- AtsArtifactTypes.ActionableItem, "AAABER+37QEA8O7WSQaqJQ");
- public static AtsArtifactToken ConfigFolder = new AtsArtifactToken("Config", CoreArtifactTypes.Folder,
- "AAABF4n18eYAc1ruQSSWdg");
- public static AtsArtifactToken WorkDefinitionsFolder = new AtsArtifactToken("Work Definitions",
- CoreArtifactTypes.Folder, "ADTfjCLEj2DH2WYyeOgA");
- public static AtsArtifactToken WorkPagesFolder = new AtsArtifactToken("Work Pages", CoreArtifactTypes.Folder,
- "AAABGnncY_gAAo+3N69ASA");
- public static AtsArtifactToken WorkRulesFolder = new AtsArtifactToken("Work Rules", CoreArtifactTypes.Folder,
- "AAABGnmhCyYAoJoIciyaag");
- public static AtsArtifactToken WorkWidgetsFolder = new AtsArtifactToken("Work Widgets", CoreArtifactTypes.Folder,
- "AAABGnmjk4IAoJoIa945Kg");
- public static AtsArtifactToken WorkFlowsFolder = new AtsArtifactToken("Work Flows", CoreArtifactTypes.Folder,
- "AAABGnncZ_4AAo+3D0sGfw");
+ public static IArtifactToken HeadingFolder = TokenFactory.createArtifactToken("AAABER+3yR4A8O7WYQ+Xbw",
+ "Action Tracking System", CoreArtifactTypes.Folder);
+ public static IArtifactToken TopTeamDefinition = TokenFactory.createArtifactToken("AAABER+35b4A8O7WHrXTiA", "Teams",
+ AtsArtifactTypes.TeamDefinition);
+ public static IArtifactToken TopActionableItem = TokenFactory.createArtifactToken("AAABER+37QEA8O7WSQaqJQ",
+ "Actionable Items", AtsArtifactTypes.ActionableItem);
+ public static IArtifactToken ConfigFolder = TokenFactory.createArtifactToken("AAABF4n18eYAc1ruQSSWdg", "Config",
+ CoreArtifactTypes.Folder);
+ public static IArtifactToken WorkDefinitionsFolder = TokenFactory.createArtifactToken("ADTfjCLEj2DH2WYyeOgA",
+ "Work Definitions", CoreArtifactTypes.Folder);
+ public static IArtifactToken WorkPagesFolder = TokenFactory.createArtifactToken("AAABGnncY_gAAo+3N69ASA",
+ "Work Pages", CoreArtifactTypes.Folder);
+ public static IArtifactToken WorkRulesFolder = TokenFactory.createArtifactToken("AAABGnmhCyYAoJoIciyaag",
+ "Work Rules", CoreArtifactTypes.Folder);
+ public static IArtifactToken WorkWidgetsFolder = TokenFactory.createArtifactToken("AAABGnmjk4IAoJoIa945Kg",
+ "Work Widgets", CoreArtifactTypes.Folder);
+ public static IArtifactToken WorkFlowsFolder = TokenFactory.createArtifactToken("AAABGnncZ_4AAo+3D0sGfw",
+ "Work Flows", CoreArtifactTypes.Folder);
- public AtsArtifactToken(String name, IArtifactType artifactType, String guid) {
- this(name, artifactType, guid, AtsUtil.getAtsBranchToken());
- }
-
- public AtsArtifactToken(String name, IArtifactType artifactType, String guid, IOseeBranch oseeBranch) {
- super(guid, name, artifactType, oseeBranch);
- }
-
- public static Artifact get(AtsArtifactToken atsArtifactToken) throws OseeCoreException {
- try {
- return ArtifactQuery.getArtifactFromToken(atsArtifactToken);
- } catch (ArtifactDoesNotExist ex) {
- // do nothing
- }
- return null;
+ private AtsArtifactToken() {
+ // Constants
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsAttributeTypes.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsAttributeTypes.java
index cb06402a55e..a758ef55ae9 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsAttributeTypes.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AtsAttributeTypes.java
@@ -11,109 +11,107 @@
package org.eclipse.osee.ats.artifact;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
/**
* @author Ryan D. Brooks
* @author Donald G. Dunne
*/
-public class AtsAttributeTypes extends NamedIdentity implements IAttributeType {
+public final class AtsAttributeTypes {
// @formatter:off
- public static final IAttributeType Actionable = new AtsAttributeTypes("AAMFEcvDtBiaJ3TMatAA", "Actionable", "True if item can have Action written against or assigned to.");
- public static final IAttributeType ActionableItem = new AtsAttributeTypes("AAMFEdbcR2zpGzFOLOQA", "Actionable Item", "Actionable Items that are impacted by this change.");
- public static final IAttributeType ActionDetailsFormat = new AtsAttributeTypes("Aij_PfM7wCsEA2Z720wA", "Action Details Format", "Format of string when push Action Details Copy button on SMA Workflow Editor.");
- public static final IAttributeType Active = new AtsAttributeTypes("AAMFEclQOVmzkIvzyWwA", "Active", "Active ATS configuration object.");
- public static final IAttributeType AllowCommitBranch = new AtsAttributeTypes("AAMFEbCZCkwgj73BsQgA", "Allow Commit Branch");
- public static final IAttributeType AllowCreateBranch = new AtsAttributeTypes("AAMFEbARuQEvi6rtY5gA", "Allow Create Branch");
- public static final IAttributeType BaselineBranchGuid = new AtsAttributeTypes("AAMFEdIjJ2za2fblEVgA", "Baseline Branch Guid", "Basline branch associated with ATS object.");
- public static final IAttributeType BlockingReview = new AtsAttributeTypes("AAMFEctKkjMRrIy1C7gA", "Blocking Review");
+ public static final IAttributeType Actionable = createType("AAMFEcvDtBiaJ3TMatAA", "Actionable", "True if item can have Action written against or assigned to.");
+ public static final IAttributeType ActionableItem = createType("AAMFEdbcR2zpGzFOLOQA", "Actionable Item", "Actionable Items that are impacted by this change.");
+ public static final IAttributeType ActionDetailsFormat = createType("Aij_PfM7wCsEA2Z720wA", "Action Details Format", "Format of string when push Action Details Copy button on SMA Workflow Editor.");
+ public static final IAttributeType Active = createType("AAMFEclQOVmzkIvzyWwA", "Active", "Active ATS configuration object.");
+ public static final IAttributeType AllowCommitBranch = createType("AAMFEbCZCkwgj73BsQgA", "Allow Commit Branch");
+ public static final IAttributeType AllowCreateBranch = createType("AAMFEbARuQEvi6rtY5gA", "Allow Create Branch");
+ public static final IAttributeType BaselineBranchGuid = createType("AAMFEdIjJ2za2fblEVgA", "Baseline Branch Guid", "Basline branch associated with ATS object.");
+ public static final IAttributeType BlockingReview = createType("AAMFEctKkjMRrIy1C7gA", "Blocking Review");
- public static final IAttributeType Category1 = new AtsAttributeTypes("AAMFEdrYniOQYrYUKKQA", "Category", "Open field for user to be able to enter text to use for categorizing/sorting.");
- public static final IAttributeType Category2 = new AtsAttributeTypes("AAMFEdthBkolbJKLXuAA", "Category2", Category1.getDescription());
- public static final IAttributeType Category3 = new AtsAttributeTypes("AAMFEd06oxr8LMzZxdgA", "Category3", Category1.getDescription());
+ public static final IAttributeType Category1 = createType("AAMFEdrYniOQYrYUKKQA", "Category", "Open field for user to be able to enter text to use for categorizing/sorting.");
+ public static final IAttributeType Category2 = createType("AAMFEdthBkolbJKLXuAA", "Category2", Category1.getDescription());
+ public static final IAttributeType Category3 = createType("AAMFEd06oxr8LMzZxdgA", "Category3", Category1.getDescription());
- public static final IAttributeType ChangeType = new AtsAttributeTypes("AAMFEc+MwGHnPCv7HlgA", "Change Type", "Type of change.");
+ public static final IAttributeType ChangeType = createType("AAMFEc+MwGHnPCv7HlgA", "Change Type", "Type of change.");
- public static final IAttributeType CancelledDate = new AtsAttributeTypes("AXnyKG1waCcPPHHGEFQA", "Cancelled Date", "Date the workflow was cancelled.");
- public static final IAttributeType CancelledBy = new AtsAttributeTypes("AXpNsieBHnqaJJfduGgA", "Cancelled By", "UserId of the user who cancelled workflow.");
- public static final IAttributeType CancelledReason = new AtsAttributeTypes("AXqJE0SmwRQzvzlqC9gA", "Cancelled Reason", "Explanation of why worklfow was cancelled.");
- public static final IAttributeType CancelledFromState = new AtsAttributeTypes("AXrxlXOwGiAnlaUNX6AA", "Cancelled From State", "State workflow was in when cancelled.");
+ public static final IAttributeType CancelledDate = createType("AXnyKG1waCcPPHHGEFQA", "Cancelled Date", "Date the workflow was cancelled.");
+ public static final IAttributeType CancelledBy = createType("AXpNsieBHnqaJJfduGgA", "Cancelled By", "UserId of the user who cancelled workflow.");
+ public static final IAttributeType CancelledReason = createType("AXqJE0SmwRQzvzlqC9gA", "Cancelled Reason", "Explanation of why worklfow was cancelled.");
+ public static final IAttributeType CancelledFromState = createType("AXrxlXOwGiAnlaUNX6AA", "Cancelled From State", "State workflow was in when cancelled.");
- public static final IAttributeType CreatedDate = new AtsAttributeTypes("AXny90bBpmfNkLpNhqwA", "Created Date", "Date the workflow was created.");
- public static final IAttributeType CreatedBy = new AtsAttributeTypes("AXpTVIExV1p0kp9IKKQA", "Created By", "UserId of the user who created the workflow.");
+ public static final IAttributeType CreatedDate = createType("AXny90bBpmfNkLpNhqwA", "Created Date", "Date the workflow was created.");
+ public static final IAttributeType CreatedBy = createType("AXpTVIExV1p0kp9IKKQA", "Created By", "UserId of the user who created the workflow.");
- public static final IAttributeType CompletedDate = new AtsAttributeTypes("AXnxSfRg6UhirNzaZnQA", "Completed Date", "Date the workflow was completed.");
- public static final IAttributeType CompletedBy = new AtsAttributeTypes("AXo6tqxrOStgd9P16XQA", "Completed By", "UserId of the user who completed workflow.");
- public static final IAttributeType CompletedFromState = new AtsAttributeTypes("AXr9OO909xRiI3MFNOwA", "Completed From State", "State workflow was in when completed.");
+ public static final IAttributeType CompletedDate = createType("AXnxSfRg6UhirNzaZnQA", "Completed Date", "Date the workflow was completed.");
+ public static final IAttributeType CompletedBy = createType("AXo6tqxrOStgd9P16XQA", "Completed By", "UserId of the user who completed workflow.");
+ public static final IAttributeType CompletedFromState = createType("AXr9OO909xRiI3MFNOwA", "Completed From State", "State workflow was in when completed.");
- public static final IAttributeType CurrentState = new AtsAttributeTypes("AAMFEdOWL3u6hmX2VbwA", "Current State", "Current state of workflow state machine.");
- public static final IAttributeType CurrentStateType = new AtsAttributeTypes("ATOWheEyGUJmPmPuqyAA", "Current State Type", "Type of Current State: InWork, Completed or Cancelled.");
- public static final IAttributeType Decision = new AtsAttributeTypes("AAMFEd7uDXcmqq_FrCQA", "Decision", "Option selected during decision review.");
+ public static final IAttributeType CurrentState = createType("AAMFEdOWL3u6hmX2VbwA", "Current State", "Current state of workflow state machine.");
+ public static final IAttributeType CurrentStateType = createType("ATOWheEyGUJmPmPuqyAA", "Current State Type", "Type of Current State: InWork, Completed or Cancelled.");
+ public static final IAttributeType Decision = createType("AAMFEd7uDXcmqq_FrCQA", "Decision", "Option selected during decision review.");
- public static final IAttributeType DecisionReviewOptions = new AtsAttributeTypes("AAMFEd5hRy1+SRJRqfwA", "Decision Review Options", "Options available for selection in review. Each line is a separate option. Format: <option name>;<state to transition to>;<assignee>");
- public static final IAttributeType Description = new AtsAttributeTypes("AAMFEdWJ_ChxX6+YKbwA", "Description", "Detailed explanation.");
- public static final IAttributeType DslSheet = new AtsAttributeTypes("AGrqojZDowPDaLh4kBAA", "DSL Sheet", "XText DSL Sheet for ATS");
- public static final IAttributeType EstimatedCompletionDate = new AtsAttributeTypes("AAMFEc18k3Gh+GP7zqAA", "Estimated Completion Date", "Date the changes will be completed.");
- public static final IAttributeType EstimatedHours = new AtsAttributeTypes("AAMFEdCSqBh+cPyadiwA", "Estimated Hours", "Hours estimated to implement the changes associated with this Action.\nIncludes estimated hours for workflows, tasks and reviews.");
- public static final IAttributeType EstimatedReleaseDate = new AtsAttributeTypes("AAMFEcy6VB7Ble5SP1QA", "Estimated Release Date", "Date the changes will be made available to the users.");
- public static final IAttributeType FullName = new AtsAttributeTypes("AAMFEdZI9XLT34cTonAA", "Full Name", "Expanded and descriptive name.");
- public static final IAttributeType GoalOrderVote = new AtsAttributeTypes("Aiecsz9pP1CRoQdaYRAA", "Goal Order Vote", "Vote for order item belongs to within goal.");
- public static final IAttributeType HoursPerWorkDay = new AtsAttributeTypes("AAMFEdGlqFsZp22RMdAA", "Hours Per Work Day");
- public static final IAttributeType LegacyPcrId = new AtsAttributeTypes("AAMFEd3TakphMtQX1zgA", "Legacy PCR Id", "Field to register problem change report id from legacy items imported into ATS.");
- public static final IAttributeType Location = new AtsAttributeTypes("AAMFEeAW4QBlesdfacwA", "Location", "Enter location of materials to review.");
- public static final IAttributeType LocChanged= new AtsAttributeTypes("AQR27biJiQlOKTEKCvwA", "LOC Changed", "Total Lines of Code Changed");
- public static final IAttributeType LocReviewed = new AtsAttributeTypes("AQR5ckRsrh4PpayYGAgA", "LOC Reviewed", "Total Lines of Code Reviewed");
- public static final IAttributeType Log = new AtsAttributeTypes("AAMFEdgB1DX3eJSZb0wA", "Log");
- public static final IAttributeType NeedBy = new AtsAttributeTypes("AAMFEcxAGzHAKfDNAIwA", "Need By", "Hard schedule date that workflow must be completed.");
- public static final IAttributeType NextVersion = new AtsAttributeTypes("AAMFEcpH8Xb72hsF5AwA", "Next Version", "True if version artifact is \"Next\" version to be released.");
- public static final IAttributeType Numeric1 = new AtsAttributeTypes("AABY2xxQsDm811kCViwA", "Numeric1", "Open field for user to be able to enter numbers for sorting.");
- public static final IAttributeType Numeric2 = new AtsAttributeTypes("AABiRtvZsAEkU4BS9qwA", "Numeric2", Numeric1.getDescription());
- public static final IAttributeType OperationalImpact = new AtsAttributeTypes("ADTfjCBpFxlyV3o1wLwA", "Operational Impact");
- public static final IAttributeType OperationalImpactDescription = new AtsAttributeTypes("ADTfjCDvUF5PtiKdQ3wA", "Operational Impact Description");
- public static final IAttributeType OperationalImpactWorkaround = new AtsAttributeTypes("AbMqFfIwQHRbmzT_VTAA", "Operational Impact Workaround");
- public static final IAttributeType OperationalImpactWorkaroundDescription = new AtsAttributeTypes("AbMo7PoIukFDhQFJxKwA", "Operational Impact Workaround Description");
- public static final IAttributeType PagesChanged= new AtsAttributeTypes("AQR8yMuv4W84UwvSJAQA", "Pages Changed", "Total Pages of Changed");
- public static final IAttributeType PagesReviewed = new AtsAttributeTypes("AQR9qM8TTyCMb7sf4cQA", "Pages Reviewed", "Total Pages Reviewed");
- public static final IAttributeType PercentRework = new AtsAttributeTypes("AAMFEdKfjl2TII9+tuwA", "Percent Rework");
- public static final IAttributeType PercentComplete = new AtsAttributeTypes("AALLbOZiBBDN39YsRSAA", "Percent Complete");
+ public static final IAttributeType DecisionReviewOptions = createType("AAMFEd5hRy1+SRJRqfwA", "Decision Review Options", "Options available for selection in review. Each line is a separate option. Format: <option name>;<state to transition to>;<assignee>");
+ public static final IAttributeType Description = createType("AAMFEdWJ_ChxX6+YKbwA", "Description", "Detailed explanation.");
+ public static final IAttributeType DslSheet = createType("AGrqojZDowPDaLh4kBAA", "DSL Sheet", "XText DSL Sheet for ATS");
+ public static final IAttributeType EstimatedCompletionDate = createType("AAMFEc18k3Gh+GP7zqAA", "Estimated Completion Date", "Date the changes will be completed.");
+ public static final IAttributeType EstimatedHours = createType("AAMFEdCSqBh+cPyadiwA", "Estimated Hours", "Hours estimated to implement the changes associated with this Action.\nIncludes estimated hours for workflows, tasks and reviews.");
+ public static final IAttributeType EstimatedReleaseDate = createType("AAMFEcy6VB7Ble5SP1QA", "Estimated Release Date", "Date the changes will be made available to the users.");
+ public static final IAttributeType FullName = createType("AAMFEdZI9XLT34cTonAA", "Full Name", "Expanded and descriptive name.");
+ public static final IAttributeType GoalOrderVote = createType("Aiecsz9pP1CRoQdaYRAA", "Goal Order Vote", "Vote for order item belongs to within goal.");
+ public static final IAttributeType HoursPerWorkDay = createType("AAMFEdGlqFsZp22RMdAA", "Hours Per Work Day");
+ public static final IAttributeType LegacyPcrId = createType("AAMFEd3TakphMtQX1zgA", "Legacy PCR Id", "Field to register problem change report id from legacy items imported into ATS.");
+ public static final IAttributeType Location = createType("AAMFEeAW4QBlesdfacwA", "Location", "Enter location of materials to review.");
+ public static final IAttributeType LocChanged= createType("AQR27biJiQlOKTEKCvwA", "LOC Changed", "Total Lines of Code Changed");
+ public static final IAttributeType LocReviewed = createType("AQR5ckRsrh4PpayYGAgA", "LOC Reviewed", "Total Lines of Code Reviewed");
+ public static final IAttributeType Log = createType("AAMFEdgB1DX3eJSZb0wA", "Log");
+ public static final IAttributeType NeedBy = createType("AAMFEcxAGzHAKfDNAIwA", "Need By", "Hard schedule date that workflow must be completed.");
+ public static final IAttributeType NextVersion = createType("AAMFEcpH8Xb72hsF5AwA", "Next Version", "True if version artifact is \"Next\" version to be released.");
+ public static final IAttributeType Numeric1 = createType("AABY2xxQsDm811kCViwA", "Numeric1", "Open field for user to be able to enter numbers for sorting.");
+ public static final IAttributeType Numeric2 = createType("AABiRtvZsAEkU4BS9qwA", "Numeric2", Numeric1.getDescription());
+ public static final IAttributeType OperationalImpact = createType("ADTfjCBpFxlyV3o1wLwA", "Operational Impact");
+ public static final IAttributeType OperationalImpactDescription = createType("ADTfjCDvUF5PtiKdQ3wA", "Operational Impact Description");
+ public static final IAttributeType OperationalImpactWorkaround = createType("AbMqFfIwQHRbmzT_VTAA", "Operational Impact Workaround");
+ public static final IAttributeType OperationalImpactWorkaroundDescription = createType("AbMo7PoIukFDhQFJxKwA", "Operational Impact Workaround Description");
+ public static final IAttributeType PagesChanged= createType("AQR8yMuv4W84UwvSJAQA", "Pages Changed", "Total Pages of Changed");
+ public static final IAttributeType PagesReviewed = createType("AQR9qM8TTyCMb7sf4cQA", "Pages Reviewed", "Total Pages Reviewed");
+ public static final IAttributeType PercentRework = createType("AAMFEdKfjl2TII9+tuwA", "Percent Rework");
+ public static final IAttributeType PercentComplete = createType("AALLbOZiBBDN39YsRSAA", "Percent Complete");
- public static final IAttributeType Points = new AtsAttributeTypes("AY2EeqhzcDEGtXtREkAA", "Points", "Abstract value that describes risk, complexity, and size of Actions.");
- public static final IAttributeType PriorityType = new AtsAttributeTypes("AAMFEc8JzH1U6XGD59QA", "Priority", "1 = High; 5 = Low");
- public static final IAttributeType Problem = new AtsAttributeTypes("AAMFEdQUxRyevvTu+bwA", "Problem", "Problem found during analysis.");
- public static final IAttributeType ProposedResolution = new AtsAttributeTypes("AAMFEdSSRDGgBQ5tctAA", "Proposed Resolution", "Recommended resolution.");
- public static final IAttributeType RelatedToState = new AtsAttributeTypes("AAMFEdkwHULOmHbMbGgA", "Related To State", "State of parent workflow this object is related to.");
- public static final IAttributeType Released = new AtsAttributeTypes("AAMFEcnMoUZMLA2zB1AA", "Released", "True if object is in a released state.");
- public static final IAttributeType ReleaseDate = new AtsAttributeTypes("AAMFEc3+cGcMDOCdmdAA", "Release Date", "Date the changes were made available to the users.");
- public static final IAttributeType Resolution = new AtsAttributeTypes("AAMFEdUMfV1KdbQNaKwA", "Resolution", "Implementation details.");
- public static final IAttributeType ReviewBlocks = new AtsAttributeTypes("AAMFEc6G2A8jmRWJgagA", "Review Blocks", "Review Completion will block it's parent workflow in this manner.");
- public static final IAttributeType ReviewDefect = new AtsAttributeTypes("AAMFEd+MSVAb8JQ6f5gA", "Review Defect");
- public static final IAttributeType Role = new AtsAttributeTypes("AAMFEeCqMz0XCSBJ+IQA", "Role");
- public static final IAttributeType RuleDefinition = new AtsAttributeTypes("AEqAJNnkyW4_d5_WhpgA", "Rule Definition");
- public static final IAttributeType SmaNote = new AtsAttributeTypes("AAMFEdm7ywte8qayfbAA", "SMA Note", "Notes applicable to ATS object");
- public static final IAttributeType State = new AtsAttributeTypes("AAMFEdMa3wzVvp60xLQA", "State", "States of workflow state machine.");
- public static final IAttributeType StateNotes = new AtsAttributeTypes("AAMFEdiWPm7M_xV1EswA", "State Notes");
- public static final IAttributeType TeamDefinition = new AtsAttributeTypes("AAMFEdd5bFEe18bd0lQA", "Team Definition");
- public static final IAttributeType TeamUsesVersions = new AtsAttributeTypes("AAMFEcrHnzPxQ7w3ligA", "Team Uses Versions", "True if Team Workflow uses versioning/releasing option.");
- public static final IAttributeType Title = new AtsAttributeTypes(CoreAttributeTypes.Name.getGuid(), CoreAttributeTypes.Name.getName(), "Enter clear and consise title that can be generally understood.");
- public static final IAttributeType UserCommunity = new AtsAttributeTypes("AAMFEdAPtAq1IEwiCQAA", "User Community", "If working in one of these communities resulted in the creation of this Action, please select. Otherwise, select Other.");
- public static final IAttributeType ValidationRequired = new AtsAttributeTypes("AAMFEcjT0TwkD2R4w1QA", "Validation Required", "If selected, originator will be asked to validate the implementation.");
- public static final IAttributeType VersionLocked = new AtsAttributeTypes("AAzRtEJXbjzR5jySOZgA", "Version Locked", "True if version artifact is locked.");
- public static final IAttributeType WeeklyBenefit = new AtsAttributeTypes("AAMFEdEnEU9AecOHMOwA", "Weekly Benefit", "Estimated number of hours that will be saved over a single year if this change is completed.");
- // used in 0.9.8; un-used in 0.9.9; replaced with another attribute to not to collide with 0.9.8 code
- public static final IAttributeType WorkflowDefinition = new AtsAttributeTypes("ADG50fkFrQIxmfZgk3gA", "Workflow Definition", "Specific work flow definition id used by this Workflow artifact");
- // used in 0.9.8; un-used in 0.9.9; replaced with another attribute to not to collide with 0.9.8 code
- public static final IAttributeType RelatedTaskWorkflowDefinition = new AtsAttributeTypes("AdR02A0xcUq4arK58BAA", "Related Task Workflow Definition", "Specific work flow definition id used by Tasks related to this Workflow");
- public static final IAttributeType WorkPackage = new AtsAttributeTypes("AAMFEdpJqRp2wvA2qvAA", "Work Package", "Designated accounting work package for completing workflow.");
+ public static final IAttributeType Points = createType("AY2EeqhzcDEGtXtREkAA", "Points", "Abstract value that describes risk, complexity, and size of Actions.");
+ public static final IAttributeType PriorityType = createType("AAMFEc8JzH1U6XGD59QA", "Priority", "1 = High; 5 = Low");
+ public static final IAttributeType Problem = createType("AAMFEdQUxRyevvTu+bwA", "Problem", "Problem found during analysis.");
+ public static final IAttributeType ProposedResolution = createType("AAMFEdSSRDGgBQ5tctAA", "Proposed Resolution", "Recommended resolution.");
+ public static final IAttributeType RelatedToState = createType("AAMFEdkwHULOmHbMbGgA", "Related To State", "State of parent workflow this object is related to.");
+ public static final IAttributeType Released = createType("AAMFEcnMoUZMLA2zB1AA", "Released", "True if object is in a released state.");
+ public static final IAttributeType ReleaseDate = createType("AAMFEc3+cGcMDOCdmdAA", "Release Date", "Date the changes were made available to the users.");
+ public static final IAttributeType Resolution = createType("AAMFEdUMfV1KdbQNaKwA", "Resolution", "Implementation details.");
+ public static final IAttributeType ReviewBlocks = createType("AAMFEc6G2A8jmRWJgagA", "Review Blocks", "Review Completion will block it's parent workflow in this manner.");
+ public static final IAttributeType ReviewDefect = createType("AAMFEd+MSVAb8JQ6f5gA", "Review Defect");
+ public static final IAttributeType Role = createType("AAMFEeCqMz0XCSBJ+IQA", "Role");
+ public static final IAttributeType RuleDefinition = createType("AEqAJNnkyW4_d5_WhpgA", "Rule Definition");
+ public static final IAttributeType SmaNote = createType("AAMFEdm7ywte8qayfbAA", "SMA Note", "Notes applicable to ATS object");
+ public static final IAttributeType State = createType("AAMFEdMa3wzVvp60xLQA", "State", "States of workflow state machine.");
+ public static final IAttributeType StateNotes = createType("AAMFEdiWPm7M_xV1EswA", "State Notes");
+ public static final IAttributeType TeamDefinition = createType("AAMFEdd5bFEe18bd0lQA", "Team Definition");
+ public static final IAttributeType TeamUsesVersions = createType("AAMFEcrHnzPxQ7w3ligA", "Team Uses Versions", "True if Team Workflow uses versioning/releasing option.");
+ public static final IAttributeType Title = createType(CoreAttributeTypes.Name.getGuid(), CoreAttributeTypes.Name.getName(), "Enter clear and consise title that can be generally understood.");
+ public static final IAttributeType UserCommunity = createType("AAMFEdAPtAq1IEwiCQAA", "User Community", "If working in one of these communities resulted in the creation of this Action, please select. Otherwise, select Other.");
+ public static final IAttributeType ValidationRequired = createType("AAMFEcjT0TwkD2R4w1QA", "Validation Required", "If selected, originator will be asked to validate the implementation.");
+ public static final IAttributeType VersionLocked = createType("AAzRtEJXbjzR5jySOZgA", "Version Locked", "True if version artifact is locked.");
+ public static final IAttributeType WeeklyBenefit = createType("AAMFEdEnEU9AecOHMOwA", "Weekly Benefit", "Estimated number of hours that will be saved over a single year if this change is completed.");
+ public static final IAttributeType WorkflowDefinition = createType("ADG50fkFrQIxmfZgk3gA", "Workflow Definition", "Specific work flow definition id used by this Workflow artifact");
+ public static final IAttributeType RelatedTaskWorkflowDefinition = createType("AdR02A0xcUq4arK58BAA", "Related Task Workflow Definition", "Specific work flow definition id used by Tasks related to this Workflow");
+ public static final IAttributeType WorkPackage = createType("AAMFEdpJqRp2wvA2qvAA", "Work Package", "Designated accounting work package for completing workflow.");
// @formatter:on
- private AtsAttributeTypes(String guid, String name) {
- super(guid, "ats." + name);
+ private static IAttributeType createType(String guid, String name) {
+ return TokenFactory.createAttributeType(guid, "ats." + name);
}
- private AtsAttributeTypes(String guid, String name, String description) {
- super(guid, "ats." + name, description);
+ private static IAttributeType createType(String guid, String name, String description) {
+ return TokenFactory.createAttributeType(guid, "ats." + name, description);
}
} \ No newline at end of file
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 43130175a8c..8eaa2dc2916 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
@@ -214,8 +214,8 @@ public class TeamDefinitionArtifact extends Artifact implements ICommitConfigArt
TeamDefinitionArtifact.class));
}
- public static TeamDefinitionArtifact getTopTeamDefinition() throws OseeCoreException {
- return (TeamDefinitionArtifact) AtsArtifactToken.get(AtsArtifactToken.TopTeamDefinition);
+ public static TeamDefinitionArtifact getTopTeamDefinition() {
+ return (TeamDefinitionArtifact) AtsUtil.getFromToken(AtsArtifactToken.TopTeamDefinition);
}
public static Set<TeamDefinitionArtifact> getTeamReleaseableDefinitions(Active active) throws OseeCoreException {
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 be88c9c3bc9..5fde29967df 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
@@ -128,7 +128,7 @@ public class AtsConfigManager extends AbstractOperation {
}
teamDefinition.addRelation(AtsRelationTypes.TeamLead_Lead, UserManager.getUser());
teamDefinition.addRelation(AtsRelationTypes.TeamMember_Member, UserManager.getUser());
- AtsArtifactToken.get(AtsArtifactToken.TopTeamDefinition).addChild(teamDefinition);
+ AtsUtil.getFromToken(AtsArtifactToken.TopTeamDefinition).addChild(teamDefinition);
teamDefinition.persist(transaction);
return teamDefinition;
}
@@ -143,7 +143,7 @@ public class AtsConfigManager extends AbstractOperation {
topAia.setSoleAttributeValue(AtsAttributeTypes.Actionable, false);
topAia.persist(transaction);
- AtsArtifactToken.get(AtsArtifactToken.TopActionableItem).addChild(topAia);
+ AtsUtil.getFromToken(AtsArtifactToken.TopActionableItem).addChild(topAia);
teamDefinition.addRelation(AtsRelationTypes.TeamActionableItem_ActionableItem, topAia);
teamDefinition.persist(transaction);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java
index eb2028f4e5e..306a1288dbb 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsDatabaseConfig.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.ats.config;
-import java.util.Arrays;
import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
import org.eclipse.osee.ats.artifact.AtsArtifactToken;
import org.eclipse.osee.ats.artifact.AtsAttributeTypes;
@@ -23,7 +22,9 @@ import org.eclipse.osee.ats.workflow.flow.SimpleWorkflowDefinition;
import org.eclipse.osee.ats.workflow.flow.TaskWorkflowDefinition;
import org.eclipse.osee.ats.workflow.flow.TeamWorkflowDefinition;
import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
+import org.eclipse.osee.framework.core.data.IArtifactToken;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.database.init.IDbInitializationTask;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -64,20 +65,29 @@ public class AtsDatabaseConfig implements IDbInitializationTask {
}
public static void createAtsFolders() throws OseeCoreException {
- SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "Create ATS Folders");
+ Branch atsBranch = AtsUtil.getAtsBranch();
+ SkynetTransaction transaction = new SkynetTransaction(atsBranch, "Create ATS Folders");
- Artifact headingArt = OseeSystemArtifacts.getOrCreateArtifact(AtsArtifactToken.HeadingFolder);
+ Artifact headingArt = OseeSystemArtifacts.getOrCreateArtifact(AtsArtifactToken.HeadingFolder, atsBranch);
if (!headingArt.hasParent()) {
- Artifact rootArt = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(AtsUtil.getAtsBranch());
+ Artifact rootArt = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(atsBranch);
rootArt.addChild(headingArt);
headingArt.persist(transaction);
}
- for (AtsArtifactToken token : Arrays.asList(AtsArtifactToken.TopActionableItem,
- AtsArtifactToken.TopTeamDefinition, AtsArtifactToken.ConfigFolder, //
- AtsArtifactToken.WorkDefinitionsFolder, AtsArtifactToken.WorkFlowsFolder, //
- AtsArtifactToken.WorkPagesFolder, AtsArtifactToken.WorkWidgetsFolder, //
- AtsArtifactToken.WorkRulesFolder)) {
- Artifact art = OseeSystemArtifacts.getOrCreateArtifact(token);
+
+ IArtifactToken[] tokens =
+ new IArtifactToken[] {
+ AtsArtifactToken.TopActionableItem,
+ AtsArtifactToken.TopTeamDefinition,
+ AtsArtifactToken.ConfigFolder,
+ AtsArtifactToken.WorkDefinitionsFolder,
+ AtsArtifactToken.WorkFlowsFolder,
+ AtsArtifactToken.WorkPagesFolder,
+ AtsArtifactToken.WorkWidgetsFolder,
+ AtsArtifactToken.WorkRulesFolder};
+
+ for (IArtifactToken token : tokens) {
+ Artifact art = OseeSystemArtifacts.getOrCreateArtifact(token, atsBranch);
headingArt.addChild(art);
art.persist(transaction);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java
index d171b3a3c96..b9d55d3625b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsLoadConfigArtifactsOperation.java
@@ -16,6 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.ats.artifact.AtsArtifactToken;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsRelationTypes;
+import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
@@ -43,7 +44,7 @@ public class AtsLoadConfigArtifactsOperation extends AbstractOperation {
if (!loaded) {
loaded = true;
OseeLog.log(AtsPlugin.class, Level.INFO, "Loading ATS Configuration");
- Artifact headingArt = AtsArtifactToken.get(AtsArtifactToken.HeadingFolder);
+ Artifact headingArt = AtsUtil.getFromToken(AtsArtifactToken.HeadingFolder);
// Loading artifacts will cache them in ArtifactCache
RelationManager.getRelatedArtifacts(Collections.singleton(headingArt), 8,
CoreRelationTypes.Default_Hierarchical__Child, AtsRelationTypes.TeamDefinitionToVersion_Version);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java
index 7bbc1f38768..bc0e66165b7 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java
@@ -19,10 +19,10 @@ import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.widgets.dialog.AICheckTreeDialog;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.Active;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -45,7 +45,7 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
*/
public class SMARelationsHyperlinkComposite extends Composite {
- private static IRelationEnumeration[] sides = new IRelationEnumeration[] {
+ private static IRelationTypeSide[] sides = new IRelationTypeSide[] {
AtsRelationTypes.TeamWorkflowToReview_Review,
AtsRelationTypes.TeamWorkflowToReview_Team,
CoreRelationTypes.Supercedes_Superceded,
@@ -91,7 +91,7 @@ public class SMARelationsHyperlinkComposite extends Composite {
}
public static boolean relationExists(AbstractWorkflowArtifact smaArt) throws OseeCoreException {
- for (IRelationEnumeration side : sides) {
+ for (IRelationTypeSide side : sides) {
if (smaArt.getRelatedArtifacts(side).size() > 0) {
return true;
}
@@ -112,7 +112,7 @@ public class SMARelationsHyperlinkComposite extends Composite {
return "";
}
- private void createArtifactRelationHyperlinks(String prefix, Artifact thisArt, String action, IRelationEnumeration relationEnum) throws OseeCoreException {
+ private void createArtifactRelationHyperlinks(String prefix, Artifact thisArt, String action, IRelationTypeSide relationEnum) throws OseeCoreException {
for (final Artifact art : thisArt.getRelatedArtifacts(relationEnum)) {
createLink(art, prefix, action, thisArt);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactTypes.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactTypes.java
index 4b9a7d15b91..5283c738b6e 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactTypes.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsArtifactTypes.java
@@ -11,27 +11,27 @@
package org.eclipse.osee.ats.util;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
-public class AtsArtifactTypes extends NamedIdentity implements IArtifactType {
+public final class AtsArtifactTypes {
// @formatter:off
- public static final IArtifactType Action = new AtsArtifactTypes("AAMFDhY_rns71KvX14QA", "Action");
- public static final IArtifactType ActionableItem = new AtsArtifactTypes("AAMFDhW2LmhtRFsVyzwA", "Actionable Item");
- public static final IArtifactType DecisionReview = new AtsArtifactTypes("AAMFDhfrdR7BGTL7H_wA", "Decision Review");
- public static final IArtifactType PeerToPeerReview = new AtsArtifactTypes("AAMFDhh_300dpgmNtRAA", "PeerToPeer Review");
- public static final IArtifactType Task = new AtsArtifactTypes("AAMFDhbTAAB6h+06fuAA", "Task");
- public static final IArtifactType StateMachineArtifact = new AtsArtifactTypes("ABMfXC+LFBn31ZZbvjAA", "Abstract State Machine Artifact");
- public static final IArtifactType ReviewArtifact = new AtsArtifactTypes("ABMa6P4TwzXA1b8K3RAA", "Abstract Review Artifact");
- public static final IArtifactType TeamDefinition = new AtsArtifactTypes("AAMFDhUrlytusKbaQGAA", "Team Definition");
- public static final IArtifactType TeamWorkflow = new AtsArtifactTypes("AAMFDhSiF2OD+wiUqugA", "Team Workflow");
- public static final IArtifactType Version = new AtsArtifactTypes("AAMFDhder0oETnv14xQA", "Version");
- public static final IArtifactType Goal = new AtsArtifactTypes("ABMgU119UjI_Q23Yu+gA", "Goal");
- public static final IArtifactType AtsArtifact = new AtsArtifactTypes("ABMaLS0jvw92SE+4ZJQA", "ats.Ats Artifact");
- public static final IArtifactType WorkDefinition = new AtsArtifactTypes("AGrU8fWa3AJ6uoWYP7wA", "Work Definition");
+ public static final IArtifactType Action = TokenFactory.createArtifactType("AAMFDhY_rns71KvX14QA", "Action");
+ public static final IArtifactType ActionableItem = TokenFactory.createArtifactType("AAMFDhW2LmhtRFsVyzwA", "Actionable Item");
+ public static final IArtifactType DecisionReview = TokenFactory.createArtifactType("AAMFDhfrdR7BGTL7H_wA", "Decision Review");
+ public static final IArtifactType PeerToPeerReview = TokenFactory.createArtifactType("AAMFDhh_300dpgmNtRAA", "PeerToPeer Review");
+ public static final IArtifactType Task = TokenFactory.createArtifactType("AAMFDhbTAAB6h+06fuAA", "Task");
+ public static final IArtifactType StateMachineArtifact = TokenFactory.createArtifactType("ABMfXC+LFBn31ZZbvjAA", "Abstract State Machine Artifact");
+ public static final IArtifactType ReviewArtifact = TokenFactory.createArtifactType("ABMa6P4TwzXA1b8K3RAA", "Abstract Review Artifact");
+ public static final IArtifactType TeamDefinition = TokenFactory.createArtifactType("AAMFDhUrlytusKbaQGAA", "Team Definition");
+ public static final IArtifactType TeamWorkflow = TokenFactory.createArtifactType("AAMFDhSiF2OD+wiUqugA", "Team Workflow");
+ public static final IArtifactType Version = TokenFactory.createArtifactType("AAMFDhder0oETnv14xQA", "Version");
+ public static final IArtifactType Goal = TokenFactory.createArtifactType("ABMgU119UjI_Q23Yu+gA", "Goal");
+ public static final IArtifactType AtsArtifact = TokenFactory.createArtifactType("ABMaLS0jvw92SE+4ZJQA", "ats.Ats Artifact");
+ public static final IArtifactType WorkDefinition = TokenFactory.createArtifactType("AGrU8fWa3AJ6uoWYP7wA", "Work Definition");
// @formatter:on
- private AtsArtifactTypes(String guid, String name) {
- super(guid, name);
+ private AtsArtifactTypes() {
+ // Constants
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsRelationTypes.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsRelationTypes.java
index e43721d32ed..5ee28ccfe1b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsRelationTypes.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsRelationTypes.java
@@ -10,95 +10,93 @@
*******************************************************************************/
package org.eclipse.osee.ats.util;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
/**
* @author Donald G. Dunne
*/
-public class AtsRelationTypes extends NamedIdentity implements IRelationEnumeration {
- private final RelationSide relationSide;
+public final class AtsRelationTypes {
- public static final AtsRelationTypes ActionToWorkflow_Action = new AtsRelationTypes(RelationSide.SIDE_A,
- "AAMFE953ixQThusHUPwA", "ActionToWorkflow");
- public static final AtsRelationTypes ActionToWorkflow_WorkFlow = new AtsRelationTypes(RelationSide.SIDE_B,
- "AAMFE953ixQThusHUPwA", "ActionToWorkflow");
- public static final AtsRelationTypes FavoriteUser_Artifact = new AtsRelationTypes(RelationSide.SIDE_A,
+ public static final IRelationTypeSide ActionToWorkflow_Action = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_A, "AAMFE953ixQThusHUPwA", "ActionToWorkflow");
+ public static final IRelationTypeSide ActionToWorkflow_WorkFlow = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_B, "AAMFE953ixQThusHUPwA", "ActionToWorkflow");
+ public static final IRelationTypeSide FavoriteUser_Artifact = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_A, "AAMFE+NegDLK1g2ph+AA", "FavoriteUser");
+ public static final IRelationTypeSide FavoriteUser_User = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
"AAMFE+NegDLK1g2ph+AA", "FavoriteUser");
- public static final AtsRelationTypes FavoriteUser_User = new AtsRelationTypes(RelationSide.SIDE_B,
- "AAMFE+NegDLK1g2ph+AA", "FavoriteUser");
- public static final AtsRelationTypes Goal_Goal = new AtsRelationTypes(RelationSide.SIDE_A, "ABMn0wPKdyN+Mfo5nwgA",
- "Goal");
- public static final AtsRelationTypes Goal_Member = new AtsRelationTypes(RelationSide.SIDE_B, "ABMn0wPKdyN+Mfo5nwgA",
- "Goal");
- public static final AtsRelationTypes ParallelVersion_Child = new AtsRelationTypes(RelationSide.SIDE_B,
- "AAMFE_EJHSBGb9msPXQA", "ParallelVersion");
- public static final AtsRelationTypes ParallelVersion_Parent = new AtsRelationTypes(RelationSide.SIDE_A,
- "AAMFE_EJHSBGb9msPXQA", "ParallelVersion");
- public static final AtsRelationTypes PrivilegedMember_Member = new AtsRelationTypes(RelationSide.SIDE_B,
- "AAMFE9XfiibyK1x2FiwA", "PrivilegedMember");
- public static final AtsRelationTypes PrivilegedMember_Team = new AtsRelationTypes(RelationSide.SIDE_A,
- "AAMFE9XfiibyK1x2FiwA", "PrivilegedMember");
- public static final AtsRelationTypes SmaToTask_Sma = new AtsRelationTypes(RelationSide.SIDE_A,
+ public static final IRelationTypeSide Goal_Goal = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A,
+ "ABMn0wPKdyN+Mfo5nwgA", "Goal");
+ public static final IRelationTypeSide Goal_Member = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
+ "ABMn0wPKdyN+Mfo5nwgA", "Goal");
+ public static final IRelationTypeSide ParallelVersion_Child = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_B, "AAMFE_EJHSBGb9msPXQA", "ParallelVersion");
+ public static final IRelationTypeSide ParallelVersion_Parent = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_A, "AAMFE_EJHSBGb9msPXQA", "ParallelVersion");
+ public static final IRelationTypeSide PrivilegedMember_Member = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_B, "AAMFE9XfiibyK1x2FiwA", "PrivilegedMember");
+ public static final IRelationTypeSide PrivilegedMember_Team = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_A, "AAMFE9XfiibyK1x2FiwA", "PrivilegedMember");
+ public static final IRelationTypeSide SmaToTask_Sma = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A,
"AAMFE97xw1BM5l+GxKAA", "SmaToTask");
- public static final AtsRelationTypes SmaToTask_Task = new AtsRelationTypes(RelationSide.SIDE_B,
+ public static final IRelationTypeSide SmaToTask_Task = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
"AAMFE97xw1BM5l+GxKAA", "SmaToTask");
- public static final AtsRelationTypes SubscribedUser_Artifact = new AtsRelationTypes(RelationSide.SIDE_A,
- "AAMFE+LkSAkfUWoTHdwA", "SubscribedUser");
- public static final AtsRelationTypes SubscribedUser_User = new AtsRelationTypes(RelationSide.SIDE_B,
+ public static final IRelationTypeSide SubscribedUser_Artifact = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_A, "AAMFE+LkSAkfUWoTHdwA", "SubscribedUser");
+ public static final IRelationTypeSide SubscribedUser_User = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
"AAMFE+LkSAkfUWoTHdwA", "SubscribedUser");
- public static final AtsRelationTypes TeamActionableItem_ActionableItem = new AtsRelationTypes(RelationSide.SIDE_B,
- "AAMFE939Ul9Oenq9wWgA", "TeamActionableItem");
- public static final AtsRelationTypes TeamActionableItem_Team = new AtsRelationTypes(RelationSide.SIDE_A,
- "AAMFE939Ul9Oenq9wWgA", "TeamActionableItem");
- public static final AtsRelationTypes TeamDefinitionToDecisionReviewWorkflowDiagram_TeamDefinition =
- new AtsRelationTypes(RelationSide.SIDE_A, "AAMFE+Fg4RmKrda_jJQA", "TeamDefinitionToDecisionReviewWorkflowDiagram");
- public static final AtsRelationTypes TeamDefinitionToDecisionReviewWorkflowDiagram_WorkflowDiagram =
- new AtsRelationTypes(RelationSide.SIDE_B, "AAMFE+Fg4RmKrda_jJQA", "TeamDefinitionToDecisionReviewWorkflowDiagram");
- public static final AtsRelationTypes TeamDefinitionToPeerToPeerReviewWorkflowDiagram_TeamDefinition =
- new AtsRelationTypes(RelationSide.SIDE_A, "AAMFE+HqYUG262IxMFwA",
+ public static final IRelationTypeSide TeamActionableItem_ActionableItem = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_B, "AAMFE939Ul9Oenq9wWgA", "TeamActionableItem");
+ public static final IRelationTypeSide TeamActionableItem_Team = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_A, "AAMFE939Ul9Oenq9wWgA", "TeamActionableItem");
+ public static final IRelationTypeSide TeamDefinitionToDecisionReviewWorkflowDiagram_TeamDefinition =
+ TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, "AAMFE+Fg4RmKrda_jJQA",
+ "TeamDefinitionToDecisionReviewWorkflowDiagram");
+ public static final IRelationTypeSide TeamDefinitionToDecisionReviewWorkflowDiagram_WorkflowDiagram =
+ TokenFactory.createRelationTypeSide(RelationSide.SIDE_B, "AAMFE+Fg4RmKrda_jJQA",
+ "TeamDefinitionToDecisionReviewWorkflowDiagram");
+ public static final IRelationTypeSide TeamDefinitionToPeerToPeerReviewWorkflowDiagram_TeamDefinition =
+ TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, "AAMFE+HqYUG262IxMFwA",
"TeamDefinitionToPeerToPeerReviewWorkflowDiagram");
- public static final AtsRelationTypes TeamDefinitionToPeerToPeerReviewWorkflowDiagram_WorkflowDiagram =
- new AtsRelationTypes(RelationSide.SIDE_B, "AAMFE+HqYUG262IxMFwA",
+ public static final IRelationTypeSide TeamDefinitionToPeerToPeerReviewWorkflowDiagram_WorkflowDiagram =
+ TokenFactory.createRelationTypeSide(RelationSide.SIDE_B, "AAMFE+HqYUG262IxMFwA",
"TeamDefinitionToPeerToPeerReviewWorkflowDiagram");
- public static final AtsRelationTypes TeamDefinitionToTaskWorkflowDiagram_TeamDefinition = new AtsRelationTypes(
- RelationSide.SIDE_A, "AAMFE+DkeQ9mRBPca0QA", "TeamDefinitionToTaskWorkflowDiagram");
- public static final AtsRelationTypes TeamDefinitionToTaskWorkflowDiagram_WorkflowDiagram = new AtsRelationTypes(
- RelationSide.SIDE_B, "AAMFE+DkeQ9mRBPca0QA", "TeamDefinitionToTaskWorkflowDiagram");
- public static final AtsRelationTypes TeamDefinitionToVersion_TeamDefinition = new AtsRelationTypes(
+ public static final IRelationTypeSide TeamDefinitionToTaskWorkflowDiagram_TeamDefinition =
+ TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, "AAMFE+DkeQ9mRBPca0QA",
+ "TeamDefinitionToTaskWorkflowDiagram");
+ public static final IRelationTypeSide TeamDefinitionToTaskWorkflowDiagram_WorkflowDiagram =
+ TokenFactory.createRelationTypeSide(RelationSide.SIDE_B, "AAMFE+DkeQ9mRBPca0QA",
+ "TeamDefinitionToTaskWorkflowDiagram");
+ public static final IRelationTypeSide TeamDefinitionToVersion_TeamDefinition = TokenFactory.createRelationTypeSide(
RelationSide.SIDE_A, "AAMFE9_i7zG3lR1kGWQA", "TeamDefinitionToVersion");
- public static final AtsRelationTypes TeamDefinitionToVersion_Version = new AtsRelationTypes(RelationSide.SIDE_B,
- "AAMFE9_i7zG3lR1kGWQA", "TeamDefinitionToVersion");
- public static final AtsRelationTypes TeamDefinitionToWorkflowDiagram_TeamDefinition = new AtsRelationTypes(
- RelationSide.SIDE_A, "AAMFE+BpKTGewbN8c3gA", "TeamDefinitionToWorkflowDiagram");
- public static final AtsRelationTypes TeamDefinitionToWorkflowDiagram_WorkflowDiagram = new AtsRelationTypes(
- RelationSide.SIDE_B, "AAMFE+BpKTGewbN8c3gA", "TeamDefinitionToWorkflowDiagram");
- public static final AtsRelationTypes TeamLead_Lead = new AtsRelationTypes(RelationSide.SIDE_B,
+ public static final IRelationTypeSide TeamDefinitionToVersion_Version = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_B, "AAMFE9_i7zG3lR1kGWQA", "TeamDefinitionToVersion");
+ public static final IRelationTypeSide TeamDefinitionToWorkflowDiagram_TeamDefinition =
+ TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, "AAMFE+BpKTGewbN8c3gA",
+ "TeamDefinitionToWorkflowDiagram");
+ public static final IRelationTypeSide TeamDefinitionToWorkflowDiagram_WorkflowDiagram =
+ TokenFactory.createRelationTypeSide(RelationSide.SIDE_B, "AAMFE+BpKTGewbN8c3gA",
+ "TeamDefinitionToWorkflowDiagram");
+ public static final IRelationTypeSide TeamLead_Lead = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
"AAMFE90HyTZPyHuQWOQA", "TeamLead");
- public static final AtsRelationTypes TeamLead_Team = new AtsRelationTypes(RelationSide.SIDE_A,
+ public static final IRelationTypeSide TeamLead_Team = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A,
"AAMFE90HyTZPyHuQWOQA", "TeamLead");
- public static final AtsRelationTypes TeamMember_Member = new AtsRelationTypes(RelationSide.SIDE_B,
+ public static final IRelationTypeSide TeamMember_Member = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
"AAMFE92A6gCO9WJ2ijQA", "TeamMember");
- public static final AtsRelationTypes TeamMember_Team = new AtsRelationTypes(RelationSide.SIDE_A,
+ public static final IRelationTypeSide TeamMember_Team = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A,
"AAMFE92A6gCO9WJ2ijQA", "TeamMember");
- public static final AtsRelationTypes TeamWorkflowTargetedForVersion_Version = new AtsRelationTypes(
+ public static final IRelationTypeSide TeamWorkflowTargetedForVersion_Version = TokenFactory.createRelationTypeSide(
RelationSide.SIDE_B, "AAMFE99pzm4zSibDT9gA", "TeamWorkflowTargetedForVersion");
- public static final AtsRelationTypes TeamWorkflowTargetedForVersion_Workflow = new AtsRelationTypes(
+ public static final IRelationTypeSide TeamWorkflowTargetedForVersion_Workflow = TokenFactory.createRelationTypeSide(
RelationSide.SIDE_A, "AAMFE99pzm4zSibDT9gA", "TeamWorkflowTargetedForVersion");
- public static final AtsRelationTypes TeamWorkflowToReview_Review = new AtsRelationTypes(RelationSide.SIDE_B,
- "AAMFE+JqDz+8tuRDdIwA", "TeamWorkflowToReview");
- public static final AtsRelationTypes TeamWorkflowToReview_Team = new AtsRelationTypes(RelationSide.SIDE_A,
- "AAMFE+JqDz+8tuRDdIwA", "TeamWorkflowToReview");
+ public static final IRelationTypeSide TeamWorkflowToReview_Review = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_B, "AAMFE+JqDz+8tuRDdIwA", "TeamWorkflowToReview");
+ public static final IRelationTypeSide TeamWorkflowToReview_Team = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_A, "AAMFE+JqDz+8tuRDdIwA", "TeamWorkflowToReview");
- private AtsRelationTypes(RelationSide relationSide, String guid, String name) {
- super(guid, name);
- this.relationSide = relationSide;
+ private AtsRelationTypes() {
+ // Constants
}
-
- @Override
- public RelationSide getSide() {
- return relationSide;
- }
-
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
index 54d6065bc67..9af296e20f1 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
@@ -39,6 +39,7 @@ import org.eclipse.osee.ats.world.WorldEditorSimpleProvider;
import org.eclipse.osee.ats.world.WorldEditorUISearchItemProvider;
import org.eclipse.osee.ats.world.search.GroupWorldSearchItem;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
+import org.eclipse.osee.framework.core.data.IArtifactToken;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.Active;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -521,4 +522,14 @@ public final class AtsUtil {
}
return useNewWorkDefintions;
}
+
+ public static Artifact getFromToken(IArtifactToken token) {
+ Artifact toReturn = null;
+ try {
+ toReturn = ArtifactQuery.getArtifactFromToken(token, getAtsBranchToken());
+ } catch (OseeCoreException ex) {
+ // Do Nothing;
+ }
+ return toReturn;
+ }
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java
index 2f27d30a92a..374e06dee88 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java
@@ -21,8 +21,8 @@ import org.eclipse.osee.ats.artifact.TaskArtifact;
import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.artifact.log.AtsLog;
import org.eclipse.osee.ats.internal.AtsPlugin;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
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.AHTML.CellItem;
@@ -209,7 +209,7 @@ public class Overview {
}
@SuppressWarnings("deprecation")
- public void addRelationTable(String name, IRelationEnumeration side, Artifact parent) {
+ public void addRelationTable(String name, IRelationTypeSide side, Artifact parent) {
try {
List<Artifact> arts = parent.getRelatedArtifacts(side);
if (arts.isEmpty()) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationSetRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationSetRule.java
index 4d82654b045..64b2dd60ccd 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationSetRule.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/RelationSetRule.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.ats.util.validate;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
/**
@@ -20,9 +20,9 @@ import org.eclipse.osee.framework.core.model.type.ArtifactType;
public final class RelationSetRule {
private final IArtifactType artifactType;
private final Integer minimumRelations;
- private final IRelationEnumeration relationEnum;
+ private final IRelationTypeSide relationEnum;
- public RelationSetRule(IArtifactType artifactType, IRelationEnumeration relationEnum, Integer minimumRelations) {
+ public RelationSetRule(IArtifactType artifactType, IRelationTypeSide relationEnum, Integer minimumRelations) {
this.artifactType = artifactType;
this.relationEnum = relationEnum;
this.minimumRelations = minimumRelations;
@@ -41,7 +41,7 @@ public final class RelationSetRule {
return "For \"" + artifactType + "\", ensure at least " + minimumRelations + " relations(s) of type \"" + relationEnum + "\" exists";
}
- public IRelationEnumeration getRelationEnum() {
+ public IRelationTypeSide getRelationEnum() {
return relationEnum;
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java
index 440f86648f2..fe167daada8 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java
@@ -69,7 +69,7 @@ public final class AtsWorkDefinitionSheetProviders {
public static void initializeDatabase() throws OseeCoreException {
SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), "Import ATS Work Definitions");
- Artifact folder = AtsArtifactToken.get(AtsArtifactToken.WorkDefinitionsFolder);
+ Artifact folder = AtsUtil.getFromToken(AtsArtifactToken.WorkDefinitionsFolder);
for (WorkDefinitionSheet sheet : getWorkDefinitionSheets()) {
if (isValidSheet(sheet)) {
String logStr = String.format("Importing ATS sheet [%s]", sheet.getName());
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java
index e3af3f1232e..b3849bfe2d0 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/item/AtsWorkDefinitions.java
@@ -389,16 +389,16 @@ public final class AtsWorkDefinitions implements IWorkDefinitionProvider {
// Relate if not already related
if (art.getRelatedArtifacts(CoreRelationTypes.WorkItem__Parent, Artifact.class).isEmpty()) {
if (art.isOfType(CoreArtifactTypes.WorkPageDefinition)) {
- relateIfNotRelated(AtsArtifactToken.get(AtsArtifactToken.WorkPagesFolder), art, transaction);
+ relateIfNotRelated(AtsUtil.getFromToken(AtsArtifactToken.WorkPagesFolder), art, transaction);
}
if (art.isOfType(CoreArtifactTypes.WorkRuleDefinition)) {
- relateIfNotRelated(AtsArtifactToken.get(AtsArtifactToken.WorkRulesFolder), art, transaction);
+ relateIfNotRelated(AtsUtil.getFromToken(AtsArtifactToken.WorkRulesFolder), art, transaction);
}
if (art.isOfType(CoreArtifactTypes.WorkWidgetDefinition)) {
- relateIfNotRelated(AtsArtifactToken.get(AtsArtifactToken.WorkWidgetsFolder), art, transaction);
+ relateIfNotRelated(AtsUtil.getFromToken(AtsArtifactToken.WorkWidgetsFolder), art, transaction);
}
if (art.isOfType(CoreArtifactTypes.WorkFlowDefinition)) {
- relateIfNotRelated(AtsArtifactToken.get(AtsArtifactToken.WorkFlowsFolder), art, transaction);
+ relateIfNotRelated(AtsUtil.getFromToken(AtsArtifactToken.WorkFlowsFolder), art, transaction);
}
}
}
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 b00a612aca3..12de28dee42 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
@@ -29,8 +29,8 @@ import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsRelationTypes;
import org.eclipse.osee.ats.util.widgets.ReviewManager;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -157,7 +157,7 @@ public class WorldContentProvider implements ITreeContentProvider {
if (workflow instanceof TaskArtifact) {
return false;
}
- for (IRelationEnumeration iRelationEnumeration : workflow.getAtsWorldRelations()) {
+ for (IRelationTypeSide iRelationEnumeration : workflow.getAtsWorldRelations()) {
if (workflow.getRelatedArtifactsCount(iRelationEnumeration) > 0) {
return true;
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactTypes.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactTypes.java
index df3de999e94..f35ac25cd60 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactTypes.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageArtifactTypes.java
@@ -11,20 +11,20 @@
package org.eclipse.osee.coverage.store;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
/**
* @author Don Dunne
*/
-public final class CoverageArtifactTypes extends NamedIdentity implements IArtifactType {
+public final class CoverageArtifactTypes {
// @formatter:off
- public static final IArtifactType CoveragePackage = new CoverageArtifactTypes("AARFcyA9zyD3uEK8akgA", "Coverage Package");
- public static final IArtifactType CoverageUnit = new CoverageArtifactTypes("ALZS3MQdCCIUvEYlZeAA", "Coverage Unit");
- public static final IArtifactType CoverageFolder = new CoverageArtifactTypes("ALZR_AbpJTTf6QQn2iAA", "Coverage Folder");
+ public static final IArtifactType CoveragePackage = TokenFactory.createArtifactType("AARFcyA9zyD3uEK8akgA", "Coverage Package");
+ public static final IArtifactType CoverageUnit = TokenFactory.createArtifactType("ALZS3MQdCCIUvEYlZeAA", "Coverage Unit");
+ public static final IArtifactType CoverageFolder = TokenFactory.createArtifactType("ALZR_AbpJTTf6QQn2iAA", "Coverage Folder");
// @formatter:on
- private CoverageArtifactTypes(String guid, String name) {
- super(guid, name);
+ private CoverageArtifactTypes() {
+ // Constants
}
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributeTypes.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributeTypes.java
index 5069f66e5b9..93a18bec334 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributeTypes.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageAttributeTypes.java
@@ -11,26 +11,27 @@
package org.eclipse.osee.coverage.store;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
/**
* @author Ryan D. Brooks
*/
-public class CoverageAttributeTypes extends NamedIdentity implements IAttributeType {
+public final class CoverageAttributeTypes {
+
// @formatter:off
- public static final IAttributeType Assignees = new CoverageAttributeTypes("AARCA+XjSyKjnh3sweQA", "coverage.Assignees");
- public static final IAttributeType Item = new CoverageAttributeTypes("AARr8BmsQHKLOHNzOcQA", "coverage.Coverage Item");
- public static final IAttributeType Options = new CoverageAttributeTypes("AAF+8+sqyELZ2mdVV_AA", "coverage.Coverage Options");
- public static final IAttributeType FileContents = new CoverageAttributeTypes("AARDJK8YAT3SDnghjQgA", "coverage.File Contents");
- public static final IAttributeType Location = new CoverageAttributeTypes("AARA2XwhNRddgQrd0iwA", "coverage.Location");
- public static final IAttributeType Namespace = new CoverageAttributeTypes("AAQ_v6uUrh0j39+4D5gA", "coverage.Namespace");
- public static final IAttributeType WorkProductTaskGuid = new CoverageAttributeTypes("A+m7Y2sV2z83QUlkzIAA", "coverage.WorkProductTaskGuid");
- public static final IAttributeType WorkProductPcrGuid = new CoverageAttributeTypes("AWuQmRuq1gwrejEWRgAA", "coverage.WorkProductPcrGuid");
- public static final IAttributeType Notes = new CoverageAttributeTypes("AARERmIjazD1udUwfLgA", "coverage.Notes");
- public static final IAttributeType Order = new CoverageAttributeTypes("AD72opMBR1pFxB0hVpQA", "coverage.Order");
+ public static final IAttributeType Assignees = TokenFactory.createAttributeType("AARCA+XjSyKjnh3sweQA", "coverage.Assignees");
+ public static final IAttributeType Item = TokenFactory.createAttributeType("AARr8BmsQHKLOHNzOcQA", "coverage.Coverage Item");
+ public static final IAttributeType Options = TokenFactory.createAttributeType("AAF+8+sqyELZ2mdVV_AA", "coverage.Coverage Options");
+ public static final IAttributeType FileContents = TokenFactory.createAttributeType("AARDJK8YAT3SDnghjQgA", "coverage.File Contents");
+ public static final IAttributeType Location = TokenFactory.createAttributeType("AARA2XwhNRddgQrd0iwA", "coverage.Location");
+ public static final IAttributeType Namespace = TokenFactory.createAttributeType("AAQ_v6uUrh0j39+4D5gA", "coverage.Namespace");
+ public static final IAttributeType WorkProductTaskGuid = TokenFactory.createAttributeType("A+m7Y2sV2z83QUlkzIAA", "coverage.WorkProductTaskGuid");
+ public static final IAttributeType WorkProductPcrGuid = TokenFactory.createAttributeType("AWuQmRuq1gwrejEWRgAA", "coverage.WorkProductPcrGuid");
+ public static final IAttributeType Notes = TokenFactory.createAttributeType("AARERmIjazD1udUwfLgA", "coverage.Notes");
+ public static final IAttributeType Order = TokenFactory.createAttributeType("AD72opMBR1pFxB0hVpQA", "coverage.Order");
// @formatter:on
- private CoverageAttributeTypes(String guid, String name) {
- super(guid, name);
+ private CoverageAttributeTypes() {
+ // Constants
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageRelationTypes.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageRelationTypes.java
index a54a818446f..165cd7dcf89 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageRelationTypes.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/CoverageRelationTypes.java
@@ -10,43 +10,25 @@
*******************************************************************************/
package org.eclipse.osee.coverage.store;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
/**
* @author Donald G. Dunne
*/
-public class CoverageRelationTypes extends NamedIdentity implements IRelationEnumeration {
- private final RelationSide relationSide;
+public final class CoverageRelationTypes {
- public static final CoverageRelationTypes TeamWorkflowTargetedForVersion_Version = new CoverageRelationTypes(
+ public static final IRelationTypeSide TeamWorkflowTargetedForVersion_Version = TokenFactory.createRelationTypeSide(
RelationSide.SIDE_B, "AAMFE99pzm4zSibDT9gA", "TeamWorkflowTargetedForVersion");
- public static final CoverageRelationTypes TeamWorkflowTargetedForVersion_Workflow = new CoverageRelationTypes(
+ public static final IRelationTypeSide TeamWorkflowTargetedForVersion_Workflow = TokenFactory.createRelationTypeSide(
RelationSide.SIDE_A, "AAMFE99pzm4zSibDT9gA", "TeamWorkflowTargetedForVersion");
- public static final CoverageRelationTypes ActionToWorkflow_Action = new CoverageRelationTypes(RelationSide.SIDE_A,
- "AAMFE953ixQThusHUPwA", "ActionToWorkflow");
- public static final CoverageRelationTypes ActionToWorkflow_WorkFlow = new CoverageRelationTypes(RelationSide.SIDE_B,
- "AAMFE953ixQThusHUPwA", "ActionToWorkflow");
+ public static final IRelationTypeSide ActionToWorkflow_Action = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_A, "AAMFE953ixQThusHUPwA", "ActionToWorkflow");
+ public static final IRelationTypeSide ActionToWorkflow_WorkFlow = TokenFactory.createRelationTypeSide(
+ RelationSide.SIDE_B, "AAMFE953ixQThusHUPwA", "ActionToWorkflow");
- private CoverageRelationTypes(RelationSide relationSide, String guid, String name) {
- super(guid, name);
- this.relationSide = relationSide;
+ private CoverageRelationTypes() {
+ // Constants
}
-
- @Override
- public RelationSide getSide() {
- return relationSide;
- }
-
- @Override
- public int hashCode() {
- return super.hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- return super.equals(obj);
- }
-
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/jobs/ImportTraceUnitsOperationTest.java b/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/jobs/ImportTraceUnitsOperationTest.java
index 1e35201a316..004588d211c 100644
--- a/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/jobs/ImportTraceUnitsOperationTest.java
+++ b/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/jobs/ImportTraceUnitsOperationTest.java
@@ -18,7 +18,7 @@ import java.util.Collection;
import java.util.List;
import org.eclipse.osee.define.traceability.operations.ImportTraceUnitsOperation;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.OseeBranch;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -47,7 +47,7 @@ public final class ImportTraceUnitsOperationTest {
private static final String TEST_ONE_FILE = "ImportTraceUnitsTest1.txt";
private static final String TEST_TWO_FILE = "ImportTraceUnitsTest2.txt";
- private static final IOseeBranch TEST_BRANCH = new OseeBranch("Trace Unit Branch", "BIkSWxVrZClFHss6FTAA");
+ private static final IOseeBranch TEST_BRANCH = TokenFactory.createBranch("BIkSWxVrZClFHss6FTAA", "Trace Unit Branch");
private static final int RUNS = 3;
private Branch importToBranch;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java
index f34ba767caa..941d7e6ff8b 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java
@@ -36,8 +36,8 @@ import org.eclipse.osee.define.traceability.report.ArtifactToRelatedArtifact;
import org.eclipse.osee.define.traceability.report.ArtifactTraceCount;
import org.eclipse.osee.define.traceability.report.ArtifactsWithoutRelations;
import org.eclipse.osee.define.traceability.report.IReportDataCollector;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.Branch;
@@ -330,7 +330,7 @@ public class TraceReportBlam extends AbstractBlam {
private void addRelationToCheck(List<TraceTypeEnum> traceTypes, AbstractArtifactRelationReport report, boolean fromTraceUnit) {
for (TraceTypeEnum traceTypeEnum : traceTypes) {
- IRelationEnumeration relation =
+ IRelationTypeSide relation =
fromTraceUnit ? traceTypeEnum.getRelatedToRequirement() : traceTypeEnum.getRelatedToTraceUnit();
report.addRelationToCheck(relation);
}
@@ -395,21 +395,21 @@ public class TraceReportBlam extends AbstractBlam {
Used_By_Test_Unit_Trace(CoreRelationTypes.Uses__Requirement, CoreRelationTypes.Uses__TestUnit, true),
Validation_By_TestProcedure(CoreRelationTypes.Validation__Requirement, CoreRelationTypes.Validation__Validator, true);
- private IRelationEnumeration toReq;
- private IRelationEnumeration toTraceUnit;
+ private IRelationTypeSide toReq;
+ private IRelationTypeSide toTraceUnit;
private boolean isTestType;
- TraceTypeEnum(IRelationEnumeration toReq, IRelationEnumeration toTraceUnit, boolean isTestType) {
+ TraceTypeEnum(IRelationTypeSide toReq, IRelationTypeSide toTraceUnit, boolean isTestType) {
this.toReq = toReq;
this.toTraceUnit = toTraceUnit;
this.isTestType = isTestType;
}
- public IRelationEnumeration getRelatedToRequirement() {
+ public IRelationTypeSide getRelatedToRequirement() {
return toReq;
}
- public IRelationEnumeration getRelatedToTraceUnit() {
+ public IRelationTypeSide getRelatedToTraceUnit() {
return toTraceUnit;
}
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java
index 35a2beaf2cc..137bdbc82f2 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java
@@ -26,8 +26,8 @@ import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.define.traceability.data.RequirementData;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
@@ -189,7 +189,7 @@ public class UiToTestBlam extends AbstractBlam {
return toReturn;
}
- private void processTrace(Appendable appendable, Artifact requirement, String testType, IRelationEnumeration relationType) throws OseeCoreException {
+ private void processTrace(Appendable appendable, Artifact requirement, String testType, IRelationTypeSide relationType) throws OseeCoreException {
String uiTitle = requirement.getName();
String uiType = requirement.getArtifactTypeName();
@@ -214,7 +214,7 @@ public class UiToTestBlam extends AbstractBlam {
}
}
- private List<String> getTrace(Artifact testUnit, IRelationEnumeration relation) throws OseeCoreException {
+ private List<String> getTrace(Artifact testUnit, IRelationTypeSide relation) throws OseeCoreException {
List<String> toReturn = new ArrayList<String>();
for (Artifact item : testUnit.getRelatedArtifacts(relation)) {
toReturn.add(item.getName());
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java
index 5b885b73f3c..90c4f039f16 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java
@@ -32,11 +32,11 @@ import org.eclipse.osee.define.traceability.data.TestUnitData;
import org.eclipse.osee.define.traceability.data.TraceMark;
import org.eclipse.osee.define.traceability.data.TraceUnit;
import org.eclipse.osee.framework.core.data.IArtifactType;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.core.model.Branch;
@@ -206,7 +206,7 @@ public class TraceUnitToArtifactProcessor implements ITraceUnitProcessor {
Artifact requirementArtifact = getRequirementArtifact(traceMark.getRawTraceMark(), requirementData);
if (requirementArtifact != null) {
- IRelationEnumeration relationType = getRelationFromTraceType(traceUnitArtifact, traceMark.getTraceType());
+ IRelationTypeSide relationType = getRelationFromTraceType(traceUnitArtifact, traceMark.getTraceType());
if (relationType == null) {
unknownRelationError.put(traceUnitArtifact.getArtifactTypeName(), traceMark.getTraceType());
} else if (!requirementArtifact.isRelated(relationType, traceUnitArtifact)) {
@@ -240,7 +240,7 @@ public class TraceUnitToArtifactProcessor implements ITraceUnitProcessor {
return traceType.equalsIgnoreCase("USES");
}
- private IRelationEnumeration getRelationFromTraceType(Artifact traceUnitArtifact, String traceType) {
+ private IRelationTypeSide getRelationFromTraceType(Artifact traceUnitArtifact, String traceType) {
if (traceUnitArtifact.isOfType(CoreArtifactTypes.TestUnit)) {
if (isUsesTraceType(traceType)) {
return CoreRelationTypes.Uses__TestUnit;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractArtifactRelationReport.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractArtifactRelationReport.java
index e7618524be3..d7586c400ef 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractArtifactRelationReport.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractArtifactRelationReport.java
@@ -15,7 +15,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
/**
@@ -24,12 +24,12 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
public abstract class AbstractArtifactRelationReport extends AbstractReport {
private final Set<Artifact> artifactsToCheck;
- private final List<IRelationEnumeration> relationsToCheck;
+ private final List<IRelationTypeSide> relationsToCheck;
public AbstractArtifactRelationReport() {
super();
this.artifactsToCheck = new HashSet<Artifact>();
- this.relationsToCheck = new ArrayList<IRelationEnumeration>();
+ this.relationsToCheck = new ArrayList<IRelationTypeSide>();
}
public void setArtifacts(Collection<Artifact> artifacts) {
@@ -38,7 +38,7 @@ public abstract class AbstractArtifactRelationReport extends AbstractReport {
}
}
- public void addRelationToCheck(IRelationEnumeration relation) {
+ public void addRelationToCheck(IRelationTypeSide relation) {
if (relation != null) {
this.relationsToCheck.add(relation);
}
@@ -48,8 +48,8 @@ public abstract class AbstractArtifactRelationReport extends AbstractReport {
return artifactsToCheck.toArray(new Artifact[artifactsToCheck.size()]);
}
- public IRelationEnumeration[] getRelationsToCheck() {
- return relationsToCheck.toArray(new IRelationEnumeration[relationsToCheck.size()]);
+ public IRelationTypeSide[] getRelationsToCheck() {
+ return relationsToCheck.toArray(new IRelationTypeSide[relationsToCheck.size()]);
}
@Override
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactToRelatedArtifact.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactToRelatedArtifact.java
index 33d2cbf078a..a43350c13fc 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactToRelatedArtifact.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactToRelatedArtifact.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.define.traceability.report;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -34,11 +34,11 @@ public class ArtifactToRelatedArtifact extends AbstractArtifactRelationReport {
return toReturn.toArray(new String[toReturn.size()]);
}
- public List<String[]> getRelatedRows(IRelationEnumeration[] relations, Artifact artifact) throws OseeCoreException {
+ public List<String[]> getRelatedRows(IRelationTypeSide[] relations, Artifact artifact) throws OseeCoreException {
List<String[]> toReturn = new ArrayList<String[]>();
int maxSize = 0;
List<List<String>> items = new ArrayList<List<String>>();
- for (IRelationEnumeration relationEnum : relations) {
+ for (IRelationTypeSide relationEnum : relations) {
List<String> entries = new ArrayList<String>();
for (Artifact relArtifact : artifact.getRelatedArtifacts(relationEnum)) {
entries.add(relArtifact.getName());
@@ -63,10 +63,10 @@ public class ArtifactToRelatedArtifact extends AbstractArtifactRelationReport {
@Override
public void process(IProgressMonitor monitor) throws OseeCoreException {
notifyOnTableHeader(getHeader());
- IRelationEnumeration[] relations = getRelationsToCheck();
+ IRelationTypeSide[] relations = getRelationsToCheck();
for (Artifact artifact : getArtifactsToCheck()) {
String name = artifact.getName();
- for (IRelationEnumeration relationEnum : relations) {
+ for (IRelationTypeSide relationEnum : relations) {
String typeName = relationEnum.getName();
for (Artifact relArtifact : artifact.getRelatedArtifacts(relationEnum)) {
notifyOnRowData(name, typeName, relArtifact.getName());
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactTraceCount.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactTraceCount.java
index 080acfe8ab7..9dff862989d 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactTraceCount.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactTraceCount.java
@@ -14,8 +14,8 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.data.IAttributeType;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
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;
@@ -33,7 +33,7 @@ public class ArtifactTraceCount extends AbstractArtifactRelationReport {
List<String> header = new ArrayList<String>();
header.add("Name");
header.add("Type");
- for (IRelationEnumeration relation : getRelationsToCheck()) {
+ for (IRelationTypeSide relation : getRelationsToCheck()) {
header.add(relation.getName() + " Trace Count");
}
header.add("Subsystem");
@@ -55,13 +55,13 @@ public class ArtifactTraceCount extends AbstractArtifactRelationReport {
public void process(IProgressMonitor monitor) throws OseeCoreException {
String[] header = getHeader();
notifyOnTableHeader(header);
- IRelationEnumeration[] relations = getRelationsToCheck();
+ IRelationTypeSide[] relations = getRelationsToCheck();
for (Artifact art : getArtifactsToCheck()) {
String[] rowData = new String[header.length];
int index = 0;
rowData[index++] = art.getName();
rowData[index++] = art.getArtifactTypeName();
- for (IRelationEnumeration relationType : relations) {
+ for (IRelationTypeSide relationType : relations) {
rowData[index++] = String.valueOf(art.getRelatedArtifactsCount(relationType));
}
IAttributeType attributeType = getSubsystemAttributeType(art);
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactsWithoutRelations.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactsWithoutRelations.java
index 0905f912340..0e6971d7c74 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactsWithoutRelations.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactsWithoutRelations.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.define.traceability.report;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
/**
@@ -26,10 +26,10 @@ public class ArtifactsWithoutRelations extends AbstractArtifactRelationReport {
@Override
public void process(IProgressMonitor monitor) {
notifyOnTableHeader("Item Name", "Type");
- IRelationEnumeration[] relations = getRelationsToCheck();
+ IRelationTypeSide[] relations = getRelationsToCheck();
for (Artifact artifact : getArtifactsToCheck()) {
int count = 0;
- for (IRelationEnumeration relation : relations) {
+ for (IRelationTypeSide relation : relations) {
count += artifact.getRelatedArtifactsCount(relation);
}
if (count <= 0) {
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/OseeDslAccessModelTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/OseeDslAccessModelTest.java
index a192fafdc7d..d6c908cc25a 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/OseeDslAccessModelTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/OseeDslAccessModelTest.java
@@ -14,9 +14,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import org.eclipse.osee.framework.core.data.AccessContextId;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.dsl.integration.AccessModelInterpreter;
import org.eclipse.osee.framework.core.dsl.integration.OseeDslAccessModel;
-import org.eclipse.osee.framework.core.dsl.integration.test.mocks.MockAccessContextId;
import org.eclipse.osee.framework.core.dsl.integration.test.mocks.MockDslProvider;
import org.eclipse.osee.framework.core.dsl.integration.test.mocks.MockModel;
import org.eclipse.osee.framework.core.dsl.oseeDsl.AccessContext;
@@ -44,7 +44,7 @@ public class OseeDslAccessModelTest {
@BeforeClass
public static void setUp() {
- accessContextId = new MockAccessContextId(GUID.create(), "Context 1");
+ accessContextId = TokenFactory.createAccessContextId(GUID.create(), "Context 1");
}
@Test(expected = OseeArgumentException.class)
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/internal/AccessModelInterpreterImplTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/internal/AccessModelInterpreterImplTest.java
index b5f30e6d1ec..f6df3508bb5 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/internal/AccessModelInterpreterImplTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/internal/AccessModelInterpreterImplTest.java
@@ -14,9 +14,10 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import junit.framework.Assert;
+import org.eclipse.osee.framework.core.data.AccessContextId;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.dsl.integration.internal.AccessModelInterpreterImpl;
import org.eclipse.osee.framework.core.dsl.integration.test.mocks.CheckAccessDetailCollectorNotCalled;
-import org.eclipse.osee.framework.core.dsl.integration.test.mocks.MockAccessContextId;
import org.eclipse.osee.framework.core.dsl.integration.test.mocks.MockArtifactData;
import org.eclipse.osee.framework.core.dsl.integration.test.mocks.MockArtifactDataProvider;
import org.eclipse.osee.framework.core.dsl.integration.test.mocks.MockModel;
@@ -37,8 +38,8 @@ import org.junit.Test;
* @author Roberto E. Escobar
*/
public class AccessModelInterpreterImplTest {
- private MockAccessContextId contextId1;
- private MockAccessContextId contextId2;
+ private AccessContextId contextId1;
+ private AccessContextId contextId2;
private AccessContext expectedContext1;
private AccessContext expectedContext2;
@@ -49,8 +50,8 @@ public class AccessModelInterpreterImplTest {
public void setup() {
interpreterNoArtData = new AccessModelInterpreterImpl(null);
- contextId1 = new MockAccessContextId(GUID.create(), "Context 1");
- contextId2 = new MockAccessContextId(GUID.create(), "Context 2");
+ contextId1 = TokenFactory.createAccessContextId(GUID.create(), "Context 1");
+ contextId2 = TokenFactory.createAccessContextId(GUID.create(), "Context 2");
expectedContext1 = MockModel.createAccessContext(contextId1.getGuid(), "c1");
expectedContext2 = MockModel.createAccessContext(contextId2.getGuid(), "c2");
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtil.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtil.java
index fe95c76b9e0..c43b9034878 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtil.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtil.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.framework.core.dsl.integration.util;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.dsl.oseeDsl.AccessPermissionEnum;
import org.eclipse.osee.framework.core.dsl.oseeDsl.ObjectRestriction;
import org.eclipse.osee.framework.core.dsl.oseeDsl.XArtifactType;
@@ -37,33 +37,15 @@ public final class OseeUtil {
}
public static IArtifactType toToken(XArtifactType model) {
- return new ArtifactTypeToken(model);
+ return TokenFactory.createArtifactType(model.getTypeGuid(), Strings.unquote(model.getName()));
}
public static IAttributeType toToken(XAttributeType model) {
- return new AttributeTypeToken(model);
+ return TokenFactory.createAttributeType(model.getTypeGuid(), Strings.unquote(model.getName()));
}
public static IRelationType toToken(XRelationType model) {
- return new RelationTypeToken(model);
- }
-
- private final static class ArtifactTypeToken extends NamedIdentity implements IArtifactType {
- public ArtifactTypeToken(XArtifactType model) {
- super(model.getTypeGuid(), Strings.unquote(model.getName()));
- }
- }
-
- private final static class AttributeTypeToken extends NamedIdentity implements IAttributeType {
- public AttributeTypeToken(XAttributeType model) {
- super(model.getTypeGuid(), Strings.unquote(model.getName()));
- }
- }
-
- private final static class RelationTypeToken extends NamedIdentity implements IRelationType {
- public RelationTypeToken(XRelationType model) {
- super(model.getTypeGuid(), Strings.unquote(model.getName()));
- }
+ return TokenFactory.createRelationType(model.getTypeGuid(), Strings.unquote(model.getName()));
}
public static boolean isRestrictedSide(XRelationSideEnum relationSideEnum, RelationSide relationSide) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java
index 7fa12201b2e..03616089798 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java
@@ -10,12 +10,13 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.message;
+import org.eclipse.osee.framework.core.data.HasBranch;
import org.eclipse.osee.framework.core.data.IOseeBranch;
/**
* @author Roberto E. Escobar
*/
-public class SearchRequest {
+public class SearchRequest implements HasBranch {
private final IOseeBranch branch;
private final String rawSearch;
@@ -32,6 +33,7 @@ public class SearchRequest {
this.options = options != null ? options : new SearchOptions();
}
+ @Override
public IOseeBranch getBranch() {
return branch;
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java
index 0562d9dab18..91b15736a8e 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java
@@ -14,7 +14,7 @@ import java.util.Collection;
import org.eclipse.osee.framework.core.data.BranchToken;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.message.SearchOptions;
import org.eclipse.osee.framework.core.message.SearchRequest;
@@ -43,7 +43,7 @@ public class SearchRequestTranslator implements ITranslator<SearchRequest> {
public SearchRequest convert(PropertyStore store) {
String guid = store.get(Entry.BRANCH_GUID.name());
String name = store.get(Entry.BRANCH_NAME.name());
- IOseeBranch branch = new BranchToken(guid, name);
+ IOseeBranch branch = TokenFactory.createBranch(guid, name);
String rawSearch = store.get(Entry.RAW_SEARCH.name());
SearchOptions options = new SearchOptions();
@@ -61,7 +61,7 @@ public class SearchRequestTranslator implements ITranslator<SearchRequest> {
for (int index = 0; index < typeFilterGuids.length; index++) {
guid = typeFilterGuids[index];
name = index < typeFilterNames.length ? typeFilterNames[index] : Strings.emptyString();
- IAttributeType type = new AttributeTypeFilter(guid, name);
+ IAttributeType type = TokenFactory.createAttributeType(guid, name);
options.addAttributeTypeFilter(type);
}
}
@@ -100,10 +100,4 @@ public class SearchRequestTranslator implements ITranslator<SearchRequest> {
}
return store;
}
-
- private static final class AttributeTypeFilter extends NamedIdentity implements IAttributeType {
- public AttributeTypeFilter(String guid, String name) {
- super(guid, name);
- }
- }
}
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockDataFactory.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockDataFactory.java
index 29cddc05a4f..9a9afa10e69 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockDataFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockDataFactory.java
@@ -14,7 +14,7 @@ import java.util.Date;
import junit.framework.Assert;
import org.eclipse.osee.framework.core.data.AccessContextId;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -55,18 +55,12 @@ public final class MockDataFactory {
}
public static AccessContextId createAccessContextId(String guid, String name) {
- AccessContextId cxt = new MockAccessContextId(guid, name);
+ AccessContextId cxt = TokenFactory.createAccessContextId(guid, name);
Assert.assertEquals(guid, cxt.getGuid());
Assert.assertEquals(name, cxt.getName());
return cxt;
}
- private static final class MockAccessContextId extends NamedIdentity implements AccessContextId {
- public MockAccessContextId(String guid, String name) {
- super(guid, name);
- }
- }
-
public static <T> AccessDetail<T> createAccessDetails(T expAccessObject, PermissionEnum expPermission, String expReason) {
AccessDetail<T> target;
if (expReason != null) {
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/DefaultBasicArtifact.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/DefaultBasicArtifact.java
index 17cbd61d57a..ff140245707 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/DefaultBasicArtifact.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/DefaultBasicArtifact.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.core.model;
import org.eclipse.osee.framework.core.data.NamedIdentity;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
/**
@@ -33,7 +32,7 @@ public final class DefaultBasicArtifact extends NamedIdentity implements IBasicA
}
@Override
- public Object getFullArtifact() throws OseeCoreException {
+ public Object getFullArtifact() {
return null;
}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/IBasicArtifact.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/IBasicArtifact.java
index 611b8381246..c43f4e158fa 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/IBasicArtifact.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/IBasicArtifact.java
@@ -10,20 +10,22 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.model;
-import org.eclipse.osee.framework.core.data.Identity;
-import org.eclipse.osee.framework.core.data.Named;
+import org.eclipse.osee.framework.core.data.HasBranch;
+import org.eclipse.osee.framework.core.data.IArtifactToken;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
/**
* @author Roberto E. Escobar
*/
-public interface IBasicArtifact<T> extends Named, Identity {
+public interface IBasicArtifact<T> extends IArtifactToken, HasBranch {
int getArtId();
+ @Override
Branch getBranch();
+ @Override
ArtifactType getArtifactType();
T getFullArtifact() throws OseeCoreException;
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java
index c7cad91b5fb..1f1c7b41cb0 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java
@@ -12,14 +12,14 @@
package org.eclipse.osee.framework.core.model;
import org.eclipse.osee.framework.core.data.IRelationType;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.data.NamedIdentity;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.enums.RelationSide;
/**
* @author Andrew M. Finkbeiner
*/
-public class RelationTypeSide extends NamedIdentity implements IRelationEnumeration {
+public class RelationTypeSide extends NamedIdentity implements IRelationTypeSide {
private final IRelationType type;
private final RelationSide side;
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java
deleted file mode 100644
index 8fe2e820e78..00000000000
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/ArtifactToken.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Created on Feb 8, 2011
- *
- * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
- */
-package org.eclipse.osee.framework.core.data;
-
-public class ArtifactToken extends NamedIdentity implements IArtifactToken {
-
- private final IArtifactType artifactType;
- private final IOseeBranch oseeBranch;
-
- public ArtifactToken(String guid, String name, IArtifactType artifactType, IOseeBranch oseeBranch) {
- super(guid, name);
- this.artifactType = artifactType;
- this.oseeBranch = oseeBranch;
- }
-
- @Override
- public IArtifactType getArtifactType() {
- return artifactType;
- }
-
- @Override
- public IOseeBranch getBranch() {
- return oseeBranch;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OseeBranch.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/HasArtifactType.java
index 3f12e3f0a62..0ee48ffe340 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/OseeBranch.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/HasArtifactType.java
@@ -11,10 +11,9 @@
package org.eclipse.osee.framework.core.data;
/**
- * @author Donald G. Dunne
+ * @author Roberto E. Escobar
*/
-public class OseeBranch extends NamedIdentity implements IOseeBranch {
- public OseeBranch(String name, String guid) {
- super(guid, name);
- }
-} \ No newline at end of file
+public interface HasArtifactType {
+
+ IArtifactType getArtifactType();
+}
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/mocks/MockAccessContextId.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/HasBranch.java
index 4005ef41858..8a4b308e8e9 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/test/mocks/MockAccessContextId.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/HasBranch.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
+ * Copyright (c) 2010 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
@@ -8,16 +8,12 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.core.dsl.integration.test.mocks;
-
-import org.eclipse.osee.framework.core.data.AccessContextId;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+package org.eclipse.osee.framework.core.data;
/**
* @author Roberto E. Escobar
*/
-public final class MockAccessContextId extends NamedIdentity implements AccessContextId {
- public MockAccessContextId(String guid, String name) {
- super(guid, name);
- }
-} \ No newline at end of file
+public interface HasBranch {
+
+ IOseeBranch getBranch();
+}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactToken.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactToken.java
index a183a8fca5d..935d0c64d26 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactToken.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IArtifactToken.java
@@ -13,9 +13,6 @@ package org.eclipse.osee.framework.core.data;
/**
* @author Donald G. Dunne
*/
-public interface IArtifactToken extends Identity, FullyNamed {
-
- public IArtifactType getArtifactType();
-
- public IOseeBranch getBranch();
+public interface IArtifactToken extends Identity, FullyNamed, HasArtifactType {
+ // composition interface requires no additional methods,fields
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/IRelationEnumeration.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationTypeSide.java
index c6ed4ea4b32..0f109b8e104 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/IRelationEnumeration.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationTypeSide.java
@@ -8,10 +8,10 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.core.enums;
+package org.eclipse.osee.framework.core.data;
-import org.eclipse.osee.framework.core.data.IRelationType;
+import org.eclipse.osee.framework.core.enums.RelationSide;
-public interface IRelationEnumeration extends IRelationType {
+public interface IRelationTypeSide extends IRelationType {
public RelationSide getSide();
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
new file mode 100644
index 00000000000..540c44231c8
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
@@ -0,0 +1,114 @@
+/*
+ * Created on Feb 17, 2011
+ *
+ * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
+ */
+package org.eclipse.osee.framework.core.data;
+
+import org.eclipse.osee.framework.core.enums.RelationSide;
+
+public final class TokenFactory {
+
+ private TokenFactory() {
+ // Utility Class
+ }
+
+ public static IArtifactType createArtifactType(String guid, String name) {
+ return new ArtifactTypeToken(guid, name);
+ }
+
+ public static IAttributeType createAttributeType(String guid, String name) {
+ return new AttributeTypeToken(guid, name);
+ }
+
+ public static IAttributeType createAttributeType(String guid, String name, String description) {
+ return new AttributeTypeToken(guid, name, description);
+ }
+
+ public static IRelationType createRelationType(String guid, String name) {
+ return new RelationTypeToken(guid, name);
+ }
+
+ public static IRelationTypeSide createRelationTypeSide(RelationSide relationSide, String guid, String name) {
+ return new RelationTypeSideToken(guid, name, relationSide);
+ }
+
+ public static AccessContextId createAccessContextId(String guid, String name) {
+ return new AccessContextIdToken(guid, name);
+ }
+
+ public static IArtifactToken createArtifactToken(String guid, String name, IArtifactType artifactType) {
+ return new ArtifactToken(guid, name, artifactType);
+ }
+
+ public static IOseeBranch createBranch(String guid, String name) {
+ return new BranchToken(guid, name);
+ }
+
+ private final static class ArtifactTypeToken extends NamedIdentity implements IArtifactType {
+ public ArtifactTypeToken(String guid, String name) {
+ super(guid, name);
+ }
+ }
+
+ private static final class BranchToken extends NamedIdentity implements IOseeBranch {
+ public BranchToken(String guid, String name) {
+ super(guid, name);
+ }
+ }
+
+ private final static class AttributeTypeToken extends NamedIdentity implements IAttributeType {
+ public AttributeTypeToken(String guid, String name) {
+ super(guid, name);
+ }
+
+ public AttributeTypeToken(String guid, String name, String description) {
+ super(guid, name, description);
+ }
+ }
+
+ private final static class RelationTypeToken extends NamedIdentity implements IRelationType {
+ public RelationTypeToken(String guid, String name) {
+ super(guid, name);
+ }
+ }
+
+ private static class ArtifactToken extends NamedIdentity implements IArtifactToken {
+ private final IArtifactType artifactType;
+
+ public ArtifactToken(String guid, String name, IArtifactType artifactType) {
+ super(guid, name);
+ this.artifactType = artifactType;
+ }
+
+ @Override
+ public IArtifactType getArtifactType() {
+ return artifactType;
+ }
+ }
+
+ private final static class AccessContextIdToken extends NamedIdentity implements AccessContextId {
+ public AccessContextIdToken(String guid, String name) {
+ super(guid, name);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s - %s", getName(), getGuid());
+ }
+ }
+
+ private final static class RelationTypeSideToken extends NamedIdentity implements IRelationTypeSide {
+ private final RelationSide relationSide;
+
+ private RelationTypeSideToken(String guid, String name, RelationSide relationSide) {
+ super(guid, name);
+ this.relationSide = relationSide;
+ }
+
+ @Override
+ public RelationSide getSide() {
+ return relationSide;
+ }
+ }
+}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java
index 09ba27f297b..f054c993782 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java
@@ -11,71 +11,71 @@
package org.eclipse.osee.framework.core.enums;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
/**
* @author Ryan D. Brooks
*/
-public final class CoreArtifactTypes extends NamedIdentity implements IArtifactType {
+public final class CoreArtifactTypes {
// @formatter:off
- public static final IArtifactType AccessControlModel = new CoreArtifactTypes("CJr1bPfZQkbiuTA4FewA", "Access Control Model");
- public static final IArtifactType AbstractAccessControlled = new CoreArtifactTypes("AAFVUREVAxmEmLW2KkAA", "Abstract Access Controlled");
- public static final IArtifactType AbstractSoftwareRequirement = new CoreArtifactTypes("ABNAYPwV6H4EkjQ3+QQA", "Abstract Software Requirement");
- public static final IArtifactType AbstractTestResult = new CoreArtifactTypes("ATkaanWmHH3PkhGNVjwA", "Abstract Test Result");
- public static final IArtifactType AbstractTestUnit = new CoreArtifactTypes("AISIbSI6wzEUfPdCQaAA", "Abstract Test Unit");
- public static final IArtifactType Artifact = new CoreArtifactTypes("AAMFDh6S7gRLupAMwywA", "Artifact");
- public static final IArtifactType CodeUnit = new CoreArtifactTypes("AAMFDkEh216dzK1mTZgA", "Code Unit");
- public static final IArtifactType Component = new CoreArtifactTypes("AAMFDkG6omAsD6dXPYgA", "Component");
- public static final IArtifactType DirectSoftwareRequirement = new CoreArtifactTypes("BtMwyalHkHkrRo7D0aAA", "Direct Software Requirement");
- public static final IArtifactType Folder = new CoreArtifactTypes("AAMFDg_wmiYHHY5swJwA", "Folder");
- public static final IArtifactType GeneralData = new CoreArtifactTypes("AAMFDhQXfyb2m+jCwlwA", "General Data");
- public static final IArtifactType GeneralDocument = new CoreArtifactTypes("AAMFDhCjkTvP+VBpBCQA", "General Document");
- public static final IArtifactType GlobalPreferences = new CoreArtifactTypes("AAMFDho2kBqyoOZEw+gA", "Global Preferences");
- public static final IArtifactType HardwareRequirement = new CoreArtifactTypes("AAMFDh8dhUflUdK9FdgA", "Hardware Requirement");
- public static final IArtifactType Heading = new CoreArtifactTypes("AAMFDhEzni8FpFb5yHwA", "Heading");
- public static final IArtifactType IndirectSoftwareRequirement = new CoreArtifactTypes("AAMFDiC7HRQMqr5S0QwA", "Indirect Software Requirement");
- public static final IArtifactType InterfaceRequirement = new CoreArtifactTypes("AAMFDjgcukv7xEsPf2QA", "Interface Requirement");
- public static final IArtifactType RendererTemplate = new CoreArtifactTypes("AAMFDhvZnHKgSeFKMXgA", "Renderer Template");
- public static final IArtifactType Requirement = new CoreArtifactTypes("ABM_vxEEowY+8i2_q9gA", "Requirement");
- public static final IArtifactType RootArtifact = new CoreArtifactTypes("AAMFDhHDqlbzKcIxcsAA", "Root Artifact");
- public static final IArtifactType SoftwareDesign = new CoreArtifactTypes("AAMFDh+nBRDS2smKPLAA", "Software Design");
- public static final IArtifactType SoftwareRequirement = new CoreArtifactTypes("AAMFDiAwhRFXwIyapJAA", "Software Requirement");
- public static final IArtifactType SoftwareRequirementDrawing = new CoreArtifactTypes("ABNClhgUfwj6A3EAArQA", "Software Requirement Drawing");
- public static final IArtifactType SoftwareRequirementFunction = new CoreArtifactTypes("ABNBwZMdFgEDTVQ7pTAA", "Software Requirement Function");
- public static final IArtifactType SoftwareRequirementProcedure = new CoreArtifactTypes("ABNBLPY4LnIKtcON0mgA", "Software Requirement Procedure");
- public static final IArtifactType SubsystemDesign = new CoreArtifactTypes("AAMFDiHVwBo+Yx73BoQA", "Subsystem Design");
- public static final IArtifactType SubsystemFunction = new CoreArtifactTypes("AAMFDjk6pAAd3tpGEqwA", "Subsystem Function");
- public static final IArtifactType SubsystemRequirement = new CoreArtifactTypes("AAMFDiN9KiAkhuLqOhQA", "Subsystem Requirement");
- public static final IArtifactType SupportingContent = new CoreArtifactTypes("AAMFDiQI2QuheFY71jgA", "Supporting Content");
- public static final IArtifactType SystemDesign = new CoreArtifactTypes("AAMFDiFI+lLm46F3HdQA", "System Design");
- public static final IArtifactType SystemFunction = new CoreArtifactTypes("AAMFDjisx2s6BUTDo3wA", "System Function");
- public static final IArtifactType SystemRequirement = new CoreArtifactTypes("AAMFDiSTcDGdUd9+tHAA", "System Requirement");
- public static final IArtifactType TestCase = new CoreArtifactTypes("AAMFDikEi0TGK27TKPgA", "Test Case");
- public static final IArtifactType TestInformationSheet = new CoreArtifactTypes("AAMFDjnM3wQxCjwatKAA", "Test Information Sheet");
- public static final IArtifactType TestPlanElement = new CoreArtifactTypes("ATi_kUpvPBiW2upYC_wA", "Test Plan Element");
- public static final IArtifactType TestProcedure = new CoreArtifactTypes("AAMFDjsjiGhoWpqM4PQA", "Test Procedure");
- public static final IArtifactType TestProcedureNative = new CoreArtifactTypes("AAMFDiWs_HdDJTbPPQgA", "Test Procedure Native");
- public static final IArtifactType TestProcedureWML = new CoreArtifactTypes("AAMFDiUeCG3KWx5XqeQA", "Test Procedure WML");
- public static final IArtifactType TestProcedureXL = new CoreArtifactTypes("AAn_QG1xVGGhvAzxVMQA", "Test Procedure XL");
- public static final IArtifactType TestResultNative = new CoreArtifactTypes("ATkaanWmHH3PkhGNVjwA", "Test Result Native");
- public static final IArtifactType TestResultWML = new CoreArtifactTypes("ATk6NKFFmD_zg1b_eaQA", "Test Result WML");
- public static final IArtifactType TestRun = new CoreArtifactTypes("AAMFDjqDHWo+orlSpaQA", "Test Run");
- public static final IArtifactType TestRunDisposition = new CoreArtifactTypes("AAMFDjeNxhi0KmXZcKQA", "Test Run Disposition");
- public static final IArtifactType TestSupport = new CoreArtifactTypes("AAMFDj+FW0f_Ut72ocQA", "Test Support");
- public static final IArtifactType TestUnit = new CoreArtifactTypes("ABM2d6uxUw66aSdo0LwA", "Test Unit");
- public static final IArtifactType UniversalGroup = new CoreArtifactTypes("AAMFDhLY2TnADPA_EQQA", "Universal Group");
- public static final IArtifactType User = new CoreArtifactTypes("AAMFDhmr+Dqqe5pn3kAA", "User");
- public static final IArtifactType UserGroup = new CoreArtifactTypes("AAMFDhrEbXqZKPfWkwAA", "User Group");
- public static final IArtifactType WorkFlowDefinition = new CoreArtifactTypes("AAMFDh16eQ1GIHPWlYQA", "Work Flow Definition");
- public static final IArtifactType WorkItemDefinition = new CoreArtifactTypes("ABNM6pIn_x_3e6a3aIgA", "Work Item Definition");
- public static final IArtifactType WorkPageDefinition = new CoreArtifactTypes("AAMFDhzuyizN4qu7tXgA", "Work Page Definition");
- public static final IArtifactType WorkRuleDefinition = new CoreArtifactTypes("AAMFDhxjHC2RUV2RkcQA", "Work Rule Definition");
- public static final IArtifactType WorkWidgetDefinition = new CoreArtifactTypes("AAMFDh4IVzqPgVTpLrwA", "Work Widget Definition");
- public static final IArtifactType XViewerGlobalCustomization = new CoreArtifactTypes("AAMFDhtN7T4of30iYhAA", "XViewer Global Customization");
+ public static final IArtifactType AccessControlModel = TokenFactory.createArtifactType("CJr1bPfZQkbiuTA4FewA", "Access Control Model");
+ public static final IArtifactType AbstractAccessControlled = TokenFactory.createArtifactType("AAFVUREVAxmEmLW2KkAA", "Abstract Access Controlled");
+ public static final IArtifactType AbstractSoftwareRequirement = TokenFactory.createArtifactType("ABNAYPwV6H4EkjQ3+QQA", "Abstract Software Requirement");
+ public static final IArtifactType AbstractTestResult = TokenFactory.createArtifactType("ATkaanWmHH3PkhGNVjwA", "Abstract Test Result");
+ public static final IArtifactType AbstractTestUnit = TokenFactory.createArtifactType("AISIbSI6wzEUfPdCQaAA", "Abstract Test Unit");
+ public static final IArtifactType Artifact = TokenFactory.createArtifactType("AAMFDh6S7gRLupAMwywA", "Artifact");
+ public static final IArtifactType CodeUnit = TokenFactory.createArtifactType("AAMFDkEh216dzK1mTZgA", "Code Unit");
+ public static final IArtifactType Component = TokenFactory.createArtifactType("AAMFDkG6omAsD6dXPYgA", "Component");
+ public static final IArtifactType DirectSoftwareRequirement = TokenFactory.createArtifactType("BtMwyalHkHkrRo7D0aAA", "Direct Software Requirement");
+ public static final IArtifactType Folder = TokenFactory.createArtifactType("AAMFDg_wmiYHHY5swJwA", "Folder");
+ public static final IArtifactType GeneralData = TokenFactory.createArtifactType("AAMFDhQXfyb2m+jCwlwA", "General Data");
+ public static final IArtifactType GeneralDocument = TokenFactory.createArtifactType("AAMFDhCjkTvP+VBpBCQA", "General Document");
+ public static final IArtifactType GlobalPreferences = TokenFactory.createArtifactType("AAMFDho2kBqyoOZEw+gA", "Global Preferences");
+ public static final IArtifactType HardwareRequirement = TokenFactory.createArtifactType("AAMFDh8dhUflUdK9FdgA", "Hardware Requirement");
+ public static final IArtifactType Heading = TokenFactory.createArtifactType("AAMFDhEzni8FpFb5yHwA", "Heading");
+ public static final IArtifactType IndirectSoftwareRequirement = TokenFactory.createArtifactType("AAMFDiC7HRQMqr5S0QwA", "Indirect Software Requirement");
+ public static final IArtifactType InterfaceRequirement = TokenFactory.createArtifactType("AAMFDjgcukv7xEsPf2QA", "Interface Requirement");
+ public static final IArtifactType RendererTemplate = TokenFactory.createArtifactType("AAMFDhvZnHKgSeFKMXgA", "Renderer Template");
+ public static final IArtifactType Requirement = TokenFactory.createArtifactType("ABM_vxEEowY+8i2_q9gA", "Requirement");
+ public static final IArtifactType RootArtifact = TokenFactory.createArtifactType("AAMFDhHDqlbzKcIxcsAA", "Root Artifact");
+ public static final IArtifactType SoftwareDesign = TokenFactory.createArtifactType("AAMFDh+nBRDS2smKPLAA", "Software Design");
+ public static final IArtifactType SoftwareRequirement = TokenFactory.createArtifactType("AAMFDiAwhRFXwIyapJAA", "Software Requirement");
+ public static final IArtifactType SoftwareRequirementDrawing = TokenFactory.createArtifactType("ABNClhgUfwj6A3EAArQA", "Software Requirement Drawing");
+ public static final IArtifactType SoftwareRequirementFunction = TokenFactory.createArtifactType("ABNBwZMdFgEDTVQ7pTAA", "Software Requirement Function");
+ public static final IArtifactType SoftwareRequirementProcedure = TokenFactory.createArtifactType("ABNBLPY4LnIKtcON0mgA", "Software Requirement Procedure");
+ public static final IArtifactType SubsystemDesign = TokenFactory.createArtifactType("AAMFDiHVwBo+Yx73BoQA", "Subsystem Design");
+ public static final IArtifactType SubsystemFunction = TokenFactory.createArtifactType("AAMFDjk6pAAd3tpGEqwA", "Subsystem Function");
+ public static final IArtifactType SubsystemRequirement = TokenFactory.createArtifactType("AAMFDiN9KiAkhuLqOhQA", "Subsystem Requirement");
+ public static final IArtifactType SupportingContent = TokenFactory.createArtifactType("AAMFDiQI2QuheFY71jgA", "Supporting Content");
+ public static final IArtifactType SystemDesign = TokenFactory.createArtifactType("AAMFDiFI+lLm46F3HdQA", "System Design");
+ public static final IArtifactType SystemFunction = TokenFactory.createArtifactType("AAMFDjisx2s6BUTDo3wA", "System Function");
+ public static final IArtifactType SystemRequirement = TokenFactory.createArtifactType("AAMFDiSTcDGdUd9+tHAA", "System Requirement");
+ public static final IArtifactType TestCase = TokenFactory.createArtifactType("AAMFDikEi0TGK27TKPgA", "Test Case");
+ public static final IArtifactType TestInformationSheet = TokenFactory.createArtifactType("AAMFDjnM3wQxCjwatKAA", "Test Information Sheet");
+ public static final IArtifactType TestPlanElement = TokenFactory.createArtifactType("ATi_kUpvPBiW2upYC_wA", "Test Plan Element");
+ public static final IArtifactType TestProcedure = TokenFactory.createArtifactType("AAMFDjsjiGhoWpqM4PQA", "Test Procedure");
+ public static final IArtifactType TestProcedureNative = TokenFactory.createArtifactType("AAMFDiWs_HdDJTbPPQgA", "Test Procedure Native");
+ public static final IArtifactType TestProcedureWML = TokenFactory.createArtifactType("AAMFDiUeCG3KWx5XqeQA", "Test Procedure WML");
+ public static final IArtifactType TestProcedureXL = TokenFactory.createArtifactType("AAn_QG1xVGGhvAzxVMQA", "Test Procedure XL");
+ public static final IArtifactType TestResultNative = TokenFactory.createArtifactType("ATkaanWmHH3PkhGNVjwA", "Test Result Native");
+ public static final IArtifactType TestResultWML = TokenFactory.createArtifactType("ATk6NKFFmD_zg1b_eaQA", "Test Result WML");
+ public static final IArtifactType TestRun = TokenFactory.createArtifactType("AAMFDjqDHWo+orlSpaQA", "Test Run");
+ public static final IArtifactType TestRunDisposition = TokenFactory.createArtifactType("AAMFDjeNxhi0KmXZcKQA", "Test Run Disposition");
+ public static final IArtifactType TestSupport = TokenFactory.createArtifactType("AAMFDj+FW0f_Ut72ocQA", "Test Support");
+ public static final IArtifactType TestUnit = TokenFactory.createArtifactType("ABM2d6uxUw66aSdo0LwA", "Test Unit");
+ public static final IArtifactType UniversalGroup = TokenFactory.createArtifactType("AAMFDhLY2TnADPA_EQQA", "Universal Group");
+ public static final IArtifactType User = TokenFactory.createArtifactType("AAMFDhmr+Dqqe5pn3kAA", "User");
+ public static final IArtifactType UserGroup = TokenFactory.createArtifactType("AAMFDhrEbXqZKPfWkwAA", "User Group");
+ public static final IArtifactType WorkFlowDefinition = TokenFactory.createArtifactType("AAMFDh16eQ1GIHPWlYQA", "Work Flow Definition");
+ public static final IArtifactType WorkItemDefinition = TokenFactory.createArtifactType("ABNM6pIn_x_3e6a3aIgA", "Work Item Definition");
+ public static final IArtifactType WorkPageDefinition = TokenFactory.createArtifactType("AAMFDhzuyizN4qu7tXgA", "Work Page Definition");
+ public static final IArtifactType WorkRuleDefinition = TokenFactory.createArtifactType("AAMFDhxjHC2RUV2RkcQA", "Work Rule Definition");
+ public static final IArtifactType WorkWidgetDefinition = TokenFactory.createArtifactType("AAMFDh4IVzqPgVTpLrwA", "Work Widget Definition");
+ public static final IArtifactType XViewerGlobalCustomization = TokenFactory.createArtifactType("AAMFDhtN7T4of30iYhAA", "XViewer Global Customization");
// @formatter:on
- private CoreArtifactTypes(String guid, String name) {
- super(guid, name);
+ private CoreArtifactTypes() {
+ // Constants
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java
index 50fdc68d613..35cd056bb64 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java
@@ -11,100 +11,100 @@
package org.eclipse.osee.framework.core.enums;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
/**
* @author Roberto E. Escobar
*/
-public final class CoreAttributeTypes extends NamedIdentity implements IAttributeType {
+public final class CoreAttributeTypes {
// @formatter:off
- public static final IAttributeType Afha = new CoreAttributeTypes("AAMFEQGsxihCZXcrWtQA", "AFHA");
- public static final IAttributeType AccessContextId = new CoreAttributeTypes("AAFAgR3B7AN_g0NPCLAA", "Access Context Id");
- public static final IAttributeType Active = new CoreAttributeTypes("AAMFEbImQyR38BY8A5QA", "Active");
- public static final IAttributeType Annotation = new CoreAttributeTypes("AAMFEcWy0xc4e3tcemQA", "Annotation");
- public static final IAttributeType Category = new CoreAttributeTypes("AAMFEVfcEjwtly9djdgA", "Category");
- public static final IAttributeType City = new CoreAttributeTypes("AAMFEbkRZE1lIUmm_0AA", "City");
- public static final IAttributeType CommonNalRequirement = new CoreAttributeTypes("AAMFEQpKOwh5p+AgC8wA", "Common NAL Requirement");
- public static final IAttributeType Company = new CoreAttributeTypes("AAMFEbgTIG1iJuHoe6wA", "Company");
- public static final IAttributeType CompanyTitle = new CoreAttributeTypes("AAMFEbiRtwq7hoavdXwA", "Company Title");
- public static final IAttributeType Component = new CoreAttributeTypes("AAMFEVjkKR2EMfwWk4AA", "Component");
- public static final IAttributeType ContentUrl = new CoreAttributeTypes("AAMFEcIP+U+ML_gzH7AA", "Content URL");
- public static final IAttributeType Country = new CoreAttributeTypes("AAMFEbsk1xGUlmXk8zgA", "Country");
- public static final IAttributeType CrewInterfaceRequirement = new CoreAttributeTypes("AAMFEQrZMEwBcq2pQTgA", "Crew Interface Requirement");
- public static final IAttributeType CrossBranchLink = new CoreAttributeTypes("AXUR3KcbcVPqyNCdQmAA", "Cross Branch Link");
- public static final IAttributeType Csci = new CoreAttributeTypes("AAMFEXPEnnkY_07EbRgA", "CSCI");
- public static final IAttributeType DefaultMailServer = new CoreAttributeTypes("ABMuIC3FejpGilonfAgA", "osee.config.Default Mail Server");
- public static final IAttributeType DefaultGroup = new CoreAttributeTypes("AA37C8T6J1QyaT0+jBwA", "Default Group");
- public static final IAttributeType Description = new CoreAttributeTypes("AAMFEcK+kyOhG8GYvPgA", "Description");
- public static final IAttributeType DevelopmentAssuranceLevel = new CoreAttributeTypes("AAMFEVdW8Bdjtx4GvfwA", "Development Assurance Level");
- public static final IAttributeType Developmental = new CoreAttributeTypes("AAMFEP8lp3EupVzVp5QA", "Developmental");
- public static final IAttributeType Dictionary = new CoreAttributeTypes("AAMFEbcV9BXFKOqkVIwA", "Dictionary");
- public static final IAttributeType Effectivity = new CoreAttributeTypes("B1fqGH5hxBMylPX9VEQA", "Effectivity");
- public static final IAttributeType Email = new CoreAttributeTypes("AAMFEbaZjEVoecDFCCQA", "Email");
- public static final IAttributeType Extension = new CoreAttributeTypes("AAMFEcUbJEERZTnwJzAA", "Extension");
- public static final IAttributeType FtaResults = new CoreAttributeTypes("AAMFEQPomlhpBRRUceQA", "FTA Results");
- public static final IAttributeType FavoriteBranch = new CoreAttributeTypes("AAMFEbMnzS7P92knZKAA", "Favorite Branch");
- public static final IAttributeType FaxPhone = new CoreAttributeTypes("AAMFEbYdJAmEGg0TFhAA", "Fax Phone");
- public static final IAttributeType GeneralStringData = new CoreAttributeTypes("AAMFEca+MB5ssx+Ax5wA", "General String Data");
- public static final IAttributeType GfeCfe = new CoreAttributeTypes("AAMFEQR0SW+7bERFvXQA", "GFE / CFE");
- public static final IAttributeType Hazard = new CoreAttributeTypes("AAMFEQEe6XK8hGjJNxgA", "Hazard");
- public static final IAttributeType HazardSeverity = new CoreAttributeTypes("AAMFEQLLyEqgnjt85bwA", "Hazard Severity");
- public static final IAttributeType LegacyId = new CoreAttributeTypes("AAMFEQ5rrGxHTSvY73gA", "Legacy Id");
- public static final IAttributeType MobilePhone = new CoreAttributeTypes("AAMFEbWi7AIC1z82PxQA", "Mobile Phone");
- public static final IAttributeType Name = new CoreAttributeTypes("AAMFEcF1AzV7PKuHmxwA", "Name");
- public static final IAttributeType NativeContent = new CoreAttributeTypes("AAMFEcdBJGBK9nr9TTQA", "Native Content");
- public static final IAttributeType Notes = new CoreAttributeTypes("AAMFEbulnFZFQCiyvpAA", "Notes");
- public static final IAttributeType PageType = new CoreAttributeTypes("AAMFEcNiRF2N5xhkYyAA", "Page Type");
- public static final IAttributeType ParagraphNumber = new CoreAttributeTypes("AAMFEQ3boD3sp6VfArAA", "Imported Paragraph Number");
- public static final IAttributeType Partition = new CoreAttributeTypes("AAMFERHj9w6pmoLBCaQA", "Partition");
- public static final IAttributeType Phone = new CoreAttributeTypes("AAMFEbUkVSwKu4LSpWAA", "Phone");
- public static final IAttributeType PublishInline = new CoreAttributeTypes("ADpktgUh1xxE38Ht66QA", "PublishInline");
- public static final IAttributeType QualificationMethod = new CoreAttributeTypes("AAMFERMRKHkM9k_Rg2QA", "Qualification Method");
- public static final IAttributeType RelationOrder = new CoreAttributeTypes("ABM5kHa9cFsTbI_ooyQA", "Relation Order");
- public static final IAttributeType ReqType = new CoreAttributeTypes("AEQ9uyqjH3NpD0eThgAA", "Req Type");
- public static final IAttributeType Sfha = new CoreAttributeTypes("AAMFEQI800ecbF8oCPwA", "SFHA");
- public static final IAttributeType SafetyCriticality = new CoreAttributeTypes("AAMFERg99R51HIz45HAA", "Safety Criticality");
- public static final IAttributeType SafetyObjective = new CoreAttributeTypes("AAMFEQNYjjVjRoKuDsAA", "Safety Objective");
- public static final IAttributeType State = new CoreAttributeTypes("AAMFEbolfGTBLHnDCRQA", "State");
- public static final IAttributeType StaticId = new CoreAttributeTypes("AAMFEcY5DUbWyuIpZVwA", "Static Id");
- public static final IAttributeType Street = new CoreAttributeTypes("AAMFEbmjn19BhPhE2cwA", "Street");
- public static final IAttributeType Subsystem = new CoreAttributeTypes("AAMFERJ1GweNukuSd8QA", "Subsystem");
- public static final IAttributeType SystemSecurityRequirement = new CoreAttributeTypes("AAMFERC8OyWTMm8tMOQA", "System Security Requirement");
- public static final IAttributeType TechnicalPerformanceParameter = new CoreAttributeTypes("AAMFEVhhNTVx42mlvlQA", "Technical Performance Parameter");
- public static final IAttributeType TemplateMatchCriteria = new CoreAttributeTypes("AAMFEbeRRENHX5KTmxwA", "Template Match Criteria");
- public static final IAttributeType TestFrequency = new CoreAttributeTypes("AS7E+gDvsymdt28Aw3gA", "Test Frequency");
- public static final IAttributeType TestProcedureStatus = new CoreAttributeTypes("AKkUuN2K1ilSHnvIMPQA", "Test Procedure Status");
- public static final IAttributeType TestScriptGuid = new CoreAttributeTypes("AAMFEW5fEhinpcjeZ0wA", "Test Script GUID");
- public static final IAttributeType TisTestCategory = new CoreAttributeTypes("AAMFEVbEtV4QJQvA5eQA", "TIS Test Category");
- public static final IAttributeType TisTestNumber = new CoreAttributeTypes("AAMFERjRSDDgyyBh+OAA", "TIS Test Number");
- public static final IAttributeType TisTestType = new CoreAttributeTypes("AAMFEVXVuFcy8wCED5AA", "TIS Test Type");
- public static final IAttributeType TrainingEffectivity = new CoreAttributeTypes("AAMFERFJAm0_WZ0WQaQA", "Training Effectivity");
- public static final IAttributeType UserId = new CoreAttributeTypes("AAMFEbKl8RCQr17bDAQA", "User Id");
- public static final IAttributeType UserSettings = new CoreAttributeTypes("AAMFEbOnewRpnYFgnHQA", "User Settings");
- public static final IAttributeType VerificationEvent = new CoreAttributeTypes("AAMFEXlt02WfQ0jcQtAA", "Verification Event");
- public static final IAttributeType VerificationLevel = new CoreAttributeTypes("AAMFEXRTkyKVIFqcMwQA", "Verification Level");
- public static final IAttributeType Website = new CoreAttributeTypes("AAMFEbwiBAmrHwSeMHgA", "Website");
- public static final IAttributeType WholeWordContent = new CoreAttributeTypes("AAMFEchZmAzZo2tHjVAA", "Whole Word Content");
- public static final IAttributeType WordOleData = new CoreAttributeTypes("AAMFEcP2rmoCzqmzJxQA", "Word Ole Data");
- public static final IAttributeType WordTemplateContent = new CoreAttributeTypes("AAMFEcfcGS2V3SqQN2wA", "Word Template Content");
- public static final IAttributeType WorkData = new CoreAttributeTypes("AAMFEbyhslOoQf3+hyAA", "osee.wi.Work Data");
- public static final IAttributeType WorkDescription = new CoreAttributeTypes("AAMFEb57TkhPHyzOLDwA", "osee.wi.Work Description");
- public static final IAttributeType WorkId = new CoreAttributeTypes("AAMFEb0hXw933Zrje2QA", "osee.wi.Work Id");
- public static final IAttributeType WorkPageType = new CoreAttributeTypes("ATTKEn8ob0KafAl5vuAA", "osee.wi.Work Page Type");
- public static final IAttributeType WorkPageName = new CoreAttributeTypes("AAMFEb+vCyCjKbzzHoQA", "osee.wi.Work Page Name");
- public static final IAttributeType WorkPageOrdinal = new CoreAttributeTypes("AGb3uHUiiFc2GkZc1bwA", "osee.wi.Work Page Ordinal");
- public static final IAttributeType WorkParentId = new CoreAttributeTypes("AAMFEb8R5y9WcjD5hcwA", "osee.wi.Work Parent Id");
- public static final IAttributeType WorkStartPage = new CoreAttributeTypes("AAMFEcDfggQLaAdLlpQA", "osee.wi.Start Page");
- public static final IAttributeType WorkTransition = new CoreAttributeTypes("AAMFEcBLGB5U+55hJrQA", "osee.wi.Transition");
- public static final IAttributeType WorkType = new CoreAttributeTypes("AAMFEb2f9nh42sjMHfAA", "osee.wi.Work Type");
- public static final IAttributeType WorkflowDefinition = new CoreAttributeTypes("AAMFEcSPdVbU8mGugOQA", "Workflow Definition");
- public static final IAttributeType XViewerCustomization = new CoreAttributeTypes("AAMFEbQk+hTB9fE3uNAA", "XViewer Customization");
- public static final IAttributeType XViewerDefaults = new CoreAttributeTypes("AAMFEbSjkAKRqLzkWpAA", "XViewer Defaults");
- public static final IAttributeType Zip = new CoreAttributeTypes("AAMFEbqmQUTrgrQ7rKgA", "Zip");
+ public static final IAttributeType Afha = TokenFactory.createAttributeType("AAMFEQGsxihCZXcrWtQA", "AFHA");
+ public static final IAttributeType AccessContextId = TokenFactory.createAttributeType("AAFAgR3B7AN_g0NPCLAA", "Access Context Id");
+ public static final IAttributeType Active = TokenFactory.createAttributeType("AAMFEbImQyR38BY8A5QA", "Active");
+ public static final IAttributeType Annotation = TokenFactory.createAttributeType("AAMFEcWy0xc4e3tcemQA", "Annotation");
+ public static final IAttributeType Category = TokenFactory.createAttributeType("AAMFEVfcEjwtly9djdgA", "Category");
+ public static final IAttributeType City = TokenFactory.createAttributeType("AAMFEbkRZE1lIUmm_0AA", "City");
+ public static final IAttributeType CommonNalRequirement = TokenFactory.createAttributeType("AAMFEQpKOwh5p+AgC8wA", "Common NAL Requirement");
+ public static final IAttributeType Company = TokenFactory.createAttributeType("AAMFEbgTIG1iJuHoe6wA", "Company");
+ public static final IAttributeType CompanyTitle = TokenFactory.createAttributeType("AAMFEbiRtwq7hoavdXwA", "Company Title");
+ public static final IAttributeType Component = TokenFactory.createAttributeType("AAMFEVjkKR2EMfwWk4AA", "Component");
+ public static final IAttributeType ContentUrl = TokenFactory.createAttributeType("AAMFEcIP+U+ML_gzH7AA", "Content URL");
+ public static final IAttributeType Country = TokenFactory.createAttributeType("AAMFEbsk1xGUlmXk8zgA", "Country");
+ public static final IAttributeType CrewInterfaceRequirement = TokenFactory.createAttributeType("AAMFEQrZMEwBcq2pQTgA", "Crew Interface Requirement");
+ public static final IAttributeType CrossBranchLink = TokenFactory.createAttributeType("AXUR3KcbcVPqyNCdQmAA", "Cross Branch Link");
+ public static final IAttributeType Csci = TokenFactory.createAttributeType("AAMFEXPEnnkY_07EbRgA", "CSCI");
+ public static final IAttributeType DefaultMailServer = TokenFactory.createAttributeType("ABMuIC3FejpGilonfAgA", "osee.config.Default Mail Server");
+ public static final IAttributeType DefaultGroup = TokenFactory.createAttributeType("AA37C8T6J1QyaT0+jBwA", "Default Group");
+ public static final IAttributeType Description = TokenFactory.createAttributeType("AAMFEcK+kyOhG8GYvPgA", "Description");
+ public static final IAttributeType DevelopmentAssuranceLevel = TokenFactory.createAttributeType("AAMFEVdW8Bdjtx4GvfwA", "Development Assurance Level");
+ public static final IAttributeType Developmental = TokenFactory.createAttributeType("AAMFEP8lp3EupVzVp5QA", "Developmental");
+ public static final IAttributeType Dictionary = TokenFactory.createAttributeType("AAMFEbcV9BXFKOqkVIwA", "Dictionary");
+ public static final IAttributeType Effectivity = TokenFactory.createAttributeType("B1fqGH5hxBMylPX9VEQA", "Effectivity");
+ public static final IAttributeType Email = TokenFactory.createAttributeType("AAMFEbaZjEVoecDFCCQA", "Email");
+ public static final IAttributeType Extension = TokenFactory.createAttributeType("AAMFEcUbJEERZTnwJzAA", "Extension");
+ public static final IAttributeType FtaResults = TokenFactory.createAttributeType("AAMFEQPomlhpBRRUceQA", "FTA Results");
+ public static final IAttributeType FavoriteBranch = TokenFactory.createAttributeType("AAMFEbMnzS7P92knZKAA", "Favorite Branch");
+ public static final IAttributeType FaxPhone = TokenFactory.createAttributeType("AAMFEbYdJAmEGg0TFhAA", "Fax Phone");
+ public static final IAttributeType GeneralStringData = TokenFactory.createAttributeType("AAMFEca+MB5ssx+Ax5wA", "General String Data");
+ public static final IAttributeType GfeCfe = TokenFactory.createAttributeType("AAMFEQR0SW+7bERFvXQA", "GFE / CFE");
+ public static final IAttributeType Hazard = TokenFactory.createAttributeType("AAMFEQEe6XK8hGjJNxgA", "Hazard");
+ public static final IAttributeType HazardSeverity = TokenFactory.createAttributeType("AAMFEQLLyEqgnjt85bwA", "Hazard Severity");
+ public static final IAttributeType LegacyId = TokenFactory.createAttributeType("AAMFEQ5rrGxHTSvY73gA", "Legacy Id");
+ public static final IAttributeType MobilePhone = TokenFactory.createAttributeType("AAMFEbWi7AIC1z82PxQA", "Mobile Phone");
+ public static final IAttributeType Name = TokenFactory.createAttributeType("AAMFEcF1AzV7PKuHmxwA", "Name");
+ public static final IAttributeType NativeContent = TokenFactory.createAttributeType("AAMFEcdBJGBK9nr9TTQA", "Native Content");
+ public static final IAttributeType Notes = TokenFactory.createAttributeType("AAMFEbulnFZFQCiyvpAA", "Notes");
+ public static final IAttributeType PageType = TokenFactory.createAttributeType("AAMFEcNiRF2N5xhkYyAA", "Page Type");
+ public static final IAttributeType ParagraphNumber = TokenFactory.createAttributeType("AAMFEQ3boD3sp6VfArAA", "Imported Paragraph Number");
+ public static final IAttributeType Partition = TokenFactory.createAttributeType("AAMFERHj9w6pmoLBCaQA", "Partition");
+ public static final IAttributeType Phone = TokenFactory.createAttributeType("AAMFEbUkVSwKu4LSpWAA", "Phone");
+ public static final IAttributeType PublishInline = TokenFactory.createAttributeType("ADpktgUh1xxE38Ht66QA", "PublishInline");
+ public static final IAttributeType QualificationMethod = TokenFactory.createAttributeType("AAMFERMRKHkM9k_Rg2QA", "Qualification Method");
+ public static final IAttributeType RelationOrder = TokenFactory.createAttributeType("ABM5kHa9cFsTbI_ooyQA", "Relation Order");
+ public static final IAttributeType ReqType = TokenFactory.createAttributeType("AEQ9uyqjH3NpD0eThgAA", "Req Type");
+ public static final IAttributeType Sfha = TokenFactory.createAttributeType("AAMFEQI800ecbF8oCPwA", "SFHA");
+ public static final IAttributeType SafetyCriticality = TokenFactory.createAttributeType("AAMFERg99R51HIz45HAA", "Safety Criticality");
+ public static final IAttributeType SafetyObjective = TokenFactory.createAttributeType("AAMFEQNYjjVjRoKuDsAA", "Safety Objective");
+ public static final IAttributeType State = TokenFactory.createAttributeType("AAMFEbolfGTBLHnDCRQA", "State");
+ public static final IAttributeType StaticId = TokenFactory.createAttributeType("AAMFEcY5DUbWyuIpZVwA", "Static Id");
+ public static final IAttributeType Street = TokenFactory.createAttributeType("AAMFEbmjn19BhPhE2cwA", "Street");
+ public static final IAttributeType Subsystem = TokenFactory.createAttributeType("AAMFERJ1GweNukuSd8QA", "Subsystem");
+ public static final IAttributeType SystemSecurityRequirement = TokenFactory.createAttributeType("AAMFERC8OyWTMm8tMOQA", "System Security Requirement");
+ public static final IAttributeType TechnicalPerformanceParameter = TokenFactory.createAttributeType("AAMFEVhhNTVx42mlvlQA", "Technical Performance Parameter");
+ public static final IAttributeType TemplateMatchCriteria = TokenFactory.createAttributeType("AAMFEbeRRENHX5KTmxwA", "Template Match Criteria");
+ public static final IAttributeType TestFrequency = TokenFactory.createAttributeType("AS7E+gDvsymdt28Aw3gA", "Test Frequency");
+ public static final IAttributeType TestProcedureStatus = TokenFactory.createAttributeType("AKkUuN2K1ilSHnvIMPQA", "Test Procedure Status");
+ public static final IAttributeType TestScriptGuid = TokenFactory.createAttributeType("AAMFEW5fEhinpcjeZ0wA", "Test Script GUID");
+ public static final IAttributeType TisTestCategory = TokenFactory.createAttributeType("AAMFEVbEtV4QJQvA5eQA", "TIS Test Category");
+ public static final IAttributeType TisTestNumber = TokenFactory.createAttributeType("AAMFERjRSDDgyyBh+OAA", "TIS Test Number");
+ public static final IAttributeType TisTestType = TokenFactory.createAttributeType("AAMFEVXVuFcy8wCED5AA", "TIS Test Type");
+ public static final IAttributeType TrainingEffectivity = TokenFactory.createAttributeType("AAMFERFJAm0_WZ0WQaQA", "Training Effectivity");
+ public static final IAttributeType UserId = TokenFactory.createAttributeType("AAMFEbKl8RCQr17bDAQA", "User Id");
+ public static final IAttributeType UserSettings = TokenFactory.createAttributeType("AAMFEbOnewRpnYFgnHQA", "User Settings");
+ public static final IAttributeType VerificationEvent = TokenFactory.createAttributeType("AAMFEXlt02WfQ0jcQtAA", "Verification Event");
+ public static final IAttributeType VerificationLevel = TokenFactory.createAttributeType("AAMFEXRTkyKVIFqcMwQA", "Verification Level");
+ public static final IAttributeType Website = TokenFactory.createAttributeType("AAMFEbwiBAmrHwSeMHgA", "Website");
+ public static final IAttributeType WholeWordContent = TokenFactory.createAttributeType("AAMFEchZmAzZo2tHjVAA", "Whole Word Content");
+ public static final IAttributeType WordOleData = TokenFactory.createAttributeType("AAMFEcP2rmoCzqmzJxQA", "Word Ole Data");
+ public static final IAttributeType WordTemplateContent = TokenFactory.createAttributeType("AAMFEcfcGS2V3SqQN2wA", "Word Template Content");
+ public static final IAttributeType WorkData = TokenFactory.createAttributeType("AAMFEbyhslOoQf3+hyAA", "osee.wi.Work Data");
+ public static final IAttributeType WorkDescription = TokenFactory.createAttributeType("AAMFEb57TkhPHyzOLDwA", "osee.wi.Work Description");
+ public static final IAttributeType WorkId = TokenFactory.createAttributeType("AAMFEb0hXw933Zrje2QA", "osee.wi.Work Id");
+ public static final IAttributeType WorkPageType = TokenFactory.createAttributeType("ATTKEn8ob0KafAl5vuAA", "osee.wi.Work Page Type");
+ public static final IAttributeType WorkPageName = TokenFactory.createAttributeType("AAMFEb+vCyCjKbzzHoQA", "osee.wi.Work Page Name");
+ public static final IAttributeType WorkPageOrdinal = TokenFactory.createAttributeType("AGb3uHUiiFc2GkZc1bwA", "osee.wi.Work Page Ordinal");
+ public static final IAttributeType WorkParentId = TokenFactory.createAttributeType("AAMFEb8R5y9WcjD5hcwA", "osee.wi.Work Parent Id");
+ public static final IAttributeType WorkStartPage = TokenFactory.createAttributeType("AAMFEcDfggQLaAdLlpQA", "osee.wi.Start Page");
+ public static final IAttributeType WorkTransition = TokenFactory.createAttributeType("AAMFEcBLGB5U+55hJrQA", "osee.wi.Transition");
+ public static final IAttributeType WorkType = TokenFactory.createAttributeType("AAMFEb2f9nh42sjMHfAA", "osee.wi.Work Type");
+ public static final IAttributeType WorkflowDefinition = TokenFactory.createAttributeType("AAMFEcSPdVbU8mGugOQA", "Workflow Definition");
+ public static final IAttributeType XViewerCustomization = TokenFactory.createAttributeType("AAMFEbQk+hTB9fE3uNAA", "XViewer Customization");
+ public static final IAttributeType XViewerDefaults = TokenFactory.createAttributeType("AAMFEbSjkAKRqLzkWpAA", "XViewer Defaults");
+ public static final IAttributeType Zip = TokenFactory.createAttributeType("AAMFEbqmQUTrgrQ7rKgA", "Zip");
// @formatter:on
- private CoreAttributeTypes(String guid, String name) {
- super(guid, name);
+ private CoreAttributeTypes() {
+ // Constants
}
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java
index c05c5360ea1..ccfa940d33c 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreBranches.java
@@ -11,16 +11,18 @@
package org.eclipse.osee.framework.core.enums;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
/**
* @author Roberto E. Escobar
*/
-public class CoreBranches extends NamedIdentity implements IOseeBranch {
- public static final CoreBranches COMMON = new CoreBranches("AyH_fDpMERA+zDfML4gA", "Common");
- public static final CoreBranches SYSTEM_ROOT = new CoreBranches("AyH_fDnM2RFEhyybolQA", "System Root Branch");
+public final class CoreBranches {
- public CoreBranches(String guid, String name) {
- super(guid, name);
+ public static final IOseeBranch COMMON = TokenFactory.createBranch("AyH_fDpMERA+zDfML4gA", "Common");
+ public static final IOseeBranch SYSTEM_ROOT =
+ TokenFactory.createBranch("AyH_fDnM2RFEhyybolQA", "System Root Branch");
+
+ public CoreBranches() {
+ // Constants
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java
index 93d3cd71c45..f84449c28bf 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java
@@ -12,90 +12,85 @@ package org.eclipse.osee.framework.core.enums;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_A;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_B;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.TokenFactory;
-public class CoreRelationTypes extends NamedIdentity implements IRelationEnumeration {
+public final class CoreRelationTypes {
- public static final CoreRelationTypes Allocation__Requirement = new CoreRelationTypes(SIDE_A,
+ public static final IRelationTypeSide Allocation__Requirement = TokenFactory.createRelationTypeSide(SIDE_A,
"AAMFE+RS8gRV2BXaCtQA", "Allocation");
- public static final CoreRelationTypes Allocation__Component = new CoreRelationTypes(SIDE_B, "AAMFE+RS8gRV2BXaCtQA",
- "Allocation");
- public static final CoreRelationTypes CodeRequirement_Requirement = new CoreRelationTypes(SIDE_B,
+ public static final IRelationTypeSide Allocation__Component = TokenFactory.createRelationTypeSide(SIDE_B,
+ "AAMFE+RS8gRV2BXaCtQA", "Allocation");
+ public static final IRelationTypeSide CodeRequirement_Requirement = TokenFactory.createRelationTypeSide(SIDE_B,
"AAMFE+TNKxG5ytcGHqgA", "Code-Requirement");
- public static final CoreRelationTypes CodeRequirement_CodeUnit = new CoreRelationTypes(SIDE_A,
+ public static final IRelationTypeSide CodeRequirement_CodeUnit = TokenFactory.createRelationTypeSide(SIDE_A,
"AAMFE+TNKxG5ytcGHqgA", "Code-Requirement");
- public static final CoreRelationTypes Default_Hierarchical__Parent = new CoreRelationTypes(SIDE_A,
+ public static final IRelationTypeSide Default_Hierarchical__Parent = TokenFactory.createRelationTypeSide(SIDE_A,
"AAMFE9skWhPMi6I1WdAA", "Default Hierarchical");
- public static final CoreRelationTypes Default_Hierarchical__Child = new CoreRelationTypes(SIDE_B,
+ public static final IRelationTypeSide Default_Hierarchical__Child = TokenFactory.createRelationTypeSide(SIDE_B,
"AAMFE9skWhPMi6I1WdAA", "Default Hierarchical");
- public static final CoreRelationTypes Dependency__Dependency = new CoreRelationTypes(SIDE_B, "AAMFE9uek34jqArVRuAA",
- "Dependency");
- public static final CoreRelationTypes Dependency__Artifact = new CoreRelationTypes(SIDE_A, "AAMFE9uek34jqArVRuAA",
- "Dependency");
- public static final CoreRelationTypes Design__Design = new CoreRelationTypes(SIDE_B, "AAMFE+XjcSaqnXfOXVQA",
- "Design");
- public static final CoreRelationTypes Design__Requirement = new CoreRelationTypes(SIDE_A, "AAMFE+XjcSaqnXfOXVQA",
- "Design");
- public static final CoreRelationTypes Executes__Test_Plan_Element = new CoreRelationTypes(SIDE_A,
+ public static final IRelationTypeSide Dependency__Dependency = TokenFactory.createRelationTypeSide(SIDE_B,
+ "AAMFE9uek34jqArVRuAA", "Dependency");
+ public static final IRelationTypeSide Dependency__Artifact = TokenFactory.createRelationTypeSide(SIDE_A,
+ "AAMFE9uek34jqArVRuAA", "Dependency");
+ public static final IRelationTypeSide Design__Design = TokenFactory.createRelationTypeSide(SIDE_B,
+ "AAMFE+XjcSaqnXfOXVQA", "Design");
+ public static final IRelationTypeSide Design__Requirement = TokenFactory.createRelationTypeSide(SIDE_A,
+ "AAMFE+XjcSaqnXfOXVQA", "Design");
+ public static final IRelationTypeSide Executes__Test_Plan_Element = TokenFactory.createRelationTypeSide(SIDE_A,
"AWo0+Hkh+2qNMeAlUwQA", "Executes");
- public static final CoreRelationTypes Executes__Test_Procedure = new CoreRelationTypes(SIDE_B,
+ public static final IRelationTypeSide Executes__Test_Procedure = TokenFactory.createRelationTypeSide(SIDE_B,
"AWo0+Hkh+2qNMeAlUwQA", "Executes");
- public static final CoreRelationTypes Requirement_Trace__Higher_Level = new CoreRelationTypes(SIDE_A,
+ public static final IRelationTypeSide Requirement_Trace__Higher_Level = TokenFactory.createRelationTypeSide(SIDE_A,
"AAMFE+dRBVFN6fAPXdwA", "Requirement Trace");
- public static final CoreRelationTypes Requirement_Trace__Lower_Level = new CoreRelationTypes(SIDE_B,
+ public static final IRelationTypeSide Requirement_Trace__Lower_Level = TokenFactory.createRelationTypeSide(SIDE_B,
"AAMFE+dRBVFN6fAPXdwA", "Requirement Trace");
- public static final CoreRelationTypes Supercedes_Supercedes = new CoreRelationTypes(SIDE_A, "AAMFE9qJZC_qegaByjgA",
- "Supercedes");
- public static final CoreRelationTypes Supercedes_Superceded = new CoreRelationTypes(SIDE_B, "AAMFE9qJZC_qegaByjgA",
- "Supercedes");
- public static final CoreRelationTypes SupportingInfo_SupportedBy = new CoreRelationTypes(SIDE_A,
+ public static final IRelationTypeSide Supercedes_Supercedes = TokenFactory.createRelationTypeSide(SIDE_A,
+ "AAMFE9qJZC_qegaByjgA", "Supercedes");
+ public static final IRelationTypeSide Supercedes_Superceded = TokenFactory.createRelationTypeSide(SIDE_B,
+ "AAMFE9qJZC_qegaByjgA", "Supercedes");
+ public static final IRelationTypeSide SupportingInfo_SupportedBy = TokenFactory.createRelationTypeSide(SIDE_A,
"AAMFE9wWnVhFW0wtOPAA", "Supporting Info");
- public static final CoreRelationTypes SupportingInfo_SupportingInfo = new CoreRelationTypes(SIDE_B,
+ public static final IRelationTypeSide SupportingInfo_SupportingInfo = TokenFactory.createRelationTypeSide(SIDE_B,
"AAMFE9wWnVhFW0wtOPAA", "Supporting Info");
- public static final CoreRelationTypes TeamMember_Team = new CoreRelationTypes(SIDE_A, "AAMFE92A6gCO9WJ2ijQA",
- "TeamMember");
- public static final CoreRelationTypes TeamMember_Member = new CoreRelationTypes(SIDE_B, "AAMFE92A6gCO9WJ2ijQA",
- "TeamMember");
- public static final CoreRelationTypes Test_Unit_Result__Test_Unit = new CoreRelationTypes(SIDE_A,
+ public static final IRelationTypeSide TeamMember_Team = TokenFactory.createRelationTypeSide(SIDE_A,
+ "AAMFE92A6gCO9WJ2ijQA", "TeamMember");
+ public static final IRelationTypeSide TeamMember_Member = TokenFactory.createRelationTypeSide(SIDE_B,
+ "AAMFE92A6gCO9WJ2ijQA", "TeamMember");
+ public static final IRelationTypeSide Test_Unit_Result__Test_Unit = TokenFactory.createRelationTypeSide(SIDE_A,
"AQm9ouX6JwBD29WrFoAA", "Results Data");
- public static final CoreRelationTypes Test_Unit_Result__Test_Result = new CoreRelationTypes(SIDE_B,
+ public static final IRelationTypeSide Test_Unit_Result__Test_Result = TokenFactory.createRelationTypeSide(SIDE_B,
"AQm9ouX6JwBD29WrFoAA", "Results Data");
- public static final CoreRelationTypes Universal_Grouping__Members = new CoreRelationTypes(SIDE_B,
+ public static final IRelationTypeSide Universal_Grouping__Members = TokenFactory.createRelationTypeSide(SIDE_B,
"AAMFE9yOp2hIrXwZ13wA", "Universal Grouping");
- public static final CoreRelationTypes Universal_Grouping__Group = new CoreRelationTypes(SIDE_A,
+ public static final IRelationTypeSide Universal_Grouping__Group = TokenFactory.createRelationTypeSide(SIDE_A,
"AAMFE9yOp2hIrXwZ13wA", "Universal Grouping");
- public static final CoreRelationTypes Users_Artifact =
- new CoreRelationTypes(SIDE_A, "AAMFE9nibXSCqcoXkMAA", "Users");
- public static final CoreRelationTypes Users_User = new CoreRelationTypes(SIDE_B, "AAMFE9nibXSCqcoXkMAA", "Users");
- public static final CoreRelationTypes Uses__Requirement = new CoreRelationTypes(SIDE_A, "AAMFE_GV43rvba32QqwA",
- "Uses");
- public static final CoreRelationTypes Uses__TestUnit = new CoreRelationTypes(SIDE_B, "AAMFE_GV43rvba32QqwA", "Uses");
- public static final CoreRelationTypes Validation__Requirement = new CoreRelationTypes(SIDE_A,
+ public static final IRelationTypeSide Users_Artifact = TokenFactory.createRelationTypeSide(SIDE_A,
+ "AAMFE9nibXSCqcoXkMAA", "Users");
+ public static final IRelationTypeSide Users_User = TokenFactory.createRelationTypeSide(SIDE_B,
+ "AAMFE9nibXSCqcoXkMAA", "Users");
+ public static final IRelationTypeSide Uses__Requirement = TokenFactory.createRelationTypeSide(SIDE_A,
+ "AAMFE_GV43rvba32QqwA", "Uses");
+ public static final IRelationTypeSide Uses__TestUnit = TokenFactory.createRelationTypeSide(SIDE_B,
+ "AAMFE_GV43rvba32QqwA", "Uses");
+ public static final IRelationTypeSide Validation__Requirement = TokenFactory.createRelationTypeSide(SIDE_A,
+ "AAMFE+fMVRM8f9BUD0AA", "Validation");
+ public static final IRelationTypeSide Validation__Validator = TokenFactory.createRelationTypeSide(SIDE_B,
"AAMFE+fMVRM8f9BUD0AA", "Validation");
- public static final CoreRelationTypes Validation__Validator = new CoreRelationTypes(SIDE_B, "AAMFE+fMVRM8f9BUD0AA",
- "Validation");
- public static final CoreRelationTypes Verification__Requirement = new CoreRelationTypes(SIDE_A,
+ public static final IRelationTypeSide Verification__Requirement = TokenFactory.createRelationTypeSide(SIDE_A,
"AAMFE+ZdqgB+D5zP5+gA", "Verification");
- public static final CoreRelationTypes Verification__Verifier = new CoreRelationTypes(SIDE_B, "AAMFE+ZdqgB+D5zP5+gA",
- "Verification");
- public static final CoreRelationTypes Verification_Plan__Requirement = new CoreRelationTypes(SIDE_A,
- "ATmJsVc28wU57zFAi7AA", "Verification Plan");
- public static final CoreRelationTypes Verification_Plan__Test_Plan_Element = new CoreRelationTypes(SIDE_B,
+ public static final IRelationTypeSide Verification__Verifier = TokenFactory.createRelationTypeSide(SIDE_B,
+ "AAMFE+ZdqgB+D5zP5+gA", "Verification");
+ public static final IRelationTypeSide Verification_Plan__Requirement = TokenFactory.createRelationTypeSide(SIDE_A,
"ATmJsVc28wU57zFAi7AA", "Verification Plan");
- public static final CoreRelationTypes WorkItem__Parent = new CoreRelationTypes(SIDE_A, "AAMFE9jvEzcbzwAfjzwA",
- "Work Item");
- public static final CoreRelationTypes WorkItem__Child = new CoreRelationTypes(SIDE_B, "AAMFE9jvEzcbzwAfjzwA",
- "Work Item");
-
- private final RelationSide relationSide;
-
- private CoreRelationTypes(RelationSide side, String guid, String name) {
- super(guid, name);
- this.relationSide = side;
- }
+ public static final IRelationTypeSide Verification_Plan__Test_Plan_Element = TokenFactory.createRelationTypeSide(
+ SIDE_B, "ATmJsVc28wU57zFAi7AA", "Verification Plan");
+ public static final IRelationTypeSide WorkItem__Parent = TokenFactory.createRelationTypeSide(SIDE_A,
+ "AAMFE9jvEzcbzwAfjzwA", "Work Item");
+ public static final IRelationTypeSide WorkItem__Child = TokenFactory.createRelationTypeSide(SIDE_B,
+ "AAMFE9jvEzcbzwAfjzwA", "Work Item");
- @Override
- public RelationSide getSide() {
- return relationSide;
+ private CoreRelationTypes() {
+ // Constants
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventFiltersTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventFiltersTest.java
index 534a4271d04..32e15d2f865 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventFiltersTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventFiltersTest.java
@@ -13,10 +13,9 @@ package org.eclipse.osee.framework.skynet.core.test.event;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-
import junit.framework.Assert;
-
-import org.eclipse.osee.framework.core.data.OseeBranch;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
@@ -93,7 +92,8 @@ public class ArtifactEventFiltersTest {
private void testArtifactEventFilters__branchFilter() throws Exception {
// Create dummy artifact event
String branchGuid = GUID.create();
- ArtifactEvent testArtifactEvent = new ArtifactEvent(new OseeBranch("test branch", branchGuid));
+ IOseeBranch branchToken = TokenFactory.createBranch(branchGuid, "test branch");
+ ArtifactEvent testArtifactEvent = new ArtifactEvent(branchToken);
testArtifactEvent.setNetworkSender(getDummyRemoteNetworkSender());
// Register set filters to null to see if event comes through
@@ -139,15 +139,18 @@ public class ArtifactEventFiltersTest {
private void testArtifactEventFilters__branchFilterArtifactType() throws Exception {
// Create dummy artifact event
String branchGuid = GUID.create();
- ArtifactEvent testArtifactEvent = new ArtifactEvent(new OseeBranch("test branch 2", branchGuid));
+ IOseeBranch branchToken = TokenFactory.createBranch(branchGuid, "test branch 2");
+ ArtifactEvent testArtifactEvent = new ArtifactEvent(branchToken);
testArtifactEvent.setNetworkSender(getDummyRemoteNetworkSender());
testArtifactEvent.getArtifacts().add(
- new EventBasicGuidArtifact(EventModType.Added, branchGuid, CoreArtifactTypes.GeneralDocument.getGuid(),
- GUID.create()));
+ new EventBasicGuidArtifact(EventModType.Added, branchGuid, CoreArtifactTypes.GeneralDocument.getGuid(),
+ GUID.create()));
// Reset event filters only allow events from this branch
eventFilters = new ArrayList<IEventFilter>();
- eventFilters.add(new BranchGuidEventFilter(new OseeBranch("Test Branch", branchGuid)));
+
+ IOseeBranch branchToken2 = TokenFactory.createBranch(branchGuid, "Test Branch");
+ eventFilters.add(new BranchGuidEventFilter(branchToken2));
eventFilters.add(new ArtifactTypeEventFilter(CoreArtifactTypes.GeneralDocument));
resultArtifactEvent = null;
resultSender = null;
@@ -162,7 +165,9 @@ public class ArtifactEventFiltersTest {
// Reset event filters to only send other artifact type of this branch
eventFilters = new ArrayList<IEventFilter>();
- eventFilters.add(new BranchGuidEventFilter(new OseeBranch("Test Branch", branchGuid)));
+
+ IOseeBranch branchToken3 = TokenFactory.createBranch(branchGuid, "Test Branch");
+ eventFilters.add(new BranchGuidEventFilter(branchToken3));
eventFilters.add(new ArtifactTypeEventFilter(CoreArtifactTypes.Folder));
resultArtifactEvent = null;
resultSender = null;
@@ -175,7 +180,9 @@ public class ArtifactEventFiltersTest {
// Reset event filters to only send OTHER branch events
eventFilters = new ArrayList<IEventFilter>();
- eventFilters.add(new BranchGuidEventFilter(new OseeBranch("Other Test Branch", GUID.create())));
+
+ IOseeBranch branchToken4 = TokenFactory.createBranch(GUID.create(), "Other Test Branch");
+ eventFilters.add(new BranchGuidEventFilter(branchToken4));
eventFilters.add(new ArtifactTypeEventFilter(CoreArtifactTypes.GeneralDocument));
resultArtifactEvent = null;
resultSender = null;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java
index 650d4f9a58f..58cac0177d5 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java
@@ -15,7 +15,8 @@ import java.util.Arrays;
import java.util.List;
import java.util.logging.Level;
import junit.framework.Assert;
-import org.eclipse.osee.framework.core.data.OseeBranch;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
@@ -305,8 +306,9 @@ public class BranchEventTest {
private Branch testEvents__topLevelAdded() throws Exception {
clearEventCollections();
final String guid = GUID.create();
- Branch branch =
- BranchManager.createTopLevelBranch(new OseeBranch(BRANCH_NAME_PREFIX + " - top level branch", guid));
+ final String branchName = String.format("%s - top level branch", BRANCH_NAME_PREFIX);
+ IOseeBranch branchToken = TokenFactory.createBranch(guid, branchName);
+ Branch branch = BranchManager.createTopLevelBranch(branchToken);
Assert.assertNotNull(branch);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderMergeUtilityTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderMergeUtilityTest.java
index 9a710409a79..9eba87df69b 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderMergeUtilityTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderMergeUtilityTest.java
@@ -16,6 +16,7 @@ import static org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil
import static org.eclipse.osee.framework.skynet.core.test.util.FrameworkTestUtil.createSimpleArtifacts;
import java.util.List;
import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -40,7 +41,7 @@ import org.junit.Test;
* @author Ryan Schmitt
*/
public class RelationOrderMergeUtilityTest {
- private final CoreRelationTypes defaultHierarchy = CoreRelationTypes.Default_Hierarchical__Child;
+ private final IRelationTypeSide defaultHierarchy = CoreRelationTypes.Default_Hierarchical__Child;
private final IRelationSorterId ascOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
private final IRelationSorterId descOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java
index a9670b91c80..73deba3b7ec 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/OseeSystemArtifacts.java
@@ -55,9 +55,9 @@ public final class OseeSystemArtifacts {
return getOrCreateCachedArtifact(artifactType, artifactName, branch, null, true);
}
- public static Artifact getOrCreateArtifact(IArtifactToken artifactToken) throws OseeCoreException {
- return getOrCreateCachedArtifact(artifactToken.getArtifactType(), artifactToken.getName(),
- artifactToken.getBranch(), artifactToken.getGuid(), true);
+ public static Artifact getOrCreateArtifact(IArtifactToken artifactToken, IOseeBranch branch) throws OseeCoreException {
+ return getOrCreateCachedArtifact(artifactToken.getArtifactType(), artifactToken.getName(), branch,
+ artifactToken.getGuid(), true);
}
public static Artifact getCachedArtifact(IArtifactType artifactType, String artifactName, IOseeBranch branch) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
index bee1cfdf13f..86a2875e394 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
@@ -36,13 +36,13 @@ import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.IRelationSorterId;
import org.eclipse.osee.framework.core.data.IRelationType;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.data.NamedIdentity;
import org.eclipse.osee.framework.core.data.SystemUser;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.enums.EditState;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
@@ -179,31 +179,31 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
return RelationManager.getRelatedArtifacts(this, relationTypeSide);
}
- public final List<Artifact> getRelatedArtifactsUnSorted(IRelationEnumeration relationEnum) throws OseeCoreException {
+ public final List<Artifact> getRelatedArtifactsUnSorted(IRelationTypeSide relationEnum) throws OseeCoreException {
return RelationManager.getRelatedArtifactsUnSorted(this, relationEnum);
}
- public final List<Artifact> getRelatedArtifacts(IRelationEnumeration relationEnum) throws OseeCoreException {
+ public final List<Artifact> getRelatedArtifacts(IRelationTypeSide relationEnum) throws OseeCoreException {
return RelationManager.getRelatedArtifacts(this, relationEnum);
}
- public final List<Artifact> getRelatedArtifacts(IRelationEnumeration relationEnum, DeletionFlag deletionFlag) throws OseeCoreException {
+ public final List<Artifact> getRelatedArtifacts(IRelationTypeSide relationEnum, DeletionFlag deletionFlag) throws OseeCoreException {
return RelationManager.getRelatedArtifacts(this, relationEnum, deletionFlag);
}
- public final String getRelationRationale(Artifact artifact, IRelationEnumeration relationTypeSide) throws OseeCoreException {
+ public final String getRelationRationale(Artifact artifact, IRelationTypeSide relationTypeSide) throws OseeCoreException {
Pair<Artifact, Artifact> sides = determineArtifactSides(artifact, relationTypeSide);
RelationLink link = RelationManager.getRelationLink(sides.getFirst(), sides.getSecond(), relationTypeSide);
return link.getRationale();
}
- public final void setRelationRationale(Artifact artifact, IRelationEnumeration relationTypeSide, String rationale) throws OseeCoreException {
+ public final void setRelationRationale(Artifact artifact, IRelationTypeSide relationTypeSide, String rationale) throws OseeCoreException {
Pair<Artifact, Artifact> sides = determineArtifactSides(artifact, relationTypeSide);
RelationLink link = RelationManager.getRelationLink(sides.getFirst(), sides.getSecond(), relationTypeSide);
link.setRationale(rationale);
}
- private Pair<Artifact, Artifact> determineArtifactSides(Artifact artifact, IRelationEnumeration relationSide) {
+ private Pair<Artifact, Artifact> determineArtifactSides(Artifact artifact, IRelationTypeSide relationSide) {
boolean sideA = relationSide.getSide().isSideA();
Artifact artifactA = sideA ? artifact : this;
Artifact artifactB = sideA ? this : artifact;
@@ -213,7 +213,7 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
/**
* Check if artifacts are related to each other by relation type
*/
- public final boolean isRelated(IRelationEnumeration relationEnum, Artifact other) throws OseeCoreException {
+ public final boolean isRelated(IRelationTypeSide relationEnum, Artifact other) throws OseeCoreException {
List<Artifact> relatedArtifacts = getRelatedArtifacts(relationEnum);
return relatedArtifacts.contains(other);
}
@@ -221,24 +221,24 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
/**
* Get the exactly one artifact related to this artifact by a relation of type relationType
*/
- public final Artifact getRelatedArtifact(IRelationEnumeration relationEnum) throws OseeCoreException {
+ public final Artifact getRelatedArtifact(IRelationTypeSide relationEnum) throws OseeCoreException {
return RelationManager.getRelatedArtifact(this, relationEnum);
}
- public final int getRelatedArtifactsCount(IRelationEnumeration relationEnum) {
+ public final int getRelatedArtifactsCount(IRelationTypeSide relationEnum) {
return RelationManager.getRelatedArtifactsCount(this, relationEnum, relationEnum.getSide());
}
- public final <A extends Artifact> List<A> getRelatedArtifactsUnSorted(IRelationEnumeration side, Class<A> clazz) throws OseeCoreException {
+ public final <A extends Artifact> List<A> getRelatedArtifactsUnSorted(IRelationTypeSide side, Class<A> clazz) throws OseeCoreException {
return Collections.castAll(getRelatedArtifactsUnSorted(side));
}
- public final <A extends Artifact> List<A> getRelatedArtifacts(IRelationEnumeration side, Class<A> clazz) throws OseeCoreException {
+ public final <A extends Artifact> List<A> getRelatedArtifacts(IRelationTypeSide side, Class<A> clazz) throws OseeCoreException {
return Collections.castAll(getRelatedArtifacts(side));
}
@SuppressWarnings("unchecked")
- public final <A extends Artifact> List<A> getRelatedArtifactsOfType(IRelationEnumeration side, Class<A> clazz) throws OseeCoreException {
+ public final <A extends Artifact> List<A> getRelatedArtifactsOfType(IRelationTypeSide side, Class<A> clazz) throws OseeCoreException {
List<A> objs = new ArrayList<A>();
for (Artifact art : getRelatedArtifacts(side)) {
if (clazz.isInstance(art)) {
@@ -1140,20 +1140,20 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
linksLoaded = loaded;
}
- public final void addRelation(IRelationSorterId sorterId, IRelationEnumeration relationTypeSide, Artifact artifact, String rationale) throws OseeCoreException {
+ public final void addRelation(IRelationSorterId sorterId, IRelationTypeSide relationTypeSide, Artifact artifact, String rationale) throws OseeCoreException {
Pair<Artifact, Artifact> sides = determineArtifactSides(artifact, relationTypeSide);
RelationManager.addRelation(sorterId, relationTypeSide, sides.getFirst(), sides.getSecond(), rationale);
}
- public final void addRelation(IRelationEnumeration relationSide, Artifact artifact) throws OseeCoreException {
+ public final void addRelation(IRelationTypeSide relationSide, Artifact artifact) throws OseeCoreException {
addRelation(null, relationSide, artifact, null);
}
- public final void addRelation(IRelationSorterId sorterId, IRelationEnumeration relationSide, Artifact artifact) throws OseeCoreException {
+ public final void addRelation(IRelationSorterId sorterId, IRelationTypeSide relationSide, Artifact artifact) throws OseeCoreException {
addRelation(sorterId, relationSide, artifact, null);
}
- public final void addRelation(IRelationSorterId sorterId, IRelationEnumeration relationEnumeration, Artifact targetArtifact, boolean insertAfterTarget, Artifact itemToAdd, String rationale) throws OseeCoreException {
+ public final void addRelation(IRelationSorterId sorterId, IRelationTypeSide relationEnumeration, Artifact targetArtifact, boolean insertAfterTarget, Artifact itemToAdd, String rationale) throws OseeCoreException {
boolean sideA = relationEnumeration.getSide().isSideA();
Artifact artifactA = sideA ? itemToAdd : this;
Artifact artifactB = sideA ? this : itemToAdd;
@@ -1162,12 +1162,12 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
setRelationOrder(relationEnumeration, targetArtifact, insertAfterTarget, itemToAdd);
}
- public final void setRelationOrder(IRelationEnumeration relationSide, List<Artifact> artifactsInNewOrder) throws OseeCoreException {
+ public final void setRelationOrder(IRelationTypeSide relationSide, List<Artifact> artifactsInNewOrder) throws OseeCoreException {
RelationManager.setRelationOrder(this, relationSide, relationSide.getSide(), RelationOrderBaseTypes.USER_DEFINED,
artifactsInNewOrder);
}
- public final void setRelationOrder(IRelationEnumeration relationEnumeration, IRelationSorterId orderId) throws OseeCoreException {
+ public final void setRelationOrder(IRelationTypeSide relationEnumeration, IRelationSorterId orderId) throws OseeCoreException {
if (RelationOrderBaseTypes.USER_DEFINED == orderId) {
setRelationOrder(relationEnumeration, getRelatedArtifacts(relationEnumeration));
} else {
@@ -1176,7 +1176,7 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
}
}
- public final void setRelationOrder(IRelationEnumeration relationEnumeration, Artifact targetArtifact, boolean insertAfterTarget, Artifact itemToAdd) throws OseeCoreException {
+ public final void setRelationOrder(IRelationTypeSide relationEnumeration, Artifact targetArtifact, boolean insertAfterTarget, Artifact itemToAdd) throws OseeCoreException {
List<Artifact> currentOrder = getRelatedArtifacts(relationEnumeration, Artifact.class);
// target artifact doesn't exist
if (!currentOrder.contains(targetArtifact)) {
@@ -1194,12 +1194,12 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
RelationOrderBaseTypes.USER_DEFINED, currentOrder);
}
- public final void deleteRelation(IRelationEnumeration relationTypeSide, Artifact artifact) throws OseeCoreException {
+ public final void deleteRelation(IRelationTypeSide relationTypeSide, Artifact artifact) throws OseeCoreException {
Pair<Artifact, Artifact> sides = determineArtifactSides(artifact, relationTypeSide);
RelationManager.deleteRelation(relationTypeSide, sides.getFirst(), sides.getSecond());
}
- public final void deleteRelations(IRelationEnumeration relationSide) throws OseeCoreException {
+ public final void deleteRelations(IRelationTypeSide relationSide) throws OseeCoreException {
for (Artifact art : getRelatedArtifacts(relationSide)) {
deleteRelation(relationSide, art);
}
@@ -1208,7 +1208,7 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
/**
* Creates new relations that don't already exist and removes relations to artifacts that are not in collection
*/
- public final void setRelations(IRelationSorterId sorterId, IRelationEnumeration relationSide, Collection<? extends Artifact> artifacts) throws OseeCoreException {
+ public final void setRelations(IRelationSorterId sorterId, IRelationTypeSide relationSide, Collection<? extends Artifact> artifacts) throws OseeCoreException {
Collection<Artifact> currentlyRelated = getRelatedArtifacts(relationSide, Artifact.class);
// Remove relations that have been removed
for (Artifact artifact : currentlyRelated) {
@@ -1227,14 +1227,14 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
/**
* Creates new relations that don't already exist and removes relations to artifacts that are not in collection
*/
- public final void setRelations(IRelationEnumeration relationSide, Collection<? extends Artifact> artifacts) throws OseeCoreException {
+ public final void setRelations(IRelationTypeSide relationSide, Collection<? extends Artifact> artifacts) throws OseeCoreException {
setRelations(null, relationSide, artifacts);
}
/**
* Creates new relations that don't already exist and removes relations to artifacts that are not in collection
*/
- public final void setRelationsOfTypeUseCurrentOrder(IRelationEnumeration relationSide, Collection<? extends Artifact> artifacts, Class<?> clazz) throws OseeCoreException {
+ public final void setRelationsOfTypeUseCurrentOrder(IRelationTypeSide relationSide, Collection<? extends Artifact> artifacts, Class<?> clazz) throws OseeCoreException {
RelationTypeSideSorter sorter = RelationManager.createTypeSideSorter(this, relationSide, relationSide.getSide());
Collection<Artifact> currentlyRelated = getRelatedArtifacts(relationSide, Artifact.class);
// Add new relations if don't exist
@@ -1285,7 +1285,7 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
* Return true if this artifact any of it's links specified or any of the artifacts on the other side of the links
* are dirty
*/
- public final String isRelationsAndArtifactsDirty(Set<IRelationEnumeration> links) {
+ public final String isRelationsAndArtifactsDirty(Set<IRelationTypeSide> links) {
try {
if (hasDirtyAttributes()) {
@@ -1297,7 +1297,7 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
return "Artifact isDirty == true??";
}
// Loop through all relations
- for (IRelationEnumeration side : links) {
+ for (IRelationTypeSide side : links) {
for (Artifact art : getRelatedArtifacts(side)) {
// Check artifact dirty
if (art.hasDirtyAttributes()) {
@@ -1640,7 +1640,7 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
return relations;
}
- public final List<RelationLink> getRelations(IRelationEnumeration relationEnum) throws OseeCoreException {
+ public final List<RelationLink> getRelations(IRelationTypeSide relationEnum) throws OseeCoreException {
return RelationManager.getRelations(this, relationEnum, relationEnum.getSide());
}
@@ -1648,7 +1648,7 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, IB
* Return relations that exist between artifacts of type side
*/
@Deprecated
- public final ArrayList<RelationLink> getRelations(IRelationEnumeration side, Artifact artifact) throws OseeCoreException {
+ public final ArrayList<RelationLink> getRelations(IRelationTypeSide side, Artifact artifact) throws OseeCoreException {
ArrayList<RelationLink> relations = new ArrayList<RelationLink>();
for (RelationLink relation : getRelations(side)) {
try {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
index d366a84f868..2ee8be947b6 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
@@ -175,9 +175,9 @@ public class ArtifactTypeManager {
return makeNewArtifact(artifactType, branch, guid, humandReadableId);
}
- public static Artifact addArtifact(IArtifactToken artifactToken) throws OseeCoreException {
- return getFactory(artifactToken.getArtifactType()).makeNewArtifact(artifactToken.getBranch(),
- artifactToken.getArtifactType(), artifactToken.getName(), artifactToken.getGuid(), null);
+ public static Artifact addArtifact(IArtifactToken artifactToken, IOseeBranch branch) throws OseeCoreException {
+ return getFactory(artifactToken.getArtifactType()).makeNewArtifact(branch, artifactToken.getArtifactType(),
+ artifactToken.getName(), artifactToken.getGuid(), null);
}
private static final String DELETE_VALID_ATTRIBUTE =
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
index 87f28ced35b..5c4b7582f91 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
@@ -24,6 +24,7 @@ import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.SystemUser;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
@@ -428,7 +429,8 @@ public class BranchManager {
}
public static Branch createTopLevelBranch(final String branchName) throws OseeCoreException {
- return createTopLevelBranch(new CoreBranches(GUID.create(), branchName));
+ IOseeBranch branchToken = TokenFactory.createBranch(GUID.create(), branchName);
+ return createTopLevelBranch(branchToken);
}
public static List<Branch> getBaselineBranches() throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java
index 889b083daa1..0dfaa13d5c9 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQuery.java
@@ -52,8 +52,8 @@ import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifact
*/
public class ArtifactQuery {
- public static Artifact getArtifactFromToken(IArtifactToken artifactToken) throws OseeCoreException {
- return getArtifactFromId(artifactToken.getGuid(), BranchManager.getBranch(artifactToken.getBranch()));
+ public static Artifact getArtifactFromToken(IArtifactToken artifactToken, IOseeBranch branch) throws OseeCoreException {
+ return getArtifactFromId(artifactToken.getGuid(), BranchManager.getBranch(branch));
}
public static Artifact getArtifactFromToken(EventBasicGuidArtifact guidArt) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java
index dda15bcf384..2fef8450652 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.framework.skynet.core.artifact.search;
import java.util.List;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;
@@ -42,7 +42,7 @@ public class InRelationSearch implements ISearchPrimitive {
*
* @throws IllegalArgumentException if the sides are a mixture of sideA and sideB relation sides.
*/
- public InRelationSearch(IRelationEnumeration firstSide, IRelationEnumeration... sides) {
+ public InRelationSearch(IRelationTypeSide firstSide, IRelationTypeSide... sides) {
this(null, firstSide, sides);
}
@@ -53,14 +53,14 @@ public class InRelationSearch implements ISearchPrimitive {
*
* @throws IllegalArgumentException if the sides are a mixture of sideA and sideB relation sides.
*/
- public InRelationSearch(FromArtifactsSearch otherArtifacts, IRelationEnumeration firstSide, IRelationEnumeration... sides) {
+ public InRelationSearch(FromArtifactsSearch otherArtifacts, IRelationTypeSide firstSide, IRelationTypeSide... sides) {
this.typeNames = new String[sides.length + 1];
this.sideA = firstSide.getSide().isSideA();
this.otherArtifactsCriteria = otherArtifacts;
int count = 0;
typeNames[count++] = firstSide.getName();
- for (IRelationEnumeration side : sides) {
+ for (IRelationTypeSide side : sides) {
if (side != firstSide) {
throw new IllegalArgumentException("All links must be for the same side.");
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteria.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteria.java
index 5e96f6d6393..2444ca7359d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteria.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteria.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.framework.skynet.core.artifact.search;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
@@ -31,7 +31,7 @@ public class RelationCriteria extends AbstractArtifactSearchCriteria {
*
* @param relationEnum the side to start following the link from
*/
- public RelationCriteria(IRelationEnumeration relationEnum) {
+ public RelationCriteria(IRelationTypeSide relationEnum) {
this(relationEnum, relationEnum.getSide());
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java
index 148f4fa383b..0ba50a98915 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java
@@ -12,6 +12,7 @@
package org.eclipse.osee.framework.skynet.core.change;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.osee.framework.core.data.HasBranch;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -22,7 +23,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
/**
* @author Jeff C. Phillips
*/
-public abstract class Change implements IAdaptable, Comparable<Change> {
+public abstract class Change implements IAdaptable, Comparable<Change>, HasBranch {
private final long sourceGamma;
private final int artId;
private final TransactionDelta txDelta;
@@ -117,6 +118,7 @@ public abstract class Change implements IAdaptable, Comparable<Change> {
return getChangeArtifact().getArtifactType();
}
+ @Override
public IOseeBranch getBranch() {
return branch;
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
index a9c19e5cf29..995fd2d1266 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
@@ -16,7 +16,8 @@ import java.util.Collection;
import java.util.List;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.core.data.OseeBranch;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -246,7 +247,8 @@ public class OseeEventManager {
public static List<IEventFilter> getEventFiltersForBranch(final String branchName, final String branchGuid) {
try {
List<IEventFilter> eventFilters = new ArrayList<IEventFilter>(2);
- eventFilters.add(new BranchGuidEventFilter(new OseeBranch(branchName, branchGuid)));
+ IOseeBranch branchToken = TokenFactory.createBranch(branchGuid, branchName);
+ eventFilters.add(new BranchGuidEventFilter(branchToken));
return eventFilters;
} catch (Exception ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java
index 4249f7fa016..cb686b8b409 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java
@@ -24,8 +24,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.data.IRelationSorterId;
import org.eclipse.osee.framework.core.data.IRelationType;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
@@ -161,11 +161,11 @@ public class RelationManager {
return ret;
}
- public static Set<Artifact> getRelatedArtifacts(Collection<? extends Artifact> artifacts, int depth, IRelationEnumeration... relationEnums) throws OseeCoreException {
+ public static Set<Artifact> getRelatedArtifacts(Collection<? extends Artifact> artifacts, int depth, IRelationTypeSide... relationEnums) throws OseeCoreException {
return getRelatedArtifacts(artifacts, depth, EXCLUDE_DELETED, relationEnums);
}
- public static Set<Artifact> getRelatedArtifacts(Collection<? extends Artifact> artifacts, int depth, DeletionFlag allowDeleted, IRelationEnumeration... relationEnums) throws OseeCoreException {
+ public static Set<Artifact> getRelatedArtifacts(Collection<? extends Artifact> artifacts, int depth, DeletionFlag allowDeleted, IRelationTypeSide... relationEnums) throws OseeCoreException {
Set<Artifact> relatedArtifacts = new HashSet<Artifact>(artifacts.size() * 8);
Collection<Artifact> newArtifactsToSearch = new ArrayList<Artifact>(artifacts);
Collection<Artifact> newArtifacts = new ArrayList<Artifact>();
@@ -192,7 +192,7 @@ public class RelationManager {
}
relatedArtIds.addAll(getRelatedArtifactIds(selectedRelations, RelationSide.SIDE_B, allowDeleted));
} else {
- for (IRelationEnumeration relationEnum : relationEnums) {
+ for (IRelationTypeSide relationEnum : relationEnums) {
Collection<RelationLink> links = relationCache.getAllByType(artifact, relationEnum);
if (links != null) {
for (RelationLink rel : links) {
@@ -221,7 +221,7 @@ public class RelationManager {
return relatedArtifacts;
}
- public static List<Artifact> getRelatedArtifacts(Artifact artifact, IRelationEnumeration relationEnum, DeletionFlag deletionFlag) throws OseeCoreException {
+ public static List<Artifact> getRelatedArtifacts(Artifact artifact, IRelationTypeSide relationEnum, DeletionFlag deletionFlag) throws OseeCoreException {
List<Artifact> artifacts = getRelatedArtifacts(artifact, relationEnum, relationEnum.getSide());
Collection<Integer> artIds = new ArrayList<Integer>();
@@ -253,11 +253,11 @@ public class RelationManager {
return artifacts;
}
- public static List<Artifact> getRelatedArtifactsUnSorted(Artifact artifact, IRelationEnumeration relationEnum) throws OseeCoreException {
+ public static List<Artifact> getRelatedArtifactsUnSorted(Artifact artifact, IRelationTypeSide relationEnum) throws OseeCoreException {
return getRelatedArtifactsUnSorted(artifact, relationEnum, relationEnum.getSide());
}
- public static List<Artifact> getRelatedArtifacts(Artifact artifact, IRelationEnumeration relationEnum) throws OseeCoreException {
+ public static List<Artifact> getRelatedArtifacts(Artifact artifact, IRelationTypeSide relationEnum) throws OseeCoreException {
return getRelatedArtifacts(artifact, relationEnum, relationEnum.getSide());
}
@@ -277,11 +277,11 @@ public class RelationManager {
return artifacts.get(0);
}
- public static Artifact getRelatedArtifact(Artifact artifact, IRelationEnumeration relationEnum) throws OseeCoreException {
+ public static Artifact getRelatedArtifact(Artifact artifact, IRelationTypeSide relationEnum) throws OseeCoreException {
return getRelatedArtifact(artifact, relationEnum, relationEnum.getSide());
}
- public static int getRelatedArtifactsCount(Artifact artifact, IRelationEnumeration relationTypeEnum) {
+ public static int getRelatedArtifactsCount(Artifact artifact, IRelationTypeSide relationTypeEnum) {
return getRelatedArtifactsCount(artifact, relationTypeEnum, relationTypeEnum.getSide());
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLink.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLink.java
index d9d2df4fada..90e8f2f2b02 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLink.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLink.java
@@ -11,8 +11,10 @@
package org.eclipse.osee.framework.skynet.core.relation.crossbranch;
import java.util.logging.Level;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
+import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact;
import org.eclipse.osee.framework.core.model.type.RelationType;
@@ -28,7 +30,7 @@ public class CrossBranchLink {
public Artifact artifact;
public DefaultBasicGuidArtifact guidArt;
- public IRelationEnumeration relationEnum;
+ public IRelationTypeSide relationEnum;
public boolean aSide;
public Attribute<?> matchingAttribute;
@@ -42,7 +44,7 @@ public class CrossBranchLink {
}
}
- public CrossBranchLink(IRelationEnumeration relationEnum, Artifact artifact) {
+ public CrossBranchLink(IRelationTypeSide relationEnum, Artifact artifact) {
this.relationEnum = relationEnum;
this.artifact = artifact;
this.guidArt = artifact.getBasicGuidArtifact();
@@ -78,7 +80,9 @@ public class CrossBranchLink {
String relTypeGuid = AXml.getTagData(xmlStr, "relTypeGuid");
aSide = AXml.getTagBooleanData(xmlStr, "aSide");
final RelationType relationType = RelationTypeManager.getTypeByGuid(relTypeGuid);
- relationEnum = new LoadedRelationTypes(relationType, aSide);
+
+ RelationSide side = aSide ? RelationSide.SIDE_A : RelationSide.SIDE_B;
+ relationEnum = TokenFactory.createRelationTypeSide(side, relationType.getGuid(), relationType.getName());
guidArt = new DefaultBasicGuidArtifact(branchGuid, artTypeGuid, artGuid);
}
@@ -106,7 +110,7 @@ public class CrossBranchLink {
this.artifact = artifact;
}
- public IRelationEnumeration getRelationEnum() throws OseeCoreException {
+ public IRelationTypeSide getRelationEnum() throws OseeCoreException {
if (relationEnum == null) {
unPack();
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLinkManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLinkManager.java
index e843ea02b28..ecd1b87a739 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLinkManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/CrossBranchLinkManager.java
@@ -13,8 +13,8 @@ package org.eclipse.osee.framework.skynet.core.relation.crossbranch;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
@@ -33,14 +33,14 @@ import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
*/
public class CrossBranchLinkManager {
- public static void addRelation(Artifact artifact, IRelationEnumeration relationSide, Artifact otherArt) throws OseeCoreException {
+ public static void addRelation(Artifact artifact, IRelationTypeSide relationSide, Artifact otherArt) throws OseeCoreException {
CrossBranchLink newLink = new CrossBranchLink(relationSide, otherArt);
if (!getLinks(artifact).contains(newLink)) {
newLink.store(artifact);
}
}
- public static List<Artifact> getRelatedArtifacts(Artifact artifact, IRelationEnumeration relationEnum) throws OseeCoreException {
+ public static List<Artifact> getRelatedArtifacts(Artifact artifact, IRelationTypeSide relationEnum) throws OseeCoreException {
List<Artifact> artifacts = new ArrayList<Artifact>();
for (CrossBranchLink link : getLinks(artifact)) {
if (link.getRelationType().equals(relationEnum) && link.aSide == relationEnum.getSide().isSideA()) {
@@ -50,11 +50,11 @@ public class CrossBranchLinkManager {
return artifacts;
}
- public static int getRelatedArtifactCount(Artifact artifact, IRelationEnumeration relationEnum) throws OseeCoreException {
+ public static int getRelatedArtifactCount(Artifact artifact, IRelationTypeSide relationEnum) throws OseeCoreException {
return getRelatedArtifacts(artifact, relationEnum).size();
}
- public static void deleteRelation(Artifact artifact, IRelationEnumeration relationSide, Artifact otherArt) throws OseeCoreException {
+ public static void deleteRelation(Artifact artifact, IRelationTypeSide relationSide, Artifact otherArt) throws OseeCoreException {
CrossBranchLink newLink = new CrossBranchLink(relationSide, otherArt);
for (CrossBranchLink link : getLinks(artifact)) {
if (link.equals(newLink)) {
@@ -63,7 +63,7 @@ public class CrossBranchLinkManager {
}
}
- public static void deleteRelations(Artifact artifact, IRelationEnumeration relationSide) throws OseeCoreException {
+ public static void deleteRelations(Artifact artifact, IRelationTypeSide relationSide) throws OseeCoreException {
for (CrossBranchLink link : getLinks(artifact)) {
if (link.getRelationEnum().equals(relationSide)) {
link.getMatchingAttribute().delete();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/LoadedRelationTypes.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/LoadedRelationTypes.java
deleted file mode 100644
index 6bfeffb3f66..00000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/crossbranch/LoadedRelationTypes.java
+++ /dev/null
@@ -1,35 +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.framework.skynet.core.relation.crossbranch;
-
-import org.eclipse.osee.framework.core.data.NamedIdentity;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
-import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.core.model.type.RelationType;
-
-public class LoadedRelationTypes extends NamedIdentity implements IRelationEnumeration {
-
- private final RelationSide relationSide;
-
- public LoadedRelationTypes(RelationType relationType, boolean aSide) {
- this(aSide ? RelationSide.SIDE_A : RelationSide.SIDE_B, relationType.getGuid(), relationType.getName());
- }
-
- public LoadedRelationTypes(RelationSide side, String guid, String name) {
- super(guid, name);
- this.relationSide = side;
- }
-
- @Override
- public RelationSide getSide() {
- return relationSide;
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java
index d3004cb9c78..a4800b11232 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java
@@ -16,8 +16,8 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -65,7 +65,7 @@ public class RelationOrderMergeUtility {
return rts;
}
- private static List<String> mergeTypeSideOrder(Artifact left, Artifact right, IRelationEnumeration rts) throws OseeCoreException {
+ private static List<String> mergeTypeSideOrder(Artifact left, Artifact right, IRelationTypeSide rts) throws OseeCoreException {
RelationOrderMerger<String> merger = new RelationOrderMerger<String>();
List<String> leftRelatives = getGuidList(left.getRelatedArtifacts(rts, DeletionFlag.EXCLUDE_DELETED));
List<String> rightRelatives = getGuidList(right.getRelatedArtifacts(rts, DeletionFlag.EXCLUDE_DELETED));
@@ -74,7 +74,7 @@ public class RelationOrderMergeUtility {
return merger.computeMergedOrder(leftRelatives, rightRelatives, mergedSet);
}
- private static Collection<String> getMergedSet(Artifact left, Artifact right, IRelationEnumeration relationTypeSide) throws OseeCoreException {
+ private static Collection<String> getMergedSet(Artifact left, Artifact right, IRelationTypeSide relationTypeSide) throws OseeCoreException {
Collection<String> mergedSet = new HashSet<String>();
Collection<String> deleted = new HashSet<String>();
List<String> leftRelatives =
@@ -99,7 +99,7 @@ public class RelationOrderMergeUtility {
return toReturn;
}
- private static Collection<String> getDeleted(Artifact art, IRelationEnumeration relationType) throws OseeCoreException {
+ private static Collection<String> getDeleted(Artifact art, IRelationTypeSide relationType) throws OseeCoreException {
Collection<String> toReturn = new HashSet<String>();
for (RelationLink link : art.getRelationsAll(DeletionFlag.INCLUDE_DELETED)) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
index df80a1c3c32..e76647068ed 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
@@ -29,7 +29,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.osee.framework.core.data.IRelationSorterId;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.RelationType;
@@ -731,7 +731,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact {
WrapperForRelationLink targetLink = (WrapperForRelationLink) object;
Artifact[] artifactsToMove = ((ArtifactData) event.data).getArtifacts();
for (Artifact artifactToMove : artifactsToMove) {
- IRelationEnumeration typeSide =
+ IRelationTypeSide typeSide =
new RelationTypeSide(targetLink.getRelationType(), targetLink.getRelationSide());
artifact.setRelationOrder(typeSide, targetLink.getOther(), isFeedbackAfter, artifactToMove);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java
index 2607630d23d..30430a7ccdf 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java
@@ -15,8 +15,8 @@ import java.util.Collection;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -87,7 +87,7 @@ public class ArtifactPasteOperation extends AbstractOperation {
private void pasteRelationOrder(ArtifactPasteConfiguration config, Artifact source, Artifact newArtifact, List<Artifact> copiedChildren) throws OseeCoreException {
if (config.isKeepRelationOrderSettings()) {
- IRelationEnumeration relationTypeSide = CoreRelationTypes.Default_Hierarchical__Child;
+ IRelationTypeSide relationTypeSide = CoreRelationTypes.Default_Hierarchical__Child;
RelationOrderData data = RelationManager.createRelationOrderData(source);
String order =
data.getCurrentSorterGuid(RelationTypeManager.getType(relationTypeSide), relationTypeSide.getSide());
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/ArtifactProcessing.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/ArtifactProcessing.java
index c0ee5aa6a9c..55f12a56a2e 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/ArtifactProcessing.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/ArtifactProcessing.java
@@ -14,6 +14,7 @@ package org.eclipse.osee.framework.ui.skynet.render.word.template;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.word.WordUtil;
@@ -27,7 +28,7 @@ public class ArtifactProcessing implements ITemplateTask {
private final List<ITemplateTask> innerTasks;
private boolean outlining;
private boolean recurseChildren;
- private CoreRelationTypes outlineRelation;
+ private IRelationTypeSide outlineRelation;
private String headingAttributeName;
private String outlineNumber;
private String cleanedText;
@@ -108,7 +109,7 @@ public class ArtifactProcessing implements ITemplateTask {
return recurseChildren;
}
- public CoreRelationTypes getOutlineRelation() {
+ public IRelationTypeSide getOutlineRelation() {
return outlineRelation;
}
diff --git a/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java b/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java
index bf0054dccf4..5e5b8ac8787 100644
--- a/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java
+++ b/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java
@@ -11,42 +11,42 @@
package org.eclipse.osee.ote.define.AUTOGEN;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
-public class OteAttributeTypes extends NamedIdentity implements IAttributeType {
+public final class OteAttributeTypes {
// @formatter:off
- public static final IAttributeType BUILD_ID = new OteAttributeTypes("AAMFEXG6_W9diA9nUXAA", "Build Id");
- public static final IAttributeType CHECKSUM = new OteAttributeTypes("AAMFEXJbaHt5uKG9kogA", "Checksum");
- public static final IAttributeType ELAPSED_DATE = new OteAttributeTypes("AAMFEWuD6yH04y89M3wA", "Elapsed Date");
- public static final IAttributeType END_DATE = new OteAttributeTypes("AAMFEWryxym0P9FFckgA", "End Date");
- public static final IAttributeType EXTENSION = new OteAttributeTypes("AAMFEcUbJEERZTnwJzAA", "Extension");
- public static final IAttributeType FAILED = new OteAttributeTypes("AAMFEWynSU+XeRG7nRAA", "Failed");
- public static final IAttributeType IS_BATCH_MODE_ALLOWED = new OteAttributeTypes("AAMFEW+CcA6F5GEjsSgA", "Is Batch Mode Allowed");
- public static final IAttributeType LAST_AUTHOR = new OteAttributeTypes("AAMFEWE83iPq3+2DGrQA", "Last Author");
- public static final IAttributeType LAST_DATE_UPLOADED = new OteAttributeTypes("AAMFEXCm5ju5gvq142QA", "Last Date Uploaded");
- public static final IAttributeType LAST_MODIFIED_DATE = new OteAttributeTypes("AAMFEWHw7V1uWv4IKcQA", "Last Modified Date");
- public static final IAttributeType MODIFIED_FLAG = new OteAttributeTypes("AAMFEWCruiS26nCN68wA", "Modified Flag");
- public static final IAttributeType OSEE_SERVER_JAR_VERSION = new OteAttributeTypes("AAMFEWV1OQtXL67OfOQA", "OSEE Server Jar Version");
- public static final IAttributeType OSEE_SERVER_TITLE = new OteAttributeTypes("AAMFEWTnXGYRfdzY3gAA", "OSEE Server Title");
- public static final IAttributeType OSEE_VERSION = new OteAttributeTypes("AAMFEWQ_TTkstJvjnGQA", "OSEE Version");
- public static final IAttributeType OS_ARCHITECTURE = new OteAttributeTypes("AAMFEWKJtG+Jc8OkRYgA", "OS Architecture");
- public static final IAttributeType OS_NAME = new OteAttributeTypes("AAMFEWMdBmP9aCgsysgA", "OS Name");
- public static final IAttributeType OS_VERSION = new OteAttributeTypes("AAMFEWOvQWV6JJvh9NQA", "OS Version");
- public static final IAttributeType OUTFILE_URL = new OteAttributeTypes("AAMFEVlyBndUvySg+gwA", "Outfile URL");
- public static final IAttributeType PASSED = new OteAttributeTypes("AAMFEWwT92IzQp6Dh3gA", "Passed");
- public static final IAttributeType PROCESSOR_ID = new OteAttributeTypes("AAMFEWYOAGkplo4RjTQA", "Processor ID");
- public static final IAttributeType QUALIFICATION_LEVEL = new OteAttributeTypes("AAMFEXEvTztOWwoGyRAA", "Qualification Level");
- public static final IAttributeType RAN_IN_BATCH_MODE = new OteAttributeTypes("AAMFEW7uBlg0KLp8mhQA", "Ran In Batch Mode");
- public static final IAttributeType REVISION = new OteAttributeTypes("AAMFEWAal2I3j7EJligA", "Revision");
- public static final IAttributeType SCRIPT_ABORTED = new OteAttributeTypes("AAMFEW3M12AqHsCve4AA", "Script Aborted");
- public static final IAttributeType START_DATE = new OteAttributeTypes("AAMFEWpeXjfr2W5ZT5QA", "Start Date");
- public static final IAttributeType TEST_SCRIPT_URL = new OteAttributeTypes("AAMFEVn0+mhxtCuACgAA", "Test Script URL");
- public static final IAttributeType TOTAL_TEST_POINTS = new OteAttributeTypes("AAMFEW05hBfECFGfZkgA", "Total Test Points");
- public static final IAttributeType TestDisposition = new OteAttributeTypes("AAMFEXfoPWRZHNiOR3gA", "Disposition");
+ public static final IAttributeType BUILD_ID = TokenFactory.createAttributeType("AAMFEXG6_W9diA9nUXAA", "Build Id");
+ public static final IAttributeType CHECKSUM = TokenFactory.createAttributeType("AAMFEXJbaHt5uKG9kogA", "Checksum");
+ public static final IAttributeType ELAPSED_DATE = TokenFactory.createAttributeType("AAMFEWuD6yH04y89M3wA", "Elapsed Date");
+ public static final IAttributeType END_DATE = TokenFactory.createAttributeType("AAMFEWryxym0P9FFckgA", "End Date");
+ public static final IAttributeType EXTENSION = TokenFactory.createAttributeType("AAMFEcUbJEERZTnwJzAA", "Extension");
+ public static final IAttributeType FAILED = TokenFactory.createAttributeType("AAMFEWynSU+XeRG7nRAA", "Failed");
+ public static final IAttributeType IS_BATCH_MODE_ALLOWED = TokenFactory.createAttributeType("AAMFEW+CcA6F5GEjsSgA", "Is Batch Mode Allowed");
+ public static final IAttributeType LAST_AUTHOR = TokenFactory.createAttributeType("AAMFEWE83iPq3+2DGrQA", "Last Author");
+ public static final IAttributeType LAST_DATE_UPLOADED = TokenFactory.createAttributeType("AAMFEXCm5ju5gvq142QA", "Last Date Uploaded");
+ public static final IAttributeType LAST_MODIFIED_DATE = TokenFactory.createAttributeType("AAMFEWHw7V1uWv4IKcQA", "Last Modified Date");
+ public static final IAttributeType MODIFIED_FLAG = TokenFactory.createAttributeType("AAMFEWCruiS26nCN68wA", "Modified Flag");
+ public static final IAttributeType OSEE_SERVER_JAR_VERSION = TokenFactory.createAttributeType("AAMFEWV1OQtXL67OfOQA", "OSEE Server Jar Version");
+ public static final IAttributeType OSEE_SERVER_TITLE = TokenFactory.createAttributeType("AAMFEWTnXGYRfdzY3gAA", "OSEE Server Title");
+ public static final IAttributeType OSEE_VERSION = TokenFactory.createAttributeType("AAMFEWQ_TTkstJvjnGQA", "OSEE Version");
+ public static final IAttributeType OS_ARCHITECTURE = TokenFactory.createAttributeType("AAMFEWKJtG+Jc8OkRYgA", "OS Architecture");
+ public static final IAttributeType OS_NAME = TokenFactory.createAttributeType("AAMFEWMdBmP9aCgsysgA", "OS Name");
+ public static final IAttributeType OS_VERSION = TokenFactory.createAttributeType("AAMFEWOvQWV6JJvh9NQA", "OS Version");
+ public static final IAttributeType OUTFILE_URL = TokenFactory.createAttributeType("AAMFEVlyBndUvySg+gwA", "Outfile URL");
+ public static final IAttributeType PASSED = TokenFactory.createAttributeType("AAMFEWwT92IzQp6Dh3gA", "Passed");
+ public static final IAttributeType PROCESSOR_ID = TokenFactory.createAttributeType("AAMFEWYOAGkplo4RjTQA", "Processor ID");
+ public static final IAttributeType QUALIFICATION_LEVEL = TokenFactory.createAttributeType("AAMFEXEvTztOWwoGyRAA", "Qualification Level");
+ public static final IAttributeType RAN_IN_BATCH_MODE = TokenFactory.createAttributeType("AAMFEW7uBlg0KLp8mhQA", "Ran In Batch Mode");
+ public static final IAttributeType REVISION = TokenFactory.createAttributeType("AAMFEWAal2I3j7EJligA", "Revision");
+ public static final IAttributeType SCRIPT_ABORTED = TokenFactory.createAttributeType("AAMFEW3M12AqHsCve4AA", "Script Aborted");
+ public static final IAttributeType START_DATE = TokenFactory.createAttributeType("AAMFEWpeXjfr2W5ZT5QA", "Start Date");
+ public static final IAttributeType TEST_SCRIPT_URL = TokenFactory.createAttributeType("AAMFEVn0+mhxtCuACgAA", "Test Script URL");
+ public static final IAttributeType TOTAL_TEST_POINTS = TokenFactory.createAttributeType("AAMFEW05hBfECFGfZkgA", "Total Test Points");
+ public static final IAttributeType TestDisposition = TokenFactory.createAttributeType("AAMFEXfoPWRZHNiOR3gA", "Disposition");
// @formatter:on
- private OteAttributeTypes(String guid, String name) {
- super(guid, name);
+ private OteAttributeTypes() {
+ // Constants
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteRelationTypes.java b/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteRelationTypes.java
index a0e5dbd9f54..37b678ee0d5 100644
--- a/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteRelationTypes.java
+++ b/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteRelationTypes.java
@@ -10,24 +10,19 @@
*******************************************************************************/
package org.eclipse.osee.ote.define.AUTOGEN;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
-import org.eclipse.osee.framework.core.enums.IRelationEnumeration;
+import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
-public class OteRelationTypes extends NamedIdentity implements IRelationEnumeration {
- public static final OteRelationTypes TEST_SCRIPT_TO_RUN_RELATION__TEST_SCRIPT = new OteRelationTypes(
- RelationSide.SIDE_A, "AAMFE+jMyBDK7CV479wA", "Test Case to Run Relation");
- public static final OteRelationTypes TEST_SCRIPT_TO_RUN_RELATION__TEST_RUN = new OteRelationTypes(
+public final class OteRelationTypes {
+
+ public static final IRelationTypeSide TEST_SCRIPT_TO_RUN_RELATION__TEST_SCRIPT =
+ TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, "AAMFE+jMyBDK7CV479wA", "Test Case to Run Relation");
+ public static final IRelationTypeSide TEST_SCRIPT_TO_RUN_RELATION__TEST_RUN = TokenFactory.createRelationTypeSide(
RelationSide.SIDE_B, "AAMFE+jMyBDK7CV479wA", "Test Case to Run Relation");
- private final RelationSide relationSide;
- private OteRelationTypes(RelationSide relationSide, String guid, String name) {
- super(guid, name);
- this.relationSide = relationSide;
+ private OteRelationTypes() {
+ // Constants
}
- @Override
- public RelationSide getSide() {
- return relationSide;
- }
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoArtifactTypes.java b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoArtifactTypes.java
index 159c0468dce..422c86a55cc 100644
--- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoArtifactTypes.java
+++ b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoArtifactTypes.java
@@ -11,20 +11,20 @@
package org.eclipse.osee.support.test.util;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
/**
* @author Ryan D. Brooks
*/
-public class DemoArtifactTypes extends NamedIdentity implements IArtifactType {
+public final class DemoArtifactTypes {
// @formatter:off
- public static final IArtifactType DemoCodeTeamWorkflow = new DemoArtifactTypes("ABRNqDKnpGEKAyUm49gA", "Demo Code Team Workflow");
- public static final IArtifactType DemoReqTeamWorkflow = new DemoArtifactTypes("ABRO5pC6kCmP35t06RwA", "Demo Req Team Workflow");
- public static final IArtifactType DemoTestTeamWorkflow = new DemoArtifactTypes("ABRPeQO1qlCd4J7Bv5AA", "Demo Test Team Workflow");
+ public static final IArtifactType DemoCodeTeamWorkflow = TokenFactory.createArtifactType("ABRNqDKnpGEKAyUm49gA", "Demo Code Team Workflow");
+ public static final IArtifactType DemoReqTeamWorkflow = TokenFactory.createArtifactType("ABRO5pC6kCmP35t06RwA", "Demo Req Team Workflow");
+ public static final IArtifactType DemoTestTeamWorkflow = TokenFactory.createArtifactType("ABRPeQO1qlCd4J7Bv5AA", "Demo Test Team Workflow");
// @formatter:on
- private DemoArtifactTypes(String guid, String name) {
- super(guid, name);
+ private DemoArtifactTypes() {
+ // Constants
}
}
diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoSawBuilds.java b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoSawBuilds.java
index 3e9673778ed..5ab7e7aeb70 100644
--- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoSawBuilds.java
+++ b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/DemoSawBuilds.java
@@ -11,17 +11,18 @@
package org.eclipse.osee.support.test.util;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.NamedIdentity;
+import org.eclipse.osee.framework.core.data.TokenFactory;
/**
* @author Donald G. Dunne
*/
-public class DemoSawBuilds extends NamedIdentity implements IOseeBranch {
- public static final DemoSawBuilds SAW_Bld_1 = new DemoSawBuilds("AyH_f2sSKy3l07fIvAAA", "SAW_Bld_1");
- public static final DemoSawBuilds SAW_Bld_2 = new DemoSawBuilds("AyH_f2sSKy3l07fIvBBB", "SAW_Bld_2");
- public static final DemoSawBuilds SAW_Bld_3 = new DemoSawBuilds("AyH_f2sSKy3l07fIvCCC", "SAW_Bld_3");
+public final class DemoSawBuilds {
- private DemoSawBuilds(String guid, String name) {
- super(guid, name);
+ public static final IOseeBranch SAW_Bld_1 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvAAA", "SAW_Bld_1");
+ public static final IOseeBranch SAW_Bld_2 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvBBB", "SAW_Bld_2");
+ public static final IOseeBranch SAW_Bld_3 = TokenFactory.createBranch("AyH_f2sSKy3l07fIvCCC", "SAW_Bld_3");
+
+ private DemoSawBuilds() {
+ // Constants
}
} \ No newline at end of file

Back to the top