Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2016-09-22 18:29:12 -0400
committerdonald.g.dunne2016-09-22 18:29:12 -0400
commit62746f32e3bf88a6ca55df839b64a9887763fe7f (patch)
treef7679ab1ff16ea9675fd7083e002ab1ab20bc3d1
parentd017cc5715cbf2944b65a5e11287117e772e7d45 (diff)
downloadorg.eclipse.osee-62746f32e3bf88a6ca55df839b64a9887763fe7f.tar.gz
org.eclipse.osee-62746f32e3bf88a6ca55df839b64a9887763fe7f.tar.xz
org.eclipse.osee-62746f32e3bf88a6ca55df839b64a9887763fe7f.zip
refactor: Consolidate IRelationTypeSide and RelationTypeSide
- Automated refactor to remove IRelationTypeSide and move - RelationTypeSide to a more appropriate package. Change-Id: Ib35e9d5306b78bc71fdcd40ea2bb482b0e88ef3c
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsRelationTypes.java122
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java4
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/task/JaxAtsTask.java4
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java18
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IRelationResolver.java28
-rw-r--r--plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java4
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/AtsRelationResolverServiceTest.java12
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java6
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/SprintArtifact.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/ArtifactCollectorsCache.java6
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/AtsConfigObject.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/query/AtsConfigQueryImpl.java6
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/query/AtsQueryImpl.java10
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workflow/AtsRelationResolverServiceImpl.java26
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java10
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsConfigQueryImpl.java6
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java16
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsChangeSet.java11
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractRelationResolverServiceImpl.java9
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsRelationChange.java8
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsConfigQueryImpl.java6
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryImpl.java10
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsChangeSet.java12
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsRelationResolverServiceImpl.java26
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/CreateTasksOperation.java6
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintManager.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalManager.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/MembersManager.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/IMemberProvider.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeRelationsHyperlinkComposite.java8
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeUtility.java4
-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.java6
-rw-r--r--plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/internal/AddRequirementData.java4
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderMergeUtilityTest.java4
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockIArtifact.java2
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java8
-rw-r--r--plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SafetyInformationAccumulator.java6
-rw-r--r--plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/TraceInformationAccumulator.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/TestPlanComplianceReport.java6
-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/operations/TraceResourceDropOperation.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.java10
-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.access.provider/src/org/eclipse/osee/framework/access/provider/internal/FrameworkAccessModel.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessDataQuery.java12
-rw-r--r--plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/data/RelationTypeSideTest.java19
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationTypeSide.java26
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationTypeSide.java (renamed from plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/RelationTypeSide.java)38
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java59
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreRelationTypes.java86
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteriaTest.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockIArtifact.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/AccessPolicy.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java63
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/InRelationSearch.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/NotInRelationSearch.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteria.java12
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/AccessPolicyImpl.java12
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java20
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/IArtifact.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChangeTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationCellModifier.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationSkynetDragAndDrop.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java2
-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/explorer/menu/ArtifactExplorerMenu.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/CreateRelatedMenuItem.java28
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/ArtifactProcessing.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImplTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java12
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManagerTest.java24
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java18
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelatedTo.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeFollow.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeSideExists.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeSideNotExists.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java16
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationUtil.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/HasOrderData.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderEntryComparator.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java36
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java9
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java16
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java14
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CriteriaFactory.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeFollowSqlHandler.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideExistsSqlHandler.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideNotExistsSqlHandler.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactory.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/ExistenceTypePredicateHandler.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/PredicateHandlerUtil.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/RelatedToPredicateHandler.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java11
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java4
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/ArtifactReadable.java14
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java14
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java4
-rw-r--r--plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteRelationTypes.java8
125 files changed, 622 insertions, 729 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsRelationTypes.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsRelationTypes.java
index 412677f985..74d91153f8 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsRelationTypes.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsRelationTypes.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.ats.api.data;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -21,95 +21,95 @@ public final class AtsRelationTypes {
//@formatter:off
- public static final IRelationTypeSide ProgramToInsertion_Program = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x7BD0963A0F884A2BL, "Program To Insertion");
- public static final IRelationTypeSide ProgramToInsertion_Insertion = ProgramToInsertion_Program.getOpposite();
+ public static final RelationTypeSide ProgramToInsertion_Program = RelationTypeSide.create(RelationSide.SIDE_A, 0x7BD0963A0F884A2BL, "Program To Insertion");
+ public static final RelationTypeSide ProgramToInsertion_Insertion = ProgramToInsertion_Program.getOpposite();
- public static final IRelationTypeSide InsertionToInsertionActivity_Insertion = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x128D9B3123EADEB1L, "Insertion To Insertion Activity");
- public static final IRelationTypeSide InsertionToInsertionActivity_InsertionActivity = InsertionToInsertionActivity_Insertion.getOpposite();
+ public static final RelationTypeSide InsertionToInsertionActivity_Insertion = RelationTypeSide.create(RelationSide.SIDE_A, 0x128D9B3123EADEB1L, "Insertion To Insertion Activity");
+ public static final RelationTypeSide InsertionToInsertionActivity_InsertionActivity = InsertionToInsertionActivity_Insertion.getOpposite();
- public static final IRelationTypeSide InsertionActivityToWorkPackage_InsertionActivity = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x7B681B61D762880FL, "Insertion Activity To Work Package");
- public static final IRelationTypeSide InsertionActivityToWorkPackage_WorkPackage = InsertionActivityToWorkPackage_InsertionActivity.getOpposite();
+ public static final RelationTypeSide InsertionActivityToWorkPackage_InsertionActivity = RelationTypeSide.create(RelationSide.SIDE_A, 0x7B681B61D762880FL, "Insertion Activity To Work Package");
+ public static final RelationTypeSide InsertionActivityToWorkPackage_WorkPackage = InsertionActivityToWorkPackage_InsertionActivity.getOpposite();
- public static final IRelationTypeSide ActionToWorkflow_Action = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x200000000000016DL, "ActionToWorkflow");
- public static final IRelationTypeSide ActionToWorkflow_WorkFlow = ActionToWorkflow_Action.getOpposite();
+ public static final RelationTypeSide ActionToWorkflow_Action = RelationTypeSide.create(RelationSide.SIDE_A, 0x200000000000016DL, "ActionToWorkflow");
+ public static final RelationTypeSide ActionToWorkflow_WorkFlow = ActionToWorkflow_Action.getOpposite();
- public static final IRelationTypeSide AgileTeamToFeatureGroup_AgileTeam = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x0ECF8D3CF97C9112L, "AgileTeamToFeatureGroup");
- public static final IRelationTypeSide AgileTeamToFeatureGroup_FeatureGroup = AgileTeamToFeatureGroup_AgileTeam.getOpposite();
+ public static final RelationTypeSide AgileTeamToFeatureGroup_AgileTeam = RelationTypeSide.create(RelationSide.SIDE_A, 0x0ECF8D3CF97C9112L, "AgileTeamToFeatureGroup");
+ public static final RelationTypeSide AgileTeamToFeatureGroup_FeatureGroup = AgileTeamToFeatureGroup_AgileTeam.getOpposite();
- public static final IRelationTypeSide AgileTeamToAtsTeam_AgileTeam = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x7CED0706F811126CL, "AgileTeamToAtsTeam");
- public static final IRelationTypeSide AgileTeamToAtsTeam_AtsTeam = AgileTeamToAtsTeam_AgileTeam.getOpposite();
+ public static final RelationTypeSide AgileTeamToAtsTeam_AgileTeam = RelationTypeSide.create(RelationSide.SIDE_A, 0x7CED0706F811126CL, "AgileTeamToAtsTeam");
+ public static final RelationTypeSide AgileTeamToAtsTeam_AtsTeam = AgileTeamToAtsTeam_AgileTeam.getOpposite();
- public static final IRelationTypeSide AgileTeamToBacklog_AgileTeam = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x7A5A06AAB20398F2L, "AgileTeamToBacklog");
- public static final IRelationTypeSide AgileTeamToBacklog_Backlog = AgileTeamToBacklog_AgileTeam.getOpposite();
+ public static final RelationTypeSide AgileTeamToBacklog_AgileTeam = RelationTypeSide.create(RelationSide.SIDE_A, 0x7A5A06AAB20398F2L, "AgileTeamToBacklog");
+ public static final RelationTypeSide AgileTeamToBacklog_Backlog = AgileTeamToBacklog_AgileTeam.getOpposite();
- public static final IRelationTypeSide AgileTeamToSprint_AgileTeam = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x61C047A5D52830F5L, "AgileTeamToSprint");
- public static final IRelationTypeSide AgileTeamToSprint_Sprint = AgileTeamToSprint_AgileTeam.getOpposite();
+ public static final RelationTypeSide AgileTeamToSprint_AgileTeam = RelationTypeSide.create(RelationSide.SIDE_A, 0x61C047A5D52830F5L, "AgileTeamToSprint");
+ public static final RelationTypeSide AgileTeamToSprint_Sprint = AgileTeamToSprint_AgileTeam.getOpposite();
- public static final IRelationTypeSide AgileSprintToItem_Sprint= TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x0DB6D78253FE8AB1L, "AgileSprintToItems");
- public static final IRelationTypeSide AgileSprintToItem_AtsItem = AgileSprintToItem_Sprint.getOpposite();
+ public static final RelationTypeSide AgileSprintToItem_Sprint= RelationTypeSide.create(RelationSide.SIDE_A, 0x0DB6D78253FE8AB1L, "AgileSprintToItems");
+ public static final RelationTypeSide AgileSprintToItem_AtsItem = AgileSprintToItem_Sprint.getOpposite();
- public static final IRelationTypeSide AgileFeatureToItem_FeatureGroup = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x5380F48A35225D71L, "AgileFeatureToItem");
- public static final IRelationTypeSide AgileFeatureToItem_AtsItem = AgileFeatureToItem_FeatureGroup.getOpposite();
+ public static final RelationTypeSide AgileFeatureToItem_FeatureGroup = RelationTypeSide.create(RelationSide.SIDE_A, 0x5380F48A35225D71L, "AgileFeatureToItem");
+ public static final RelationTypeSide AgileFeatureToItem_AtsItem = AgileFeatureToItem_FeatureGroup.getOpposite();
- public static final IRelationTypeSide Port_From = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x200000000000017AL, "Port");
- public static final IRelationTypeSide Port_To = Port_From.getOpposite();
+ public static final RelationTypeSide Port_From = RelationTypeSide.create(RelationSide.SIDE_A, 0x200000000000017AL, "Port");
+ public static final RelationTypeSide Port_To = Port_From.getOpposite();
- public static final IRelationTypeSide Derive_From = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x200000000000017BL, "Derive");
- public static final IRelationTypeSide Derive_To = Derive_From.getOpposite();
+ public static final RelationTypeSide Derive_From = RelationTypeSide.create(RelationSide.SIDE_A, 0x200000000000017BL, "Derive");
+ public static final RelationTypeSide Derive_To = Derive_From.getOpposite();
- public static final IRelationTypeSide FavoriteUser_Artifact = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000000000000173L, "FavoriteUser");
- public static final IRelationTypeSide FavoriteUser_User = FavoriteUser_Artifact.getOpposite();
+ public static final RelationTypeSide FavoriteUser_Artifact = RelationTypeSide.create(RelationSide.SIDE_A, 0x2000000000000173L, "FavoriteUser");
+ public static final RelationTypeSide FavoriteUser_User = FavoriteUser_Artifact.getOpposite();
- public static final IRelationTypeSide Goal_Goal = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000000000000175L, "Goal");
- public static final IRelationTypeSide Goal_Member = Goal_Goal.getOpposite();
+ public static final RelationTypeSide Goal_Goal = RelationTypeSide.create(RelationSide.SIDE_A, 0x2000000000000175L, "Goal");
+ public static final RelationTypeSide Goal_Member = Goal_Goal.getOpposite();
- public static final IRelationTypeSide ParallelVersion_Parent = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000000000000174L, "ParallelVersion");
- public static final IRelationTypeSide ParallelVersion_Child = ParallelVersion_Parent.getOpposite();
+ public static final RelationTypeSide ParallelVersion_Parent = RelationTypeSide.create(RelationSide.SIDE_A, 0x2000000000000174L, "ParallelVersion");
+ public static final RelationTypeSide ParallelVersion_Child = ParallelVersion_Parent.getOpposite();
- public static final IRelationTypeSide PrivilegedMember_Team = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x200000000000016BL, "PrivilegedMember");
- public static final IRelationTypeSide PrivilegedMember_Member = PrivilegedMember_Team.getOpposite();
+ public static final RelationTypeSide PrivilegedMember_Team = RelationTypeSide.create(RelationSide.SIDE_A, 0x200000000000016BL, "PrivilegedMember");
+ public static final RelationTypeSide PrivilegedMember_Member = PrivilegedMember_Team.getOpposite();
- public static final IRelationTypeSide TeamWfToTask_TeamWf = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x200000000000016EL, "TeamWfToTask");
- public static final IRelationTypeSide TeamWfToTask_Task = TeamWfToTask_TeamWf.getOpposite();
+ public static final RelationTypeSide TeamWfToTask_TeamWf = RelationTypeSide.create(RelationSide.SIDE_A, 0x200000000000016EL, "TeamWfToTask");
+ public static final RelationTypeSide TeamWfToTask_Task = TeamWfToTask_TeamWf.getOpposite();
- public static final IRelationTypeSide SubscribedUser_Artifact = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000000000000172L, "SubscribedUser");
- public static final IRelationTypeSide SubscribedUser_User = SubscribedUser_Artifact.getOpposite();
+ public static final RelationTypeSide SubscribedUser_Artifact = RelationTypeSide.create(RelationSide.SIDE_A, 0x2000000000000172L, "SubscribedUser");
+ public static final RelationTypeSide SubscribedUser_User = SubscribedUser_Artifact.getOpposite();
- public static final IRelationTypeSide TeamActionableItem_Team = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x200000000000016CL, "TeamActionableItem");
- public static final IRelationTypeSide TeamActionableItem_ActionableItem = TeamActionableItem_Team.getOpposite();
+ public static final RelationTypeSide TeamActionableItem_Team = RelationTypeSide.create(RelationSide.SIDE_A, 0x200000000000016CL, "TeamActionableItem");
+ public static final RelationTypeSide TeamActionableItem_ActionableItem = TeamActionableItem_Team.getOpposite();
- public static final IRelationTypeSide TeamDefinitionToVersion_TeamDefinition = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000000000000170L, "TeamDefinitionToVersion");
- public static final IRelationTypeSide TeamDefinitionToVersion_Version = TeamDefinitionToVersion_TeamDefinition.getOpposite();
+ public static final RelationTypeSide TeamDefinitionToVersion_TeamDefinition = RelationTypeSide.create(RelationSide.SIDE_A, 0x2000000000000170L, "TeamDefinitionToVersion");
+ public static final RelationTypeSide TeamDefinitionToVersion_Version = TeamDefinitionToVersion_TeamDefinition.getOpposite();
- public static final IRelationTypeSide TeamDefinitionToAtsConfigObject_TeamDefinition = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000000000000170L, "TeamDefinitionAtsConfigObject");
- public static final IRelationTypeSide TeamDefinitionToAtsConfigObject_AtsConfigObject = TeamDefinitionToVersion_TeamDefinition.getOpposite();
+ public static final RelationTypeSide TeamDefinitionToAtsConfigObject_TeamDefinition = RelationTypeSide.create(RelationSide.SIDE_A, 0x2000000000000170L, "TeamDefinitionAtsConfigObject");
+ public static final RelationTypeSide TeamDefinitionToAtsConfigObject_AtsConfigObject = TeamDefinitionToVersion_TeamDefinition.getOpposite();
- public static final IRelationTypeSide CountryToProgram_Country = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000033300000169L, "CountryToProgram");
- public static final IRelationTypeSide CountryToProgram_Program = CountryToProgram_Country.getOpposite();
+ public static final RelationTypeSide CountryToProgram_Country = RelationTypeSide.create(RelationSide.SIDE_A, 0x2000033300000169L, "CountryToProgram");
+ public static final RelationTypeSide CountryToProgram_Program = CountryToProgram_Country.getOpposite();
- public static final IRelationTypeSide TeamLead_Team = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000000000000169L, "TeamLead");
- public static final IRelationTypeSide TeamLead_Lead = TeamLead_Team.getOpposite();
+ public static final RelationTypeSide TeamLead_Team = RelationTypeSide.create(RelationSide.SIDE_A, 0x2000000000000169L, "TeamLead");
+ public static final RelationTypeSide TeamLead_Lead = TeamLead_Team.getOpposite();
- public static final IRelationTypeSide TeamMember_Team = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x200000000000016AL, "TeamMember");
- public static final IRelationTypeSide TeamMember_Member = TeamMember_Team.getOpposite();
+ public static final RelationTypeSide TeamMember_Team = RelationTypeSide.create(RelationSide.SIDE_A, 0x200000000000016AL, "TeamMember");
+ public static final RelationTypeSide TeamMember_Member = TeamMember_Team.getOpposite();
- public static final IRelationTypeSide TeamWorkflowTargetedForVersion_Workflow = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x200000000000016FL, "TeamWorkflowTargetedForVersion");
- public static final IRelationTypeSide TeamWorkflowTargetedForVersion_Version = TeamWorkflowTargetedForVersion_Workflow.getOpposite();
+ public static final RelationTypeSide TeamWorkflowTargetedForVersion_Workflow = RelationTypeSide.create(RelationSide.SIDE_A, 0x200000000000016FL, "TeamWorkflowTargetedForVersion");
+ public static final RelationTypeSide TeamWorkflowTargetedForVersion_Version = TeamWorkflowTargetedForVersion_Workflow.getOpposite();
- public static final IRelationTypeSide TeamWorkflowToReview_Team = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000000000000171L, "TeamWorkflowToReview");
- public static final IRelationTypeSide TeamWorkflowToReview_Review = TeamWorkflowToReview_Team.getOpposite();
+ public static final RelationTypeSide TeamWorkflowToReview_Team = RelationTypeSide.create(RelationSide.SIDE_A, 0x2000000000000171L, "TeamWorkflowToReview");
+ public static final RelationTypeSide TeamWorkflowToReview_Review = TeamWorkflowToReview_Team.getOpposite();
- public static final IRelationTypeSide ActionableItemLead_AI = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000000000000179L, "ActionableItemLead");
- public static final IRelationTypeSide ActionableItemLead_Lead = ActionableItemLead_AI.getOpposite();
+ public static final RelationTypeSide ActionableItemLead_AI = RelationTypeSide.create(RelationSide.SIDE_A, 0x2000000000000179L, "ActionableItemLead");
+ public static final RelationTypeSide ActionableItemLead_Lead = ActionableItemLead_AI.getOpposite();
- public static final IRelationTypeSide ActionableItem_Artifact = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000000000000178L, "ActionableItem Owner");
- public static final IRelationTypeSide ActionableItem_User = ActionableItem_Artifact.getOpposite();
+ public static final RelationTypeSide ActionableItem_Artifact = RelationTypeSide.create(RelationSide.SIDE_A, 0x2000000000000178L, "ActionableItem Owner");
+ public static final RelationTypeSide ActionableItem_User = ActionableItem_Artifact.getOpposite();
- public static final IRelationTypeSide AutoAddActionToGoal_Goal = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x200000000000017DL, "AutoAddActionToGoal");
- public static final IRelationTypeSide AutoAddActionToGoal_ConfigObject = AutoAddActionToGoal_Goal.getOpposite();
+ public static final RelationTypeSide AutoAddActionToGoal_Goal = RelationTypeSide.create(RelationSide.SIDE_A, 0x200000000000017DL, "AutoAddActionToGoal");
+ public static final RelationTypeSide AutoAddActionToGoal_ConfigObject = AutoAddActionToGoal_Goal.getOpposite();
- public static final IRelationTypeSide WorkPackage_WorkPackage = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x200000000000017EL, "Work Package");
- public static final IRelationTypeSide WorkPackage_TeamDefOrAi = WorkPackage_WorkPackage.getOpposite();
+ public static final RelationTypeSide WorkPackage_WorkPackage = RelationTypeSide.create(RelationSide.SIDE_A, 0x200000000000017EL, "Work Package");
+ public static final RelationTypeSide WorkPackage_TeamDefOrAi = WorkPackage_WorkPackage.getOpposite();
//@formatter:on
private AtsRelationTypes() {
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java
index c253d71fde..8f2115702a 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.ats.api.workflow.WorkItemType;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
@@ -44,7 +44,7 @@ public interface IAtsQuery {
IAtsQuery andAtsIds(Collection<String> atsIds);
- IAtsQuery andRelated(IAtsObject object, IRelationTypeSide relation);
+ IAtsQuery andRelated(IAtsObject object, RelationTypeSide relation);
IAtsQuery andLegacyIds(Collection<String> legacyIds);
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/task/JaxAtsTask.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/task/JaxAtsTask.java
index 89bd72e7ef..4a12395b2e 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/task/JaxAtsTask.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/task/JaxAtsTask.java
@@ -17,7 +17,7 @@ import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import org.eclipse.osee.ats.api.config.JaxAtsObject;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
/**
* @author Donald G. Dunne
@@ -108,7 +108,7 @@ public class JaxAtsTask extends JaxAtsObject {
addAttribute(attrType.getName(), value);
}
- public void addRelation(IRelationTypeSide relationSide, long... relatedUuid) {
+ public void addRelation(RelationTypeSide relationSide, long... relatedUuid) {
JaxRelation relation = new JaxRelation();
relation.setRelationTypeName(relationSide.getName());
relation.setSideA(relationSide.getSide().isSideA());
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java
index fe114e76a7..0317480443 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/IAtsChangeSet.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -76,15 +76,15 @@ public interface IAtsChangeSet {
ArtifactToken createArtifact(IArtifactType artifactType, String name, String guid, Long uuid);
- void relate(Object object1, IRelationTypeSide relationSide, Object object2);
+ void relate(Object object1, RelationTypeSide relationSide, Object object2);
AtsNotificationCollector getNotifications();
- void unrelateAll(Object object, IRelationTypeSide relationType);
+ void unrelateAll(Object object, RelationTypeSide relationType);
- void setRelation(Object object1, IRelationTypeSide relationType, Object object2);
+ void setRelation(Object object1, RelationTypeSide relationType, Object object2);
- public void setRelations(Object object, IRelationTypeSide relationSide, Collection<? extends Object> objects);
+ public void setRelations(Object object, RelationTypeSide relationSide, Collection<? extends Object> objects);
<T> void setAttribute(IAtsWorkItem workItem, int attributeId, T value);
@@ -114,13 +114,13 @@ public interface IAtsChangeSet {
*/
IAtsUser getAsUser();
- void unrelate(ArtifactId artifact, IRelationTypeSide relationSide, ArtifactId artifact2);
+ void unrelate(ArtifactId artifact, RelationTypeSide relationSide, ArtifactId artifact2);
- void unrelate(IAtsObject atsObject, IRelationTypeSide relationSide, IAtsObject atsObjec2);
+ void unrelate(IAtsObject atsObject, RelationTypeSide relationSide, IAtsObject atsObjec2);
- void unrelate(ArtifactId artifact, IRelationTypeSide relationSide, IAtsObject atsObject);
+ void unrelate(ArtifactId artifact, RelationTypeSide relationSide, IAtsObject atsObject);
- void unrelate(IAtsObject atsObject, IRelationTypeSide relationSide, ArtifactId artifact);
+ void unrelate(IAtsObject atsObject, RelationTypeSide relationSide, ArtifactId artifact);
void addAttribute(ArtifactId artifactId, IAttributeType attrType, Object value);
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IRelationResolver.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IRelationResolver.java
index b32ddb5f09..59522b4edc 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IRelationResolver.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workdef/IRelationResolver.java
@@ -16,7 +16,7 @@ import org.eclipse.osee.ats.api.IAtsWorkItem;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
/**
@@ -24,31 +24,31 @@ import org.eclipse.osee.framework.core.enums.DeletionFlag;
*/
public interface IRelationResolver {
- Collection<ArtifactToken> getRelated(ArtifactId artifact, IRelationTypeSide relationType);
+ Collection<ArtifactToken> getRelated(ArtifactId artifact, RelationTypeSide relationType);
- Collection<ArtifactToken> getRelated(ArtifactId artifact, IRelationTypeSide relationType, IArtifactType artifactType);
+ Collection<ArtifactToken> getRelated(ArtifactId artifact, RelationTypeSide relationType, IArtifactType artifactType);
- <T extends IAtsObject> Collection<T> getRelated(IAtsObject atsObject, IRelationTypeSide relationType, Class<T> clazz);
+ <T extends IAtsObject> Collection<T> getRelated(IAtsObject atsObject, RelationTypeSide relationType, Class<T> clazz);
- <T extends IAtsObject> Collection<T> getRelated(IAtsObject atsObject, IRelationTypeSide relationType, DeletionFlag flag, Class<T> clazz);
+ <T extends IAtsObject> Collection<T> getRelated(IAtsObject atsObject, RelationTypeSide relationType, DeletionFlag flag, Class<T> clazz);
- boolean areRelated(ArtifactId artifact1, IRelationTypeSide relationType, ArtifactId artifact2);
+ boolean areRelated(ArtifactId artifact1, RelationTypeSide relationType, ArtifactId artifact2);
- boolean areRelated(IAtsObject atsObject1, IRelationTypeSide relationType, IAtsObject atsObject2);
+ boolean areRelated(IAtsObject atsObject1, RelationTypeSide relationType, IAtsObject atsObject2);
- ArtifactToken getRelatedOrNull(ArtifactId artifact, IRelationTypeSide relationType);
+ ArtifactToken getRelatedOrNull(ArtifactId artifact, RelationTypeSide relationType);
- ArtifactToken getRelatedOrNull(IAtsObject atsObject, IRelationTypeSide relationType);
+ ArtifactToken getRelatedOrNull(IAtsObject atsObject, RelationTypeSide relationType);
- <T> T getRelatedOrNull(IAtsObject atsObject, IRelationTypeSide relationType, Class<T> clazz);
+ <T> T getRelatedOrNull(IAtsObject atsObject, RelationTypeSide relationType, Class<T> clazz);
- int getRelatedCount(IAtsWorkItem workItem, IRelationTypeSide relationType);
+ int getRelatedCount(IAtsWorkItem workItem, RelationTypeSide relationType);
- Collection<ArtifactToken> getRelatedArtifacts(IAtsWorkItem workItem, IRelationTypeSide relationTypeSide);
+ Collection<ArtifactToken> getRelatedArtifacts(IAtsWorkItem workItem, RelationTypeSide relationTypeSide);
- Collection<ArtifactToken> getRelated(IAtsObject atsObject, IRelationTypeSide relationTypeSide);
+ Collection<ArtifactToken> getRelated(IAtsObject atsObject, RelationTypeSide relationTypeSide);
- Collection<ArtifactToken> getRelatedArtifacts(ArtifactId artifact, IRelationTypeSide relationTypeSide);
+ Collection<ArtifactToken> getRelatedArtifacts(ArtifactId artifact, RelationTypeSide relationTypeSide);
Collection<ArtifactToken> getChildren(ArtifactId artifact, IArtifactType artifactType);
diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java
index 8125cab4f0..00d4f99b06 100644
--- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java
@@ -59,7 +59,7 @@ import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -408,7 +408,7 @@ public class PopulateDemoActions extends XNavigateItemAction {
}
}
- private void relate(IRelationTypeSide relationSide, Artifact artifact, Collection<Artifact> artifacts) throws OseeCoreException {
+ private void relate(RelationTypeSide relationSide, Artifact artifact, Collection<Artifact> artifacts) throws OseeCoreException {
for (Artifact otherArtifact : artifacts) {
artifact.addRelation(relationSide, otherArtifact);
}
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/AtsRelationResolverServiceTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/AtsRelationResolverServiceTest.java
index 2867d56da5..b9ca525eae 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/AtsRelationResolverServiceTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/AtsRelationResolverServiceTest.java
@@ -51,18 +51,18 @@ public class AtsRelationResolverServiceTest {
}
@Test
- public void testGetRelatedArtifactIdIRelationTypeSide() {
+ public void testGetRelatedArtifactIdRelationTypeSide() {
Assert.assertEquals(6, relationResolver.getRelated(topAi, CoreRelationTypes.Default_Hierarchical__Child).size());
}
@Test
- public void testGetRelatedIAtsObjectIRelationTypeSideClassOfT() {
+ public void testGetRelatedIAtsObjectRelationTypeSideClassOfT() {
Assert.assertEquals(8, relationResolver.getRelatedArtifacts((ArtifactId) sawCodeCommittedWf,
AtsRelationTypes.TeamWfToTask_Task).size());
}
@Test
- public void testAreRelatedArtifactIdIRelationTypeSideArtifactId() {
+ public void testAreRelatedArtifactIdRelationTypeSideArtifactId() {
Artifact sawCsciAi = (Artifact) services.getArtifact(DemoArtifactToken.SAW_CSCI_AI);
Assert.assertTrue(relationResolver.areRelated(topAi, CoreRelationTypes.Default_Hierarchical__Child, sawCsciAi));
Assert.assertTrue(relationResolver.areRelated(sawCsciAi, CoreRelationTypes.Default_Hierarchical__Parent, topAi));
@@ -73,7 +73,7 @@ public class AtsRelationResolverServiceTest {
}
@Test
- public void testAreRelatedIAtsObjectIRelationTypeSideIAtsObject() {
+ public void testAreRelatedIAtsObjectRelationTypeSideIAtsObject() {
Collection<ArtifactToken> related =
relationResolver.getRelatedArtifacts((IAtsWorkItem) sawCodeCommittedWf, AtsRelationTypes.TeamWfToTask_Task);
ArtifactId firstTask = related.iterator().next();
@@ -94,7 +94,7 @@ public class AtsRelationResolverServiceTest {
}
@Test
- public void testGetRelatedOrNullArtifactIdIRelationTypeSide() {
+ public void testGetRelatedOrNullArtifactIdRelationTypeSide() {
ArtifactId sawTestAi = services.getArtifact(DemoArtifactToken.SAW_Test_AI);
ArtifactId relatedOrNull =
relationResolver.getRelatedOrNull(sawTestAi, CoreRelationTypes.Default_Hierarchical__Parent);
@@ -106,7 +106,7 @@ public class AtsRelationResolverServiceTest {
}
@Test
- public void testGetRelatedOrNullIAtsObjectIRelationTypeSideClassOfT() {
+ public void testGetRelatedOrNullIAtsObjectRelationTypeSideClassOfT() {
Collection<ArtifactToken> related =
relationResolver.getRelatedArtifacts((IAtsWorkItem) sawCodeCommittedWf, AtsRelationTypes.TeamWfToTask_Task);
ArtifactId firstTaskArt = related.iterator().next();
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java
index 2af5750439..d520ebe34d 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java
@@ -14,7 +14,7 @@ import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
import org.eclipse.osee.framework.core.data.ArtifactTypeId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -23,9 +23,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
*/
public abstract class CollectorArtifact extends AbstractWorkflowArtifact implements HasMembers {
- private final IRelationTypeSide membersRelationType;
+ private final RelationTypeSide membersRelationType;
- public CollectorArtifact(String guid, BranchId branch, ArtifactTypeId artifactType, IRelationTypeSide membersRelationType) {
+ public CollectorArtifact(String guid, BranchId branch, ArtifactTypeId artifactType, RelationTypeSide membersRelationType) {
super(guid, branch, artifactType);
this.membersRelationType = membersRelationType;
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/SprintArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/SprintArtifact.java
index e9dd6cb281..f640dac974 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/SprintArtifact.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/SprintArtifact.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
import org.eclipse.osee.framework.core.data.ArtifactTypeId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -62,7 +62,7 @@ public class SprintArtifact extends CollectorArtifact implements IAgileSprint {
return AtsClientService.get().getSprintItemsCache().getMembers(this);
}
- public IRelationTypeSide getMembersRelationType() {
+ public RelationTypeSide getMembersRelationType() {
return AtsRelationTypes.AgileSprintToItem_AtsItem;
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/ArtifactCollectorsCache.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/ArtifactCollectorsCache.java
index d7b33e6d85..db14c432bf 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/ArtifactCollectorsCache.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/ArtifactCollectorsCache.java
@@ -20,7 +20,7 @@ import java.util.Map;
import java.util.Set;
import org.eclipse.osee.ats.core.client.artifact.CollectorArtifact;
import org.eclipse.osee.ats.core.client.util.IArtifactMembersCache;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.jdk.core.type.DoubleKeyHashMap;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -41,9 +41,9 @@ public class ArtifactCollectorsCache<T extends CollectorArtifact> implements IAr
private static DoubleKeyHashMap<Long, Long, String> collectorMemberOrderMap;
private static Set<Long> registered;
private static volatile boolean initialized = false;
- private final IRelationTypeSide memberRelationType;
+ private final RelationTypeSide memberRelationType;
- public ArtifactCollectorsCache(IRelationTypeSide memberRelationType) {
+ public ArtifactCollectorsCache(RelationTypeSide memberRelationType) {
this.memberRelationType = memberRelationType;
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/AtsConfigObject.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/AtsConfigObject.java
index 317c721baf..7064c9c8f7 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/AtsConfigObject.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/config/AtsConfigObject.java
@@ -24,7 +24,7 @@ import org.eclipse.osee.ats.core.client.internal.Activator;
import org.eclipse.osee.ats.core.model.impl.AtsObject;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -101,7 +101,7 @@ public abstract class AtsConfigObject extends AtsObject implements IAtsConfigObj
return getRelatedUsers(AtsRelationTypes.SubscribedUser_User);
}
- protected Collection<IAtsUser> getRelatedUsers(IRelationTypeSide relation) {
+ protected Collection<IAtsUser> getRelatedUsers(RelationTypeSide relation) {
Set<IAtsUser> results = new HashSet<>();
try {
for (Artifact userArt : artifact.getRelatedArtifacts(relation)) {
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/query/AtsConfigQueryImpl.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/query/AtsConfigQueryImpl.java
index 2aaf67aeee..f43b9b34e4 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/query/AtsConfigQueryImpl.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/query/AtsConfigQueryImpl.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.ats.core.util.AtsUtilCore;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -99,12 +99,12 @@ public class AtsConfigQueryImpl extends AbstractAtsConfigQueryImpl {
}
@Override
- public void queryAndNotExists(IRelationTypeSide relationTypeSide) {
+ public void queryAndNotExists(RelationTypeSide relationTypeSide) {
getQuery().andNotExists(relationTypeSide);
}
@Override
- public void queryAndExists(IRelationTypeSide relationTypeSide) {
+ public void queryAndExists(RelationTypeSide relationTypeSide) {
getQuery().andExists(relationTypeSide);
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/query/AtsQueryImpl.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/query/AtsQueryImpl.java
index 9d2cb400ee..fce5d853ae 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/query/AtsQueryImpl.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/query/AtsQueryImpl.java
@@ -25,7 +25,7 @@ import org.eclipse.osee.ats.core.util.AtsUtilCore;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -83,12 +83,12 @@ public class AtsQueryImpl extends AbstractAtsQueryImpl {
}
@Override
- public void queryAndRelatedToLocalIds(IRelationTypeSide relationTypeSide, ArtifactId artId) {
+ public void queryAndRelatedToLocalIds(RelationTypeSide relationTypeSide, ArtifactId artId) {
query.andRelatedTo(relationTypeSide, artId);
}
@Override
- public void queryAndRelatedTo(IRelationTypeSide relationTypeSide, List<ArtifactId> artIds) {
+ public void queryAndRelatedTo(RelationTypeSide relationTypeSide, List<ArtifactId> artIds) {
query.andRelatedTo(relationTypeSide, artIds);
}
@@ -108,12 +108,12 @@ public class AtsQueryImpl extends AbstractAtsQueryImpl {
}
@Override
- public void queryAndNotExists(IRelationTypeSide relationTypeSide) {
+ public void queryAndNotExists(RelationTypeSide relationTypeSide) {
query.andNotExists(relationTypeSide);
}
@Override
- public void queryAndExists(IRelationTypeSide relationTypeSide) {
+ public void queryAndExists(RelationTypeSide relationTypeSide) {
query.andExists(relationTypeSide);
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workflow/AtsRelationResolverServiceImpl.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workflow/AtsRelationResolverServiceImpl.java
index 8e58974bd1..98e38a11b4 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workflow/AtsRelationResolverServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/internal/workflow/AtsRelationResolverServiceImpl.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.ats.core.util.AbstractRelationResolverServiceImpl;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.jdk.core.util.Collections;
@@ -40,7 +40,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public Collection<ArtifactToken> getRelated(ArtifactId artifact, IRelationTypeSide relationType) {
+ public Collection<ArtifactToken> getRelated(ArtifactId artifact, RelationTypeSide relationType) {
List<ArtifactToken> results = new ArrayList<>();
Artifact useArt = getArtifact(artifact);
if (useArt != null) {
@@ -52,13 +52,13 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public <T extends IAtsObject> Collection<T> getRelated(IAtsObject atsObject, IRelationTypeSide relationType, Class<T> clazz) {
+ public <T extends IAtsObject> Collection<T> getRelated(IAtsObject atsObject, RelationTypeSide relationType, Class<T> clazz) {
return getRelated(atsObject, relationType, DeletionFlag.EXCLUDE_DELETED, clazz);
}
@SuppressWarnings("unchecked")
@Override
- public <T extends IAtsObject> Collection<T> getRelated(IAtsObject atsObject, IRelationTypeSide relationType, DeletionFlag flag, Class<T> clazz) {
+ public <T extends IAtsObject> Collection<T> getRelated(IAtsObject atsObject, RelationTypeSide relationType, DeletionFlag flag, Class<T> clazz) {
List<T> results = new ArrayList<>();
Artifact useArt = getArtifact(atsObject);
if (useArt != null) {
@@ -99,7 +99,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public boolean areRelated(ArtifactId artifact1, IRelationTypeSide relationType, ArtifactId artifact2) {
+ public boolean areRelated(ArtifactId artifact1, RelationTypeSide relationType, ArtifactId artifact2) {
boolean related = false;
Artifact useArt1 = getArtifact(artifact1);
Artifact useArt2 = getArtifact(artifact2);
@@ -110,7 +110,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public boolean areRelated(IAtsObject atsObject1, IRelationTypeSide relationType, IAtsObject atsObject2) {
+ public boolean areRelated(IAtsObject atsObject1, RelationTypeSide relationType, IAtsObject atsObject2) {
boolean related = false;
Artifact useArt1 = getArtifact(atsObject1);
Artifact useArt2 = getArtifact(atsObject2);
@@ -121,7 +121,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public ArtifactToken getRelatedOrNull(ArtifactId artifact, IRelationTypeSide relationType) {
+ public ArtifactToken getRelatedOrNull(ArtifactId artifact, RelationTypeSide relationType) {
ArtifactToken related = null;
Artifact art = getArtifact(artifact);
if (art != null) {
@@ -136,7 +136,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
@SuppressWarnings("unchecked")
@Override
- public <T> T getRelatedOrNull(IAtsObject atsObject, IRelationTypeSide relationType, Class<T> clazz) {
+ public <T> T getRelatedOrNull(IAtsObject atsObject, RelationTypeSide relationType, Class<T> clazz) {
T related = null;
Artifact art = getArtifact(atsObject);
if (art != null) {
@@ -156,7 +156,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public int getRelatedCount(IAtsWorkItem workItem, IRelationTypeSide relationType) {
+ public int getRelatedCount(IAtsWorkItem workItem, RelationTypeSide relationType) {
Artifact artifact = getArtifact(workItem);
int count = 0;
if (artifact != null) {
@@ -166,7 +166,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public ArtifactToken getRelatedOrNull(IAtsObject atsObject, IRelationTypeSide relationSide) {
+ public ArtifactToken getRelatedOrNull(IAtsObject atsObject, RelationTypeSide relationSide) {
Artifact art = getArtifact(atsObject);
if (art != null) {
return art.getRelatedArtifactOrNull(relationSide);
@@ -175,13 +175,13 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public List<ArtifactToken> getRelatedArtifacts(IAtsWorkItem workItem, IRelationTypeSide relationTypeSide) {
+ public List<ArtifactToken> getRelatedArtifacts(IAtsWorkItem workItem, RelationTypeSide relationTypeSide) {
Artifact artifact = getArtifact(workItem);
return Collections.castAll(getRelated(artifact, relationTypeSide));
}
@Override
- public Collection<ArtifactToken> getRelated(ArtifactId artifact, IRelationTypeSide relationType, IArtifactType artifactType) {
+ public Collection<ArtifactToken> getRelated(ArtifactId artifact, RelationTypeSide relationType, IArtifactType artifactType) {
List<ArtifactToken> results = new LinkedList<>();
Artifact art = getArtifact(artifact);
for (ArtifactToken related : art.getRelatedArtifacts(relationType)) {
@@ -193,7 +193,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public Collection<ArtifactToken> getRelatedArtifacts(ArtifactId artifact, IRelationTypeSide relationTypeSide) {
+ public Collection<ArtifactToken> getRelatedArtifacts(ArtifactId artifact, RelationTypeSide relationTypeSide) {
return getRelated(artifact, relationTypeSide);
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java
index 36fb4f7c34..8f6e609e21 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java
@@ -36,7 +36,7 @@ import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -277,7 +277,7 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
}
@Override
- public void relate(Object object1, IRelationTypeSide relationSide, Object object2) {
+ public void relate(Object object1, RelationTypeSide relationSide, Object object2) {
Artifact artifact = getArtifact(object1);
Artifact artifact2 = getArtifact(object2);
artifact.addRelation(relationSide, artifact2);
@@ -286,14 +286,14 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
}
@Override
- public void unrelateAll(Object object, IRelationTypeSide relationType) {
+ public void unrelateAll(Object object, RelationTypeSide relationType) {
Artifact artifact = getArtifact(object);
artifact.deleteRelations(relationType);
add(artifact);
}
@Override
- public void setRelations(Object object, IRelationTypeSide relationSide, Collection<? extends Object> objects) {
+ public void setRelations(Object object, RelationTypeSide relationSide, Collection<? extends Object> objects) {
Artifact artifact = getArtifact(object);
Set<Artifact> artifacts = new HashSet<>(objects.size());
for (Object obj : objects) {
@@ -371,7 +371,7 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
}
@Override
- public void unrelate(ArtifactId artifact, IRelationTypeSide relationSide, ArtifactId artifact2) {
+ public void unrelate(ArtifactId artifact, RelationTypeSide relationSide, ArtifactId artifact2) {
Artifact art = getArtifact(artifact);
Artifact art2 = getArtifact(artifact2);
art.deleteRelation(relationSide, art2);
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java
index 59e6ac380c..995ac4bf83 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/model/impl/AtsConfigObject.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.ats.api.user.IAtsUser;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.logger.Log;
@@ -103,7 +103,7 @@ public abstract class AtsConfigObject extends org.eclipse.osee.ats.core.model.im
return getRelatedUsers(AtsRelationTypes.SubscribedUser_User);
}
- protected Collection<IAtsUser> getRelatedUsers(IRelationTypeSide relation) {
+ protected Collection<IAtsUser> getRelatedUsers(RelationTypeSide relation) {
Set<IAtsUser> results = new HashSet<>();
try {
for (Object userArt : services.getRelationResolver().getRelated(artifact, relation)) {
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsConfigQueryImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsConfigQueryImpl.java
index eff4607f57..3431aff31c 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsConfigQueryImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsConfigQueryImpl.java
@@ -29,7 +29,7 @@ import org.eclipse.osee.ats.api.query.IAtsQueryFilter;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
@@ -133,9 +133,9 @@ public abstract class AbstractAtsConfigQueryImpl implements IAtsConfigQuery {
return false;
}
- public abstract void queryAndNotExists(IRelationTypeSide relationTypeSide);
+ public abstract void queryAndNotExists(RelationTypeSide relationTypeSide);
- public abstract void queryAndExists(IRelationTypeSide relationTypeSide);
+ public abstract void queryAndExists(RelationTypeSide relationTypeSide);
public abstract void queryAndIsOfType(IArtifactType artifactType);
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java
index 31d54b96f2..c8d6ab0a1e 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java
@@ -43,7 +43,7 @@ import org.eclipse.osee.ats.core.util.AtsUtilCore;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
@@ -59,7 +59,7 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery {
protected final List<AtsAttributeQuery> andAttr;
protected final List<AtsAttributeQuery> teamWorkflowAttr;
- protected final HashMap<IRelationTypeSide, List<IAtsObject>> andRels;
+ protected final HashMap<RelationTypeSide, List<IAtsObject>> andRels;
protected Collection<Long> teamDefUuids;
protected Collection<StateType> stateTypes;
protected Collection<WorkItemType> workItemTypes;
@@ -297,9 +297,9 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery {
}
}
- public abstract void queryAndNotExists(IRelationTypeSide relationTypeSide);
+ public abstract void queryAndNotExists(RelationTypeSide relationTypeSide);
- public abstract void queryAndExists(IRelationTypeSide relationTypeSide);
+ public abstract void queryAndExists(RelationTypeSide relationTypeSide);
private boolean typeIsSpecified(IArtifactType parentArtType, Set<IArtifactType> allArtTypes) {
for (IArtifactType artifactType : allArtTypes) {
@@ -525,7 +525,7 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery {
}
@Override
- public IAtsQuery andRelated(IAtsObject object, IRelationTypeSide relation) {
+ public IAtsQuery andRelated(IAtsObject object, RelationTypeSide relation) {
List<IAtsObject> list = andRels.get(relation);
if (list == null) {
list = new LinkedList<>();
@@ -792,7 +792,7 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery {
}
}
- public abstract void queryAndRelatedToLocalIds(IRelationTypeSide relationTypeSide, ArtifactId artId);
+ public abstract void queryAndRelatedToLocalIds(RelationTypeSide relationTypeSide, ArtifactId artId);
private void addAiCriteria() {
if (isActionableItemSpecified()) {
@@ -828,7 +828,7 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery {
private void addRelationCriteria() {
if (!andRels.isEmpty()) {
- for (Entry<IRelationTypeSide, List<IAtsObject>> entry : andRels.entrySet()) {
+ for (Entry<RelationTypeSide, List<IAtsObject>> entry : andRels.entrySet()) {
List<ArtifactId> artIds = new LinkedList<>();
for (IAtsObject object : entry.getValue()) {
artIds.add(ArtifactId.valueOf(object.getId()));
@@ -838,7 +838,7 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery {
}
}
- public abstract void queryAndRelatedTo(IRelationTypeSide relationTypeSide, List<ArtifactId> artIds);
+ public abstract void queryAndRelatedTo(RelationTypeSide relationTypeSide, List<ArtifactId> artIds);
private void addStateNameCriteria() {
if (stateName != null) {
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsChangeSet.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsChangeSet.java
index 05563115fc..9746ee913c 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsChangeSet.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractAtsChangeSet.java
@@ -26,7 +26,7 @@ import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
@@ -80,6 +80,7 @@ public abstract class AbstractAtsChangeSet implements IAtsChangeSet {
listeners.clear();
}
+ @Override
public void reset(String comment) {
clear();
this.comment = comment;
@@ -143,17 +144,17 @@ public abstract class AbstractAtsChangeSet implements IAtsChangeSet {
}
@Override
- public void unrelate(IAtsObject atsObject, IRelationTypeSide relationSide, IAtsObject atsObjec2) {
+ public void unrelate(IAtsObject atsObject, RelationTypeSide relationSide, IAtsObject atsObjec2) {
unrelate(atsObject.getStoreObject(), relationSide, atsObjec2.getStoreObject());
}
@Override
- public void unrelate(ArtifactId artifact, IRelationTypeSide relationSide, IAtsObject atsObject) {
+ public void unrelate(ArtifactId artifact, RelationTypeSide relationSide, IAtsObject atsObject) {
unrelate(artifact, relationSide, atsObject.getStoreObject());
}
@Override
- public void unrelate(IAtsObject atsObject, IRelationTypeSide relationSide, ArtifactId artifact) {
+ public void unrelate(IAtsObject atsObject, RelationTypeSide relationSide, ArtifactId artifact) {
unrelate(atsObject.getStoreObject(), relationSide, artifact);
}
@@ -163,7 +164,7 @@ public abstract class AbstractAtsChangeSet implements IAtsChangeSet {
}
@Override
- public void setRelation(Object object1, IRelationTypeSide relationSide, Object object2) {
+ public void setRelation(Object object1, RelationTypeSide relationSide, Object object2) {
setRelations(object1, relationSide, Collections.singleton(object2));
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractRelationResolverServiceImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractRelationResolverServiceImpl.java
index 102d3e9688..a0d2bb0b0f 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractRelationResolverServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AbstractRelationResolverServiceImpl.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.ats.api.workdef.IRelationResolver;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.jdk.core.util.Collections;
@@ -32,16 +32,15 @@ public abstract class AbstractRelationResolverServiceImpl implements IRelationRe
}
@Override
- public Collection<ArtifactToken> getRelated(IAtsObject atsObject, IRelationTypeSide relationTypeSide) {
+ public Collection<ArtifactToken> getRelated(IAtsObject atsObject, RelationTypeSide relationTypeSide) {
return getRelated(atsObject.getStoreObject(), relationTypeSide);
}
public abstract ArtifactId getArtifact(Object object);
@Override
- public Collection<ArtifactToken> getRelatedArtifacts(IAtsWorkItem workItem, IRelationTypeSide relationTypeSide) {
+ public Collection<ArtifactToken> getRelatedArtifacts(IAtsWorkItem workItem, RelationTypeSide relationTypeSide) {
ArtifactId artifact = getArtifact(workItem);
return Collections.castAll(getRelated(artifact, relationTypeSide));
}
-
-}
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsRelationChange.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsRelationChange.java
index 5e3c76ea1d..938a842ab2 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsRelationChange.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsRelationChange.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.ats.core.util;
import java.util.ArrayList;
import java.util.Collection;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
/**
* @author Donald G. Dunne
@@ -25,11 +25,11 @@ public class AtsRelationChange {
}
private final Object object;
- private final IRelationTypeSide relationSide;
+ private final RelationTypeSide relationSide;
private final Collection<Object> objects;
private final RelationOperation operation;
- public AtsRelationChange(Object object, IRelationTypeSide relationSide, Collection<? extends Object> objects, RelationOperation operation) {
+ public AtsRelationChange(Object object, RelationTypeSide relationSide, Collection<? extends Object> objects, RelationOperation operation) {
this.object = object;
this.relationSide = relationSide;
this.objects = new ArrayList<>(objects);
@@ -40,7 +40,7 @@ public class AtsRelationChange {
return object;
}
- public IRelationTypeSide getRelationSide() {
+ public RelationTypeSide getRelationSide() {
return relationSide;
}
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsConfigQueryImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsConfigQueryImpl.java
index 1a7eb023bc..2b40ecf703 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsConfigQueryImpl.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsConfigQueryImpl.java
@@ -21,7 +21,7 @@ import org.eclipse.osee.ats.rest.IAtsServer;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.orcs.data.ArtifactReadable;
@@ -105,12 +105,12 @@ public class AtsConfigQueryImpl extends AbstractAtsConfigQueryImpl {
}
@Override
- public void queryAndNotExists(IRelationTypeSide relationTypeSide) {
+ public void queryAndNotExists(RelationTypeSide relationTypeSide) {
getQuery().andNotExists(relationTypeSide);
}
@Override
- public void queryAndExists(IRelationTypeSide relationTypeSide) {
+ public void queryAndExists(RelationTypeSide relationTypeSide) {
getQuery().andExists(relationTypeSide);
}
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryImpl.java
index 2deae71079..8a1b54f38d 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryImpl.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryImpl.java
@@ -25,7 +25,7 @@ import org.eclipse.osee.ats.rest.IAtsServer;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.orcs.data.ArtifactReadable;
import org.eclipse.osee.orcs.search.QueryBuilder;
@@ -89,12 +89,12 @@ public class AtsQueryImpl extends AbstractAtsQueryImpl {
}
@Override
- public void queryAndRelatedToLocalIds(IRelationTypeSide relationTypeSide, ArtifactId artId) {
+ public void queryAndRelatedToLocalIds(RelationTypeSide relationTypeSide, ArtifactId artId) {
query.andRelatedTo(relationTypeSide, artId);
}
@Override
- public void queryAndRelatedTo(IRelationTypeSide relationTypeSide, List<ArtifactId> artifacts) {
+ public void queryAndRelatedTo(RelationTypeSide relationTypeSide, List<ArtifactId> artifacts) {
query.andRelatedTo(relationTypeSide, artifacts);
}
@@ -118,12 +118,12 @@ public class AtsQueryImpl extends AbstractAtsQueryImpl {
}
@Override
- public void queryAndNotExists(IRelationTypeSide relationTypeSide) {
+ public void queryAndNotExists(RelationTypeSide relationTypeSide) {
query.andNotExists(relationTypeSide);
}
@Override
- public void queryAndExists(IRelationTypeSide relationTypeSide) {
+ public void queryAndExists(RelationTypeSide relationTypeSide) {
query.andExists(relationTypeSide);
}
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsChangeSet.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsChangeSet.java
index 63149675fa..5407f15b05 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsChangeSet.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsChangeSet.java
@@ -33,7 +33,7 @@ import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.AttributeId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -204,7 +204,7 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
}
@Override
- public void relate(Object object1, IRelationTypeSide relationSide, Object object2) {
+ public void relate(Object object1, RelationTypeSide relationSide, Object object2) {
ArtifactId artifact = getArtifact(object1);
ArtifactId artifact2 = getArtifact(object2);
if (relationSide.getSide().isSideA()) {
@@ -227,7 +227,7 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
}
@Override
- public void unrelateAll(Object object, IRelationTypeSide relationType) {
+ public void unrelateAll(Object object, RelationTypeSide relationType) {
ArtifactReadable artifact = getArtifact(object);
add(artifact);
for (ArtifactReadable otherArt : artifact.getRelated(relationType)) {
@@ -241,7 +241,7 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
}
@Override
- public void setRelations(Object object, IRelationTypeSide relationSide, Collection<? extends Object> objects) {
+ public void setRelations(Object object, RelationTypeSide relationSide, Collection<? extends Object> objects) {
ArtifactReadable artifact = getArtifact(object);
List<ArtifactReadable> artifacts = new LinkedList<>();
for (Object obj : objects) {
@@ -268,7 +268,7 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
}
- public void unrelate(Object object1, IRelationTypeSide relationType, Object object2) {
+ public void unrelate(Object object1, RelationTypeSide relationType, Object object2) {
getTransaction().unrelate(getArtifact(object1), relationType, getArtifact(object2));
add(object1);
}
@@ -327,7 +327,7 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
}
@Override
- public void unrelate(ArtifactId artifact, IRelationTypeSide relationSide, ArtifactId artifact2) {
+ public void unrelate(ArtifactId artifact, RelationTypeSide relationSide, ArtifactId artifact2) {
ArtifactReadable art = getArtifact(artifact);
ArtifactReadable art2 = getArtifact(artifact2);
if (relationSide.getSide().isSideA()) {
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsRelationResolverServiceImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsRelationResolverServiceImpl.java
index abb56e8ec7..b75d308865 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsRelationResolverServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsRelationResolverServiceImpl.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.ats.rest.IAtsServer;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.orcs.data.ArtifactReadable;
@@ -39,7 +39,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public Collection<ArtifactToken> getRelated(ArtifactId artifact, IRelationTypeSide relationType) {
+ public Collection<ArtifactToken> getRelated(ArtifactId artifact, RelationTypeSide relationType) {
List<ArtifactToken> results = new ArrayList<>();
if (artifact instanceof ArtifactReadable) {
for (ArtifactReadable art : ((ArtifactReadable) artifact).getRelated(relationType)) {
@@ -55,13 +55,13 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public <T extends IAtsObject> Collection<T> getRelated(IAtsObject atsObject, IRelationTypeSide relationType, Class<T> clazz) {
+ public <T extends IAtsObject> Collection<T> getRelated(IAtsObject atsObject, RelationTypeSide relationType, Class<T> clazz) {
return getRelated(atsObject, relationType, DeletionFlag.EXCLUDE_DELETED, clazz);
}
@SuppressWarnings("unchecked")
@Override
- public <T extends IAtsObject> Collection<T> getRelated(IAtsObject atsObject, IRelationTypeSide relationType, DeletionFlag flag, Class<T> clazz) {
+ public <T extends IAtsObject> Collection<T> getRelated(IAtsObject atsObject, RelationTypeSide relationType, DeletionFlag flag, Class<T> clazz) {
List<T> results = new ArrayList<>();
ArtifactReadable useArt = getArtifact(atsObject);
if (useArt != null) {
@@ -76,7 +76,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public boolean areRelated(ArtifactId artifact1, IRelationTypeSide relationType, ArtifactId artifact2) {
+ public boolean areRelated(ArtifactId artifact1, RelationTypeSide relationType, ArtifactId artifact2) {
boolean related = false;
if (artifact1 instanceof ArtifactReadable && artifact2 instanceof ArtifactReadable) {
related = ((ArtifactReadable) artifact1).areRelated(relationType, (ArtifactReadable) artifact2);
@@ -85,7 +85,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public ArtifactToken getRelatedOrNull(ArtifactId artifact, IRelationTypeSide relationType) {
+ public ArtifactToken getRelatedOrNull(ArtifactId artifact, RelationTypeSide relationType) {
ArtifactToken related = null;
try {
related = ((ArtifactReadable) artifact).getRelated(relationType).getAtMostOneOrNull();
@@ -96,7 +96,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public boolean areRelated(IAtsObject atsObject1, IRelationTypeSide relationType, IAtsObject atsObject2) {
+ public boolean areRelated(IAtsObject atsObject1, RelationTypeSide relationType, IAtsObject atsObject2) {
boolean related = false;
ArtifactReadable useArt1 = getArtifact(atsObject1);
ArtifactReadable useArt2 = getArtifact(atsObject2);
@@ -108,7 +108,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
@SuppressWarnings("unchecked")
@Override
- public <T> T getRelatedOrNull(IAtsObject atsObject, IRelationTypeSide relationType, Class<T> clazz) {
+ public <T> T getRelatedOrNull(IAtsObject atsObject, RelationTypeSide relationType, Class<T> clazz) {
T related = null;
ArtifactReadable art = getArtifact(atsObject);
if (art != null) {
@@ -154,7 +154,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public int getRelatedCount(IAtsWorkItem workItem, IRelationTypeSide relationType) {
+ public int getRelatedCount(IAtsWorkItem workItem, RelationTypeSide relationType) {
ArtifactReadable artifact = getArtifact(workItem);
int count = 0;
if (artifact != null) {
@@ -164,7 +164,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public ArtifactToken getRelatedOrNull(IAtsObject atsObject, IRelationTypeSide relationSide) {
+ public ArtifactToken getRelatedOrNull(IAtsObject atsObject, RelationTypeSide relationSide) {
ArtifactReadable art = getArtifact(atsObject);
if (art != null) {
return art.getRelated(relationSide).getAtMostOneOrNull();
@@ -173,13 +173,13 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public Collection<ArtifactToken> getRelatedArtifacts(IAtsWorkItem workItem, IRelationTypeSide relationTypeSide) {
+ public Collection<ArtifactToken> getRelatedArtifacts(IAtsWorkItem workItem, RelationTypeSide relationTypeSide) {
ArtifactReadable artifact = getArtifact(workItem);
return org.eclipse.osee.framework.jdk.core.util.Collections.castAll(getRelated(artifact, relationTypeSide));
}
@Override
- public Collection<ArtifactToken> getRelated(ArtifactId artifact, IRelationTypeSide relationType, IArtifactType artifactType) {
+ public Collection<ArtifactToken> getRelated(ArtifactId artifact, RelationTypeSide relationType, IArtifactType artifactType) {
List<ArtifactToken> results = new LinkedList<>();
ArtifactReadable art = getArtifact(artifact);
for (ArtifactToken related : art.getRelated(relationType)) {
@@ -191,7 +191,7 @@ public class AtsRelationResolverServiceImpl extends AbstractRelationResolverServ
}
@Override
- public Collection<ArtifactToken> getRelatedArtifacts(ArtifactId artifact, IRelationTypeSide relationTypeSide) {
+ public Collection<ArtifactToken> getRelatedArtifacts(ArtifactId artifact, RelationTypeSide relationTypeSide) {
return getRelated(artifact, relationTypeSide);
}
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/CreateTasksOperation.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/CreateTasksOperation.java
index dff3537f7d..5f7f45418c 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/CreateTasksOperation.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/CreateTasksOperation.java
@@ -38,9 +38,9 @@ import org.eclipse.osee.ats.rest.IAtsServer;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
@@ -309,7 +309,7 @@ public class CreateTasksOperation {
}
Collection<IAtsWorkItem> items = atsServer.getQueryService().createQuery(WorkItemType.WorkItem).andUuids(
relation.getRelatedUuids().toArray(new Long[relation.getRelatedUuids().size()])).getItems();
- IRelationTypeSide side = null;
+ RelationTypeSide side = null;
if (relation.isSideA()) {
side = new RelationTypeSide(relationType, RelationSide.SIDE_A);
} else {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintManager.java
index 071e1cff9b..f5347b4cbf 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintManager.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.ats.artifact.MembersManager;
import org.eclipse.osee.ats.core.client.artifact.SprintArtifact;
import org.eclipse.osee.ats.internal.AtsClientService;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
@@ -48,7 +48,7 @@ public class SprintManager extends MembersManager<SprintArtifact> {
}
@Override
- public IRelationTypeSide getMembersRelationTypeSide() {
+ public RelationTypeSide getMembersRelationTypeSide() {
return AtsRelationTypes.AgileSprintToItem_AtsItem;
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java
index 3820aa91a0..3e680d32e4 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/agile/SprintMemberProvider.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.ats.api.data.AtsRelationTypes;
import org.eclipse.osee.ats.core.client.artifact.SprintArtifact;
import org.eclipse.osee.ats.goal.AbstractMemberProvider;
import org.eclipse.osee.ats.internal.AtsClientService;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.util.Result;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.swt.KeyedImage;
@@ -80,7 +80,7 @@ public class SprintMemberProvider extends AbstractMemberProvider {
}
@Override
- public IRelationTypeSide getMemberRelationTypeSide() {
+ public RelationTypeSide getMemberRelationTypeSide() {
return AtsRelationTypes.AgileSprintToItem_AtsItem;
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalManager.java
index 822aecf90d..249837082e 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalManager.java
@@ -23,7 +23,7 @@ import org.eclipse.osee.ats.goal.MembersLabelProvider;
import org.eclipse.osee.ats.goal.MembersViewerSorter;
import org.eclipse.osee.ats.internal.AtsClientService;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
@@ -78,7 +78,7 @@ public class GoalManager extends MembersManager<GoalArtifact> {
}
@Override
- public IRelationTypeSide getMembersRelationTypeSide() {
+ public RelationTypeSide getMembersRelationTypeSide() {
return AtsRelationTypes.Goal_Member;
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/MembersManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/MembersManager.java
index b583dd8a6a..d3ca3599ab 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/MembersManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/MembersManager.java
@@ -23,7 +23,7 @@ import org.eclipse.jface.window.Window;
import org.eclipse.osee.ats.core.client.artifact.CollectorArtifact;
import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
@@ -37,7 +37,7 @@ public abstract class MembersManager<T extends CollectorArtifact> {
public MembersManager() {
}
- public abstract IRelationTypeSide getMembersRelationTypeSide();
+ public abstract RelationTypeSide getMembersRelationTypeSide();
public abstract String getItemName();
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/IMemberProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/IMemberProvider.java
index bdad9cf738..c48eeb9520 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/IMemberProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/IMemberProvider.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.editor;
import java.util.List;
import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.nebula.widgets.xviewer.IXViewerFactory;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.util.Result;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.swt.KeyedImage;
@@ -39,7 +39,7 @@ public interface IMemberProvider {
String getColumnName();
- IRelationTypeSide getMemberRelationTypeSide();
+ RelationTypeSide getMemberRelationTypeSide();
void promptChangeOrder(Artifact artifact, List<Artifact> selectedAtsArtifacts);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeRelationsHyperlinkComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeRelationsHyperlinkComposite.java
index b9d391bb82..99eff17b05 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeRelationsHyperlinkComposite.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeRelationsHyperlinkComposite.java
@@ -25,7 +25,7 @@ import org.eclipse.osee.ats.internal.Activator;
import org.eclipse.osee.ats.internal.AtsClientService;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.widgets.dialog.AICheckTreeDialog;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.Active;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.PresentationType;
@@ -48,7 +48,7 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
*/
public class WfeRelationsHyperlinkComposite extends Composite {
- private static IRelationTypeSide[] sides = new IRelationTypeSide[] {
+ private static RelationTypeSide[] sides = new RelationTypeSide[] {
AtsRelationTypes.TeamWorkflowToReview_Review,
AtsRelationTypes.TeamWorkflowToReview_Team,
CoreRelationTypes.Supercedes_Superceded,
@@ -94,7 +94,7 @@ public class WfeRelationsHyperlinkComposite extends Composite {
}
public static boolean relationExists(AbstractWorkflowArtifact smaArt) throws OseeCoreException {
- for (IRelationTypeSide side : sides) {
+ for (RelationTypeSide side : sides) {
if (smaArt.getRelatedArtifacts(side).size() > 0) {
return true;
}
@@ -113,7 +113,7 @@ public class WfeRelationsHyperlinkComposite extends Composite {
return "";
}
- private void createArtifactRelationHyperlinks(String prefix, Artifact thisArt, String action, IRelationTypeSide relationEnum) throws OseeCoreException {
+ private void createArtifactRelationHyperlinks(String prefix, Artifact thisArt, String action, RelationTypeSide 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/goal/GoalMemberProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java
index bce5a83b80..9e3eaa2b9e 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalMemberProvider.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.ats.api.workflow.IAtsGoal;
import org.eclipse.osee.ats.artifact.GoalManager;
import org.eclipse.osee.ats.core.client.artifact.GoalArtifact;
import org.eclipse.osee.ats.internal.AtsClientService;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.util.Result;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.ui.swt.KeyedImage;
@@ -97,7 +97,7 @@ public class GoalMemberProvider extends AbstractMemberProvider {
}
@Override
- public IRelationTypeSide getMemberRelationTypeSide() {
+ public RelationTypeSide getMemberRelationTypeSide() {
return AtsRelationTypes.Goal_Member;
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeUtility.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeUtility.java
index 19505bbe7e..2b3d13b842 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeUtility.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/SubscribeUtility.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.ats.navigate;
import java.util.Collection;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
@@ -29,7 +29,7 @@ public class SubscribeUtility {
*
* @param artifacts to subscribe or empty to remove all
*/
- public static final void setSubcriptionsAndPersist(Artifact userArtifact, IRelationTypeSide relationSide, Collection<? extends Artifact> artifacts, IArtifactType artifactType, String persistComment) throws OseeCoreException {
+ public static final void setSubcriptionsAndPersist(Artifact userArtifact, RelationTypeSide relationSide, Collection<? extends Artifact> artifacts, IArtifactType artifactType, String persistComment) throws OseeCoreException {
RelationTypeSideSorter sorter =
RelationManager.createTypeSideSorter(userArtifact, relationSide, relationSide.getSide());
Collection<Artifact> currentlyRelated = userArtifact.getRelatedArtifacts(relationSide, Artifact.class);
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 c3bc5ef6a6..1d84f8f47b 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
@@ -25,7 +25,7 @@ import org.eclipse.osee.ats.core.util.AtsObjects;
import org.eclipse.osee.ats.core.workflow.log.AtsLogUtility;
import org.eclipse.osee.ats.internal.Activator;
import org.eclipse.osee.ats.internal.AtsClientService;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
@@ -194,7 +194,7 @@ public class Overview {
}
@SuppressWarnings("deprecation")
- public void addRelationTable(String name, IRelationTypeSide side, Artifact parent) {
+ public void addRelationTable(String name, RelationTypeSide 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 030bac4c5d..d8294561a2 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
@@ -15,7 +15,7 @@ import java.util.Arrays;
import java.util.Collection;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -26,10 +26,10 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
public final class RelationSetRule extends AbstractValidationRule {
private final IArtifactType artifactType;
private final Integer minimumRelations;
- private final IRelationTypeSide relationEnum;
+ private final RelationTypeSide relationEnum;
private final Collection<IArtifactType> ignoreArtifactTypes;
- public RelationSetRule(IArtifactType artifactType, IRelationTypeSide relationEnum, Integer minimumRelations, IArtifactType... ignoreArtifactTypes) {
+ public RelationSetRule(IArtifactType artifactType, RelationTypeSide relationEnum, Integer minimumRelations, IArtifactType... ignoreArtifactTypes) {
this.artifactType = artifactType;
this.relationEnum = relationEnum;
this.minimumRelations = minimumRelations;
diff --git a/plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/internal/AddRequirementData.java b/plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/internal/AddRequirementData.java
index cedcc2b0cb..86fb6207f9 100644
--- a/plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/internal/AddRequirementData.java
+++ b/plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/internal/AddRequirementData.java
@@ -24,7 +24,7 @@ import org.eclipse.osee.ats.demo.api.DemoUsers;
import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -137,7 +137,7 @@ public class AddRequirementData implements IDbInitializationTask {
return file;
}
- private void relate(IRelationTypeSide relationSide, Artifact artifact, Collection<Artifact> artifacts) throws OseeCoreException {
+ private void relate(RelationTypeSide relationSide, Artifact artifact, Collection<Artifact> artifacts) throws OseeCoreException {
for (Artifact otherArtifact : artifacts) {
artifact.addRelation(relationSide, otherArtifact);
}
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderMergeUtilityTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderMergeUtilityTest.java
index cc18da4931..d86313f95d 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderMergeUtilityTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderMergeUtilityTest.java
@@ -21,7 +21,7 @@ import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule;
import org.eclipse.osee.client.test.framework.OseeHousekeepingRule;
import org.eclipse.osee.client.test.framework.OseeLogMonitorRule;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -57,7 +57,7 @@ public class RelationOrderMergeUtilityTest {
@Rule
public final OseeHousekeepingRule oseeHousekeeping = new OseeHousekeepingRule();
- private final IRelationTypeSide defaultHierarchy = CoreRelationTypes.Default_Hierarchical__Child;
+ private final RelationTypeSide defaultHierarchy = CoreRelationTypes.Default_Hierarchical__Child;
private final RelationSorter ascOrder = LEXICOGRAPHICAL_ASC;
private final RelationSorter descOrder = LEXICOGRAPHICAL_DESC;
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockIArtifact.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockIArtifact.java
index 06b5f0cb8a..ae56abf5f9 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockIArtifact.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/MockIArtifact.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.client.integration.tests.integration.skynet.core.utils;
import java.util.Collections;
import java.util.List;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.jdk.core.type.NamedIdentity;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java
index 649b45d87f..482975abd9 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java
@@ -27,7 +27,7 @@ import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule;
import org.eclipse.osee.client.test.framework.OseeLogMonitorRule;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -477,7 +477,7 @@ public final class ReplaceWithBaselineTest {
public final boolean isBaseline;
private int artifactId;
- private IRelationTypeSide relationType;
+ private RelationTypeSide relationType;
private int bArtifactId;
private int attrId;
@@ -506,11 +506,11 @@ public final class ReplaceWithBaselineTest {
this.attrId = attrId;
}
- public IRelationTypeSide getRelationType() {
+ public RelationTypeSide getRelationType() {
return relationType;
}
- public void setRelationType(IRelationTypeSide relationType) {
+ public void setRelationType(RelationTypeSide relationType) {
this.relationType = relationType;
}
diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SafetyInformationAccumulator.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SafetyInformationAccumulator.java
index e2d5e3c4c2..a77be2515b 100644
--- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SafetyInformationAccumulator.java
+++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/SafetyInformationAccumulator.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
import java.util.List;
import org.eclipse.osee.define.report.SafetyReportGenerator;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -184,7 +184,7 @@ public final class SafetyInformationAccumulator {
writer.endRow();
}
- private String writeCriticalityWithDesignCheck(ArtifactReadable art, String criticality, IAttributeType thisType, IRelationTypeSide relType, IAttributeType otherType) throws IOException {
+ private String writeCriticalityWithDesignCheck(ArtifactReadable art, String criticality, IAttributeType thisType, RelationTypeSide relType, IAttributeType otherType) throws IOException {
String current = art.getSoleAttributeAsString(thisType, "Error");
if ("Error".equals(criticality) || "Error".equals(current)) {
writer.writeCell("Error: invalid content");
@@ -214,7 +214,7 @@ public final class SafetyInformationAccumulator {
return current;
}
- private void checkBackTrace(ArtifactReadable art, Integer current, IAttributeType thisType, IRelationTypeSide relType, IAttributeType otherType) throws IOException {
+ private void checkBackTrace(ArtifactReadable art, Integer current, IAttributeType thisType, RelationTypeSide relType, IAttributeType otherType) throws IOException {
/**
* when the parent criticality is less critical than the child, we check to see if the child traces to any more
* critical parent (thus justifying the criticality of the child) note: more critical = lower number
diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/TraceInformationAccumulator.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/TraceInformationAccumulator.java
index 35eb013d5d..c6f45118a3 100644
--- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/TraceInformationAccumulator.java
+++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/TraceInformationAccumulator.java
@@ -16,7 +16,7 @@ import java.util.List;
import org.eclipse.osee.define.report.AlternateTypeOutput;
import org.eclipse.osee.define.report.TraceReportGenerator;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
@@ -143,7 +143,7 @@ public class TraceInformationAccumulator {
return toReturn;
}
- private int processSoftwareReqtSubItem(ArtifactReadable softwareReqt, IRelationTypeSide type, int location) throws IOException {
+ private int processSoftwareReqtSubItem(ArtifactReadable softwareReqt, RelationTypeSide type, int location) throws IOException {
List<ArtifactReadable> items = softwareReqt.getRelated(type).getList();
if (items.size() > 0) {
for (ArtifactReadable ar : items) {
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/TestPlanComplianceReport.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/TestPlanComplianceReport.java
index 13ee736aee..c858d22dd6 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/TestPlanComplianceReport.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/TestPlanComplianceReport.java
@@ -20,7 +20,7 @@ import java.util.LinkedList;
import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -206,7 +206,7 @@ public final class TestPlanComplianceReport extends AbstractBlam {
return src.getArtifactType().inheritsFrom(CoreArtifactTypes.TestPlanElement);
}
- private List<String> getRequirementsCellOutput(Artifact art, IRelationTypeSide rts) throws OseeCoreException {
+ private List<String> getRequirementsCellOutput(Artifact art, RelationTypeSide rts) throws OseeCoreException {
List<String> result = null;
if (art.getArtifactType().inheritsFrom(CoreArtifactTypes.TestPlanElement)) {
result = getRequirementsAsString(art, rts);
@@ -214,7 +214,7 @@ public final class TestPlanComplianceReport extends AbstractBlam {
return result;
}
- private List<String> getRequirementsAsString(Artifact testPlan, IRelationTypeSide rts) throws OseeCoreException {
+ private List<String> getRequirementsAsString(Artifact testPlan, RelationTypeSide rts) throws OseeCoreException {
Collection<Artifact> requirementArtifacts = testPlan.getRelatedArtifacts(rts);
List<String> requirementNames = new ArrayList<>();
for (Artifact req : requirementArtifacts) {
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 c722678304..fe839dc095 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
@@ -38,7 +38,7 @@ 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.IOseeBranch;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -332,7 +332,7 @@ public class TraceReportBlam extends AbstractBlam {
private void addRelationToCheck(List<TraceTypeEnum> traceTypes, AbstractArtifactRelationReport report, boolean fromTraceUnit) {
for (TraceTypeEnum traceTypeEnum : traceTypes) {
- IRelationTypeSide relation =
+ RelationTypeSide relation =
fromTraceUnit ? traceTypeEnum.getRelatedToRequirement() : traceTypeEnum.getRelatedToTraceUnit();
report.addRelationToCheck(relation);
}
@@ -397,21 +397,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 IRelationTypeSide toReq;
- private IRelationTypeSide toTraceUnit;
+ private RelationTypeSide toReq;
+ private RelationTypeSide toTraceUnit;
private boolean isTestType;
- TraceTypeEnum(IRelationTypeSide toReq, IRelationTypeSide toTraceUnit, boolean isTestType) {
+ TraceTypeEnum(RelationTypeSide toReq, RelationTypeSide toTraceUnit, boolean isTestType) {
this.toReq = toReq;
this.toTraceUnit = toTraceUnit;
this.isTestType = isTestType;
}
- public IRelationTypeSide getRelatedToRequirement() {
+ public RelationTypeSide getRelatedToRequirement() {
return toReq;
}
- public IRelationTypeSide getRelatedToTraceUnit() {
+ public RelationTypeSide getRelatedToTraceUnit() {
return toTraceUnit;
}
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceResourceDropOperation.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceResourceDropOperation.java
index 26553bc21c..4b10e19e9a 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceResourceDropOperation.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceResourceDropOperation.java
@@ -30,7 +30,7 @@ import org.eclipse.osee.define.traceability.HierarchyHandler;
import org.eclipse.osee.define.traceability.TestUnitTagger;
import org.eclipse.osee.define.utility.IResourceLocator;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
@@ -55,12 +55,12 @@ public class TraceResourceDropOperation extends AbstractOperation {
private final Collection<URI> resources;
private final IResourceLocator locator;
- private final IRelationTypeSide relTypeSide;
+ private final RelationTypeSide relTypeSide;
private final Artifact requirement;
private final boolean persistChanges;
private final RenameConfirmer confirmer;
- public TraceResourceDropOperation(Collection<URI> resources, IRelationTypeSide relTypeSide, Artifact requirement, IResourceLocator locator, boolean persistChanges, RenameConfirmer confirmer) {
+ public TraceResourceDropOperation(Collection<URI> resources, RelationTypeSide relTypeSide, Artifact requirement, IResourceLocator locator, boolean persistChanges, RenameConfirmer confirmer) {
super("Trace Resource Drop Operation", Activator.PLUGIN_ID);
this.relTypeSide = relTypeSide;
this.requirement = requirement;
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 cb800bc18d..1b9ce9c770 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
@@ -36,7 +36,7 @@ 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.BranchId;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
@@ -222,7 +222,7 @@ public class TraceUnitToArtifactProcessor implements ITraceUnitProcessor {
Artifact requirementArtifact = getRequirementArtifact(traceMark.getRawTraceMark(), requirementData);
if (requirementArtifact != null) {
- IRelationTypeSide relationType = getRelationFromTraceType(traceUnitArtifact, traceMark.getTraceType());
+ RelationTypeSide relationType = getRelationFromTraceType(traceUnitArtifact, traceMark.getTraceType());
if (relationType == null) {
unknownRelationError.put(traceUnitArtifact.getArtifactTypeName(), traceMark.getTraceType());
} else if (!requirementArtifact.isRelated(relationType, traceUnitArtifact)) {
@@ -253,7 +253,7 @@ public class TraceUnitToArtifactProcessor implements ITraceUnitProcessor {
return traceType.equalsIgnoreCase("USES");
}
- private IRelationTypeSide getRelationFromTraceType(Artifact traceUnitArtifact, String traceType) {
+ private RelationTypeSide 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 0356acc89f..2830bc852f 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.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
/**
@@ -24,7 +24,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
public abstract class AbstractArtifactRelationReport extends AbstractReport {
private final Set<Artifact> artifactsToCheck;
- private final List<IRelationTypeSide> relationsToCheck;
+ private final List<RelationTypeSide> relationsToCheck;
public AbstractArtifactRelationReport() {
super();
@@ -38,7 +38,7 @@ public abstract class AbstractArtifactRelationReport extends AbstractReport {
}
}
- public void addRelationToCheck(IRelationTypeSide relation) {
+ public void addRelationToCheck(RelationTypeSide 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 IRelationTypeSide[] getRelationsToCheck() {
- return relationsToCheck.toArray(new IRelationTypeSide[relationsToCheck.size()]);
+ public RelationTypeSide[] getRelationsToCheck() {
+ return relationsToCheck.toArray(new RelationTypeSide[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 47c919a73c..cfeb7821d1 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
@@ -15,7 +15,7 @@ import java.util.List;
import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.define.internal.Activator;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -37,11 +37,11 @@ public class ArtifactToRelatedArtifact extends AbstractArtifactRelationReport {
return toReturn.toArray(new String[toReturn.size()]);
}
- public List<String[]> getRelatedRows(IRelationTypeSide[] relations, Artifact artifact) throws OseeCoreException {
+ public List<String[]> getRelatedRows(RelationTypeSide[] relations, Artifact artifact) throws OseeCoreException {
List<String[]> toReturn = new ArrayList<>();
int maxSize = 0;
List<List<String>> items = new ArrayList<>();
- for (IRelationTypeSide relationEnum : relations) {
+ for (RelationTypeSide relationEnum : relations) {
List<String> entries = new ArrayList<>();
for (Artifact relArtifact : artifact.getRelatedArtifacts(relationEnum)) {
entries.add(relArtifact.getName());
@@ -66,10 +66,10 @@ public class ArtifactToRelatedArtifact extends AbstractArtifactRelationReport {
@Override
public void process(IProgressMonitor monitor) {
notifyOnTableHeader(getHeader());
- IRelationTypeSide[] relations = getRelationsToCheck();
+ RelationTypeSide[] relations = getRelationsToCheck();
for (Artifact artifact : getArtifactsToCheck()) {
String name = artifact.getName();
- for (IRelationTypeSide relationEnum : relations) {
+ for (RelationTypeSide relationEnum : relations) {
String typeName = relationEnum.getName();
try {
for (Artifact relArtifact : artifact.getRelatedArtifacts(relationEnum)) {
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 aff375564e..ca735800a5 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,7 +14,7 @@ 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.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Collections;
@@ -33,7 +33,7 @@ public class ArtifactTraceCount extends AbstractArtifactRelationReport {
List<String> header = new ArrayList<>();
header.add("Name");
header.add("Type");
- for (IRelationTypeSide relation : getRelationsToCheck()) {
+ for (RelationTypeSide 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);
- IRelationTypeSide[] relations = getRelationsToCheck();
+ RelationTypeSide[] relations = getRelationsToCheck();
for (Artifact art : getArtifactsToCheck()) {
String[] rowData = new String[header.length];
int index = 0;
rowData[index++] = art.getName();
rowData[index++] = art.getArtifactTypeName();
- for (IRelationTypeSide relationType : relations) {
+ for (RelationTypeSide 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 5d7fe5f400..f844e106df 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.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -27,10 +27,10 @@ public class ArtifactsWithoutRelations extends AbstractArtifactRelationReport {
@Override
public void process(IProgressMonitor monitor) throws OseeCoreException {
notifyOnTableHeader("Item Name", "Type");
- IRelationTypeSide[] relations = getRelationsToCheck();
+ RelationTypeSide[] relations = getRelationsToCheck();
for (Artifact artifact : getArtifactsToCheck()) {
int count = 0;
- for (IRelationTypeSide relation : relations) {
+ for (RelationTypeSide relation : relations) {
count += artifact.getRelatedArtifactsCount(relation);
}
if (count <= 0) {
diff --git a/plugins/org.eclipse.osee.framework.access.provider/src/org/eclipse/osee/framework/access/provider/internal/FrameworkAccessModel.java b/plugins/org.eclipse.osee.framework.access.provider/src/org/eclipse/osee/framework/access/provider/internal/FrameworkAccessModel.java
index 2e05f3df7e..e57c8eb478 100644
--- a/plugins/org.eclipse.osee.framework.access.provider/src/org/eclipse/osee/framework/access/provider/internal/FrameworkAccessModel.java
+++ b/plugins/org.eclipse.osee.framework.access.provider/src/org/eclipse/osee/framework/access/provider/internal/FrameworkAccessModel.java
@@ -12,12 +12,12 @@ package org.eclipse.osee.framework.access.provider.internal;
import java.util.Collection;
import org.eclipse.osee.framework.core.data.IAccessContextId;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
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.OseeDslProvider;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.access.AccessData;
import org.eclipse.osee.framework.core.model.access.AccessDetail;
import org.eclipse.osee.framework.core.model.access.Scope;
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java
index a63f806248..ea0952a8a0 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java
@@ -20,6 +20,7 @@ import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IRelationType;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.dsl.integration.mocks.DslAsserts;
import org.eclipse.osee.framework.core.dsl.integration.mocks.MockArtifactProxy;
import org.eclipse.osee.framework.core.dsl.integration.mocks.MockModel;
@@ -37,7 +38,6 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.access.AccessDetail;
import org.eclipse.osee.framework.core.model.access.AccessDetailCollector;
import org.eclipse.osee.framework.core.model.access.Scope;
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandler.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandler.java
index 846dbe454a..eff1e372dd 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandler.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandler.java
@@ -14,6 +14,7 @@ import java.util.Collection;
import java.util.Collections;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IRelationType;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider.ArtifactProxy;
import org.eclipse.osee.framework.core.dsl.integration.RestrictionHandler;
@@ -28,7 +29,6 @@ import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationSideEnum;
import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationType;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.access.AccessDetail;
import org.eclipse.osee.framework.core.model.access.AccessDetailCollector;
import org.eclipse.osee.framework.core.model.access.Scope;
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java
index 1a348fadb6..dd5d61e231 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java
@@ -19,12 +19,12 @@ import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.mocks.MockDataFactory;
import org.eclipse.osee.framework.core.model.mocks.ModelAsserts;
import org.eclipse.osee.framework.core.model.type.RelationType;
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessDataQuery.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessDataQuery.java
index b8e0d83471..25f8616724 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessDataQuery.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/access/AccessDataQuery.java
@@ -14,7 +14,7 @@ import java.util.Collection;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -91,16 +91,16 @@ public class AccessDataQuery {
}
private class RelationTypeSideFilter implements AccessFilter {
- IRelationTypeSide toFilter;
+ RelationTypeSide toFilter;
- RelationTypeSideFilter(IRelationTypeSide toFilter) {
+ RelationTypeSideFilter(RelationTypeSide toFilter) {
this.toFilter = toFilter;
}
@Override
public boolean accept(AccessDetail<?> access) {
- if (access.getAccessObject() instanceof IRelationTypeSide) {
- IRelationTypeSide toCheck = (IRelationTypeSide) access.getAccessObject();
+ if (access.getAccessObject() instanceof RelationTypeSide) {
+ RelationTypeSide toCheck = (RelationTypeSide) access.getAccessObject();
return toCheck.getSide().equals(toFilter.getSide()) && toCheck.getGuid().equals(toFilter.getGuid());
}
return false;
@@ -123,7 +123,7 @@ public class AccessDataQuery {
}
}
- public void relationTypeMatches(PermissionEnum permissionToMatch, IBasicArtifact<?> artifact, IRelationTypeSide relationTypeSide, PermissionStatus permissionStatus) throws OseeCoreException {
+ public void relationTypeMatches(PermissionEnum permissionToMatch, IBasicArtifact<?> artifact, RelationTypeSide relationTypeSide, PermissionStatus permissionStatus) throws OseeCoreException {
BranchId branchToMatch = artifact.getBranch();
branchMatches(permissionToMatch, branchToMatch, permissionStatus);
if (permissionStatus.matched()) {
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/data/RelationTypeSideTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/data/RelationTypeSideTest.java
index 8eed89e902..c4068304f8 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/data/RelationTypeSideTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/data/RelationTypeSideTest.java
@@ -29,7 +29,7 @@ public class RelationTypeSideTest {
@Test
public void testHashCodeEquals() {
IRelationType relType1 = TokenFactory.createRelationType(uuid1, "X");
- IRelationTypeSide relTypeSide1 = create(uuid1, sideA, uuid1 + "_sideA");
+ RelationTypeSide relTypeSide1 = RelationTypeSide.create(sideA, uuid1, uuid1 + "_sideA");
Assert.assertTrue(relType1.equals(relTypeSide1));
Assert.assertTrue(relTypeSide1.equals(relType1));
@@ -39,10 +39,10 @@ public class RelationTypeSideTest {
@Test
public void testMap() {
- IRelationTypeSide relTypeSide1 = create(uuid1, sideA, uuid1 + "_sideA");
- IRelationTypeSide relTypeSide2 = create(uuid1, sideB, uuid1 + "_sideB");
- IRelationTypeSide relTypeSide3 = create(uuid2, sideA, uuid2 + "_sideA");
- IRelationTypeSide relTypeSide4 = create(uuid2, sideB, uuid2 + "_sideB");
+ RelationTypeSide relTypeSide1 = RelationTypeSide.create(sideA, uuid1, uuid1 + "_sideA");
+ RelationTypeSide relTypeSide2 = RelationTypeSide.create(sideB, uuid1, uuid1 + "_sideB");
+ RelationTypeSide relTypeSide3 = RelationTypeSide.create(sideA, uuid2, uuid2 + "_sideA");
+ RelationTypeSide relTypeSide4 = RelationTypeSide.create(sideB, uuid2, uuid2 + "_sideB");
Map<IRelationType, String> data = new HashMap<>();
data.put(relTypeSide1, "a1");
@@ -57,7 +57,7 @@ public class RelationTypeSideTest {
Assert.assertEquals("c3", data.get(relTypeSide3));
Assert.assertEquals("d4", data.get(relTypeSide4));
- IRelationType relType1 = create(uuid1, sideB, "");
+ IRelationType relType1 = RelationTypeSide.create(sideB, uuid1, "");
String removed = data.put(relType1, "hello");
Assert.assertEquals("b2", removed);
@@ -68,9 +68,4 @@ public class RelationTypeSideTest {
Assert.assertEquals(4, data.size());
}
-
- private static IRelationTypeSide create(long guid, RelationSide side, String data) {
- return TokenFactory.createRelationTypeSide(side, guid, data);
- }
-
-}
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationTypeSide.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationTypeSide.java
deleted file mode 100644
index dd90fde4e4..0000000000
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationTypeSide.java
+++ /dev/null
@@ -1,26 +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.core.data;
-
-import org.eclipse.osee.framework.core.enums.RelationSide;
-
-public interface IRelationTypeSide extends IRelationType {
- RelationSide getSide();
-
- IRelationTypeSide getOpposite();
-
- boolean isOfType(IRelationType type);
-
- default Long getGuid() {
- return getId();
- }
-
-}
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/src/org/eclipse/osee/framework/core/data/RelationTypeSide.java
index 6883034ae1..e7a45370ac 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/src/org/eclipse/osee/framework/core/data/RelationTypeSide.java
@@ -9,17 +9,15 @@
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.core.model;
+package org.eclipse.osee.framework.core.data;
-import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.jdk.core.type.NamedId;
/**
* @author Andrew M. Finkbeiner
*/
-public class RelationTypeSide extends NamedId implements IRelationTypeSide {
+public class RelationTypeSide extends NamedId implements IRelationType {
private final IRelationType type;
private final RelationSide side;
@@ -31,7 +29,14 @@ public class RelationTypeSide extends NamedId implements IRelationTypeSide {
this.side = side;
}
- @Override
+ public static RelationTypeSide create(RelationSide side, long id, String name) {
+ return new RelationTypeSide(IRelationType.valueOf(id, name), side);
+ }
+
+ public static RelationTypeSide create(IRelationType type, RelationSide side) {
+ return new RelationTypeSide(type, side);
+ }
+
public synchronized RelationTypeSide getOpposite() {
if (opposite == null) {
opposite = new RelationTypeSide(type, side.oppositeSide());
@@ -43,31 +48,21 @@ public class RelationTypeSide extends NamedId implements IRelationTypeSide {
return type;
}
- @Override
public boolean isOfType(IRelationType type) {
return this.type.equals(type);
}
- @Override
public RelationSide getSide() {
return side;
}
@Override
- public boolean equals(Object arg0) {
- if (arg0 instanceof RelationTypeSide) {
- RelationTypeSide arg = (RelationTypeSide) arg0;
- return type.equals(arg.type) && side.equals(arg.side);
+ public boolean equals(Object obj) {
+ if (obj instanceof RelationTypeSide) {
+ RelationTypeSide rel = (RelationTypeSide) obj;
+ return type.equals(rel.type) && side.equals(rel.side);
}
- return false;
- }
-
- @Override
- public int hashCode() {
- int hashCode = 11;
- hashCode = hashCode * 31 + type.hashCode();
- hashCode = hashCode * 31 + side.hashCode();
- return hashCode;
+ return super.equals(obj);
}
@Override
@@ -75,4 +70,7 @@ public class RelationTypeSide extends NamedId implements IRelationTypeSide {
return "RelationTypeSide [type=" + type + ", side=" + side + "]";
}
+ public Long getGuid() {
+ return getId();
+ }
} \ No newline at end of file
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
index c872138a5a..ba7eb51127 100644
--- 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
@@ -13,7 +13,6 @@ package org.eclipse.osee.framework.core.data;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.jdk.core.type.FullyNamedIdentity;
import org.eclipse.osee.framework.jdk.core.type.NamedId;
import org.eclipse.osee.framework.jdk.core.type.NamedIdentity;
@@ -57,10 +56,6 @@ public final class TokenFactory {
return IRelationType.valueOf(id, name);
}
- public static IRelationTypeSide createRelationTypeSide(RelationSide relationSide, long guid, String name) {
- return new RelationTypeSideToken(guid, name, relationSide);
- }
-
public static IAccessContextId createAccessContextId(String guid, String name) {
return new AccessContextIdToken(guid, name);
}
@@ -192,60 +187,6 @@ public final class TokenFactory {
}
}
- private final static class RelationTypeSideToken extends NamedId implements IRelationTypeSide {
-
- private final RelationSide relationSide;
- private RelationTypeSideToken opposite;
-
- private RelationTypeSideToken(Long id, String name, RelationSide relationSide) {
- super(id, name);
- this.relationSide = relationSide;
- }
-
- @Override
- public RelationSide getSide() {
- return relationSide;
- }
-
- @Override
- public boolean isOfType(IRelationType type) {
- return equals(type);
- }
-
- @Override
- public int hashCode() {
- // Do not add relation side to hash code because it will violate the hash code contract
- return super.hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof IRelationTypeSide) {
- IRelationTypeSide otherSide = (IRelationTypeSide) obj;
- if (relationSide != otherSide.getSide()) {
- return false;
- }
- }
- if (obj instanceof IRelationType) {
- return super.equals(obj);
- }
- return false;
- }
-
- @Override
- public synchronized IRelationTypeSide getOpposite() {
- if (opposite == null) {
- opposite = new RelationTypeSideToken(getGuid(), getName(), getSide().oppositeSide());
- }
- return opposite;
- }
-
- @Override
- public String toString() {
- return String.format("RelationTypeSide - uuid=[%s] type=[%s] side=[%s]", getGuid(), getName(), getSide());
- }
- }
-
public static String createArtifactTypeTokenString(IArtifactType artifactType) {
return String.format("[%s]-[%d]", artifactType.getName(), artifactType.getGuid());
}
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 0a7b3d668b..1ebf6a2689 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
@@ -11,76 +11,76 @@
package org.eclipse.osee.framework.core.enums;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_A;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
public final class CoreRelationTypes {
//@formatter:off
- public static final IRelationTypeSide Allocation__Requirement = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000157L, "Allocation");
- public static final IRelationTypeSide Allocation__Component = Allocation__Requirement.getOpposite();
+ public static final RelationTypeSide Allocation__Requirement = RelationTypeSide.create(SIDE_A, 0x2000000000000157L, "Allocation");
+ public static final RelationTypeSide Allocation__Component = Allocation__Requirement.getOpposite();
- public static final IRelationTypeSide CodeRequirement_CodeUnit = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000158L, "Code-Requirement");
- public static final IRelationTypeSide CodeRequirement_Requirement = CodeRequirement_CodeUnit.getOpposite();
+ public static final RelationTypeSide CodeRequirement_CodeUnit = RelationTypeSide.create(SIDE_A, 0x2000000000000158L, "Code-Requirement");
+ public static final RelationTypeSide CodeRequirement_Requirement = CodeRequirement_CodeUnit.getOpposite();
- public static final IRelationTypeSide Default_Hierarchical__Parent = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000154L, "Default Hierarchical");
- public static final IRelationTypeSide Default_Hierarchical__Child = Default_Hierarchical__Parent.getOpposite();
+ public static final RelationTypeSide Default_Hierarchical__Parent = RelationTypeSide.create(SIDE_A, 0x2000000000000154L, "Default Hierarchical");
+ public static final RelationTypeSide Default_Hierarchical__Child = Default_Hierarchical__Parent.getOpposite();
- public static final IRelationTypeSide Dependency__Artifact = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000155L, "Dependency");
- public static final IRelationTypeSide Dependency__Dependency = Dependency__Artifact.getOpposite();
+ public static final RelationTypeSide Dependency__Artifact = RelationTypeSide.create(SIDE_A, 0x2000000000000155L, "Dependency");
+ public static final RelationTypeSide Dependency__Dependency = Dependency__Artifact.getOpposite();
- public static final IRelationTypeSide Design__Requirement = TokenFactory.createRelationTypeSide(SIDE_A, 0x200000000000015AL, "Design");
- public static final IRelationTypeSide Design__Design = Design__Requirement.getOpposite();
+ public static final RelationTypeSide Design__Requirement = RelationTypeSide.create(SIDE_A, 0x200000000000015AL, "Design");
+ public static final RelationTypeSide Design__Design = Design__Requirement.getOpposite();
- public static final IRelationTypeSide Executes__Test_Plan_Element = TokenFactory.createRelationTypeSide(SIDE_A, 0x200000000000015EL, "Executes");
- public static final IRelationTypeSide Executes__Test_Procedure = Executes__Test_Plan_Element.getOpposite();
+ public static final RelationTypeSide Executes__Test_Plan_Element = RelationTypeSide.create(SIDE_A, 0x200000000000015EL, "Executes");
+ public static final RelationTypeSide Executes__Test_Procedure = Executes__Test_Plan_Element.getOpposite();
- public static final IRelationTypeSide Related_Feature__Feature = TokenFactory.createRelationTypeSide(SIDE_A, 0x0000000000000058L, "Related Feature");
- public static final IRelationTypeSide Related_Feature__Requirement = Related_Feature__Feature.getOpposite();
+ public static final RelationTypeSide Related_Feature__Feature = RelationTypeSide.create(SIDE_A, 0x0000000000000058L, "Related Feature");
+ public static final RelationTypeSide Related_Feature__Requirement = Related_Feature__Feature.getOpposite();
- public static final IRelationTypeSide Requirement_Trace__Higher_Level = TokenFactory.createRelationTypeSide(SIDE_A, 0x200000000000015FL, "Requirement Trace");
- public static final IRelationTypeSide Requirement_Trace__Lower_Level = Requirement_Trace__Higher_Level.getOpposite();
+ public static final RelationTypeSide Requirement_Trace__Higher_Level = RelationTypeSide.create(SIDE_A, 0x200000000000015FL, "Requirement Trace");
+ public static final RelationTypeSide Requirement_Trace__Lower_Level = Requirement_Trace__Higher_Level.getOpposite();
- public static final IRelationTypeSide Safety__Safety_Assessment = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000180L, "Safety Assessment");
- public static final IRelationTypeSide Safety__System_Function = Safety__Safety_Assessment.getOpposite();
+ public static final RelationTypeSide Safety__Safety_Assessment = RelationTypeSide.create(SIDE_A, 0x2000000000000180L, "Safety Assessment");
+ public static final RelationTypeSide Safety__System_Function = Safety__Safety_Assessment.getOpposite();
- public static final IRelationTypeSide Supercedes_Supercedes = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000165L, "Supercedes");
- public static final IRelationTypeSide Supercedes_Superceded = Supercedes_Supercedes.getOpposite();
+ public static final RelationTypeSide Supercedes_Supercedes = RelationTypeSide.create(SIDE_A, 0x2000000000000165L, "Supercedes");
+ public static final RelationTypeSide Supercedes_Superceded = Supercedes_Supercedes.getOpposite();
- public static final IRelationTypeSide SupportingInfo_SupportedBy = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000166L, "Supporting Info");
- public static final IRelationTypeSide SupportingInfo_SupportingInfo = SupportingInfo_SupportedBy.getOpposite();
+ public static final RelationTypeSide SupportingInfo_SupportedBy = RelationTypeSide.create(SIDE_A, 0x2000000000000166L, "Supporting Info");
+ public static final RelationTypeSide SupportingInfo_SupportingInfo = SupportingInfo_SupportedBy.getOpposite();
- public static final IRelationTypeSide SupportingRequirement__Higher_Level = TokenFactory.createRelationTypeSide(SIDE_A, 0x200000000000017CL, "Supporting Requirement");
- public static final IRelationTypeSide SupportingRequirement__Lower_Level = SupportingRequirement__Higher_Level.getOpposite();
+ public static final RelationTypeSide SupportingRequirement__Higher_Level = RelationTypeSide.create(SIDE_A, 0x200000000000017CL, "Supporting Requirement");
+ public static final RelationTypeSide SupportingRequirement__Lower_Level = SupportingRequirement__Higher_Level.getOpposite();
- public static final IRelationTypeSide TeamMember_Team = TokenFactory.createRelationTypeSide(SIDE_A, 0x200000000000016AL, "TeamMember");
- public static final IRelationTypeSide TeamMember_Member = TeamMember_Team.getOpposite();
+ public static final RelationTypeSide TeamMember_Team = RelationTypeSide.create(SIDE_A, 0x200000000000016AL, "TeamMember");
+ public static final RelationTypeSide TeamMember_Member = TeamMember_Team.getOpposite();
- public static final IRelationTypeSide Test_Unit_Result__Test_Unit = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000168L, "Results Data");
- public static final IRelationTypeSide Test_Unit_Result__Test_Result = Test_Unit_Result__Test_Unit.getOpposite();
+ public static final RelationTypeSide Test_Unit_Result__Test_Unit = RelationTypeSide.create(SIDE_A, 0x2000000000000168L, "Results Data");
+ public static final RelationTypeSide Test_Unit_Result__Test_Result = Test_Unit_Result__Test_Unit.getOpposite();
- public static final IRelationTypeSide Universal_Grouping__Group = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000156L, "Universal Grouping");
- public static final IRelationTypeSide Universal_Grouping__Members = Universal_Grouping__Group.getOpposite();
+ public static final RelationTypeSide Universal_Grouping__Group = RelationTypeSide.create(SIDE_A, 0x2000000000000156L, "Universal Grouping");
+ public static final RelationTypeSide Universal_Grouping__Members = Universal_Grouping__Group.getOpposite();
- public static final IRelationTypeSide User_Grouping__Group = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000163L, "User Grouping");
- public static final IRelationTypeSide User_Grouping__Members = User_Grouping__Group.getOpposite();
+ public static final RelationTypeSide User_Grouping__Group = RelationTypeSide.create(SIDE_A, 0x2000000000000163L, "User Grouping");
+ public static final RelationTypeSide User_Grouping__Members = User_Grouping__Group.getOpposite();
- public static final IRelationTypeSide Users_Artifact = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000164L, "Users");
- public static final IRelationTypeSide Users_User = Users_Artifact.getOpposite();
+ public static final RelationTypeSide Users_Artifact = RelationTypeSide.create(SIDE_A, 0x2000000000000164L, "Users");
+ public static final RelationTypeSide Users_User = Users_Artifact.getOpposite();
- public static final IRelationTypeSide Uses__Requirement = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000177L, "Uses");
- public static final IRelationTypeSide Uses__TestUnit = Uses__Requirement.getOpposite();
+ public static final RelationTypeSide Uses__Requirement = RelationTypeSide.create(SIDE_A, 0x2000000000000177L, "Uses");
+ public static final RelationTypeSide Uses__TestUnit = Uses__Requirement.getOpposite();
- public static final IRelationTypeSide Validation__Requirement = TokenFactory.createRelationTypeSide(SIDE_A, 0x2000000000000160L, "Validation");
- public static final IRelationTypeSide Validation__Validator = Validation__Requirement.getOpposite();
+ public static final RelationTypeSide Validation__Requirement = RelationTypeSide.create(SIDE_A, 0x2000000000000160L, "Validation");
+ public static final RelationTypeSide Validation__Validator = Validation__Requirement.getOpposite();
- public static final IRelationTypeSide Verification__Requirement = TokenFactory.createRelationTypeSide(SIDE_A, 0x200000000000015BL, "Verification");
- public static final IRelationTypeSide Verification__Verifier = Verification__Requirement.getOpposite();
+ public static final RelationTypeSide Verification__Requirement = RelationTypeSide.create(SIDE_A, 0x200000000000015BL, "Verification");
+ public static final RelationTypeSide Verification__Verifier = Verification__Requirement.getOpposite();
- public static final IRelationTypeSide Verification_Plan__Requirement = TokenFactory.createRelationTypeSide(SIDE_A, 0x200000000000015CL, "Verification Plan");
- public static final IRelationTypeSide Verification_Plan__Test_Plan_Element = Verification_Plan__Requirement.getOpposite();
+ public static final RelationTypeSide Verification_Plan__Requirement = RelationTypeSide.create(SIDE_A, 0x200000000000015CL, "Verification Plan");
+ public static final RelationTypeSide Verification_Plan__Test_Plan_Element = Verification_Plan__Requirement.getOpposite();
//@formatter:on
private CoreRelationTypes() {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteriaTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteriaTest.java
index 3b8b49017f..acc89e2290 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteriaTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/search/RelationCriteriaTest.java
@@ -16,7 +16,7 @@ import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -41,7 +41,7 @@ public class RelationCriteriaTest {
ArtifactId artifact = ArtifactId.valueOf(4);
criteria = new RelationCriteria(artifact, CoreRelationTypes.Allocation__Component, RelationSide.SIDE_A);
criteria.addToQueryBuilder(builder);
- ArgumentCaptor<IRelationTypeSide> rtsCaptor = ArgumentCaptor.forClass(IRelationTypeSide.class);
+ ArgumentCaptor<RelationTypeSide> rtsCaptor = ArgumentCaptor.forClass(RelationTypeSide.class);
verify(builder).andRelatedTo(rtsCaptor.capture(), eq(artifact));
Assert.assertEquals(CoreRelationTypes.Allocation__Component.getGuid(), rtsCaptor.getValue().getGuid());
Assert.assertEquals(RelationSide.SIDE_A, rtsCaptor.getValue().getSide());
@@ -58,7 +58,7 @@ public class RelationCriteriaTest {
ArtifactId artifact = ArtifactId.valueOf(4);
criteria = new RelationCriteria(artifact, CoreRelationTypes.Allocation__Component, RelationSide.SIDE_A);
criteria.addToQueryBuilder(builder);
- ArgumentCaptor<IRelationTypeSide> rtsCaptor = ArgumentCaptor.forClass(IRelationTypeSide.class);
+ ArgumentCaptor<RelationTypeSide> rtsCaptor = ArgumentCaptor.forClass(RelationTypeSide.class);
verify(builder).andRelatedTo(rtsCaptor.capture(), eq(artifact));
Assert.assertEquals(CoreRelationTypes.Allocation__Component.getGuid(), rtsCaptor.getValue().getGuid());
Assert.assertEquals(RelationSide.SIDE_A, rtsCaptor.getValue().getSide());
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockIArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockIArtifact.java
index f24ee1345a..37a8b5a32f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockIArtifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/mocks/MockIArtifact.java
@@ -14,7 +14,7 @@ import java.util.Collections;
import java.util.List;
import org.eclipse.osee.framework.core.data.ArtifactTypeId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.jdk.core.type.NamedIdentity;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java
index f197dcbbb9..cf842a849d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java
@@ -27,6 +27,7 @@ import java.util.Random;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IRelationType;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -34,7 +35,6 @@ import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.cache.RelationTypeCache;
import org.eclipse.osee.framework.core.model.event.DefaultBasicUuidRelationReorder;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/AccessPolicy.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/AccessPolicy.java
index 5a31fa623b..3edc3f748f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/AccessPolicy.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/AccessPolicy.java
@@ -15,7 +15,7 @@ import java.util.logging.Level;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
import org.eclipse.osee.framework.core.model.access.PermissionStatus;
@@ -36,6 +36,6 @@ public interface AccessPolicy {
PermissionStatus hasArtifactPermission(Collection<? extends IBasicArtifact<?>> artifacts, PermissionEnum permission, Level level) throws OseeCoreException;
- PermissionStatus canRelationBeModified(IBasicArtifact<?> subject, Collection<? extends IBasicArtifact<?>> toBeRelated, IRelationTypeSide relationTypeSide, Level level) throws OseeCoreException;
+ PermissionStatus canRelationBeModified(IBasicArtifact<?> subject, Collection<? extends IBasicArtifact<?>> toBeRelated, RelationTypeSide relationTypeSide, Level level) 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 44c0c6a90b..0d35eb1b48 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
@@ -33,7 +33,7 @@ import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TransactionToken;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -49,7 +49,6 @@ import org.eclipse.osee.framework.core.exception.AttributeDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
import org.eclipse.osee.framework.core.exception.MultipleAttributesExist;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact;
import org.eclipse.osee.framework.core.model.event.DefaultBasicUuidRelationReorder;
@@ -150,23 +149,19 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
}
@Override
- public final List<? extends IArtifact> getRelatedArtifacts(RelationTypeSide relationTypeSide) throws OseeCoreException {
+ public final List<Artifact> getRelatedArtifacts(RelationTypeSide relationTypeSide) throws OseeCoreException {
return RelationManager.getRelatedArtifacts(this, relationTypeSide);
}
- public final List<Artifact> getRelatedArtifactsUnSorted(IRelationTypeSide relationEnum) throws OseeCoreException {
+ public final List<Artifact> getRelatedArtifactsUnSorted(RelationTypeSide relationEnum) throws OseeCoreException {
return RelationManager.getRelatedArtifactsUnSorted(this, relationEnum);
}
- public final List<Artifact> getRelatedArtifacts(IRelationTypeSide relationEnum) throws OseeCoreException {
- return RelationManager.getRelatedArtifacts(this, relationEnum);
- }
-
- public final List<Artifact> getRelatedArtifacts(IRelationTypeSide relationEnum, DeletionFlag deletionFlag) throws OseeCoreException {
+ public final List<Artifact> getRelatedArtifacts(RelationTypeSide relationEnum, DeletionFlag deletionFlag) throws OseeCoreException {
return RelationManager.getRelatedArtifacts(this, relationEnum, deletionFlag);
}
- public final String getRelationRationale(Artifact artifact, IRelationTypeSide relationTypeSide) throws OseeCoreException {
+ public final String getRelationRationale(Artifact artifact, RelationTypeSide relationTypeSide) throws OseeCoreException {
if (artifact.isHistorical()) {
throw new OseeCoreException("Artifact [%s] is historical. Historical relations are only supported on server",
artifact);
@@ -176,13 +171,13 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
return link.getRationale();
}
- public final void setRelationRationale(Artifact artifact, IRelationTypeSide relationTypeSide, String rationale) throws OseeCoreException {
+ public final void setRelationRationale(Artifact artifact, RelationTypeSide 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, IRelationTypeSide relationSide) {
+ private Pair<Artifact, Artifact> determineArtifactSides(Artifact artifact, RelationTypeSide relationSide) {
boolean sideA = relationSide.getSide().isSideA();
Artifact artifactA = sideA ? artifact : this;
Artifact artifactB = sideA ? this : artifact;
@@ -192,7 +187,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
/**
* Check if artifacts are related to each other by relation type
*/
- public final boolean isRelated(IRelationTypeSide relationEnum, Artifact other) throws OseeCoreException {
+ public final boolean isRelated(RelationTypeSide relationEnum, Artifact other) throws OseeCoreException {
List<Artifact> relatedArtifacts = getRelatedArtifacts(relationEnum);
return relatedArtifacts.contains(other);
}
@@ -200,24 +195,24 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
/**
* Get the exactly one artifact related to this artifact by a relation of type relationType
*/
- public final Artifact getRelatedArtifact(IRelationTypeSide relationEnum) throws OseeCoreException {
+ public final Artifact getRelatedArtifact(RelationTypeSide relationEnum) throws OseeCoreException {
return RelationManager.getRelatedArtifact(this, relationEnum);
}
- public final int getRelatedArtifactsCount(IRelationTypeSide relationEnum) throws OseeCoreException {
+ public final int getRelatedArtifactsCount(RelationTypeSide relationEnum) throws OseeCoreException {
return RelationManager.getRelatedArtifactsCount(this, relationEnum, relationEnum.getSide());
}
- public final <A extends Artifact> List<A> getRelatedArtifactsUnSorted(IRelationTypeSide side, Class<A> clazz) throws OseeCoreException {
+ public final <A extends Artifact> List<A> getRelatedArtifactsUnSorted(RelationTypeSide side, Class<A> clazz) throws OseeCoreException {
return Collections.castAll(getRelatedArtifactsUnSorted(side));
}
- public final <A extends Artifact> List<A> getRelatedArtifacts(IRelationTypeSide side, Class<A> clazz) throws OseeCoreException {
+ public final <A extends Artifact> List<A> getRelatedArtifacts(RelationTypeSide side, Class<A> clazz) throws OseeCoreException {
return Collections.castAll(getRelatedArtifacts(side));
}
@SuppressWarnings("unchecked")
- public final <A extends Artifact> List<A> getRelatedArtifactsOfType(IRelationTypeSide side, Class<A> clazz) throws OseeCoreException {
+ public final <A extends Artifact> List<A> getRelatedArtifactsOfType(RelationTypeSide side, Class<A> clazz) throws OseeCoreException {
List<A> objs = new ArrayList<>();
for (Artifact art : getRelatedArtifacts(side)) {
if (clazz.isInstance(art)) {
@@ -1267,20 +1262,20 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
linksLoaded = loaded;
}
- public final void addRelation(RelationSorter sorterId, IRelationTypeSide relationTypeSide, Artifact artifact, String rationale) throws OseeCoreException {
+ public final void addRelation(RelationSorter sorterId, RelationTypeSide 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(IRelationTypeSide relationSide, Artifact artifact) throws OseeCoreException {
+ public final void addRelation(RelationTypeSide relationSide, Artifact artifact) throws OseeCoreException {
addRelation(PREEXISTING, relationSide, artifact, null);
}
- public final void addRelation(RelationSorter sorterId, IRelationTypeSide relationSide, Artifact artifact) throws OseeCoreException {
+ public final void addRelation(RelationSorter sorterId, RelationTypeSide relationSide, Artifact artifact) throws OseeCoreException {
addRelation(sorterId, relationSide, artifact, null);
}
- public final void addRelation(RelationSorter sorterId, IRelationTypeSide relationEnumeration, Artifact targetArtifact, boolean insertAfterTarget, Artifact itemToAdd, String rationale) throws OseeCoreException {
+ public final void addRelation(RelationSorter sorterId, RelationTypeSide 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;
@@ -1289,11 +1284,11 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
setRelationOrder(relationEnumeration, targetArtifact, insertAfterTarget, itemToAdd);
}
- public final void setRelationOrder(IRelationTypeSide relationSide, List<Artifact> artifactsInNewOrder) throws OseeCoreException {
+ public final void setRelationOrder(RelationTypeSide relationSide, List<? extends Artifact> artifactsInNewOrder) throws OseeCoreException {
RelationManager.setRelationOrder(this, relationSide, relationSide.getSide(), USER_DEFINED, artifactsInNewOrder);
}
- public final void setRelationOrder(IRelationTypeSide relationEnumeration, RelationSorter orderId) throws OseeCoreException {
+ public final void setRelationOrder(RelationTypeSide relationEnumeration, RelationSorter orderId) throws OseeCoreException {
if (USER_DEFINED == orderId) {
setRelationOrder(relationEnumeration, getRelatedArtifacts(relationEnumeration));
} else {
@@ -1302,7 +1297,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
}
}
- public final void setRelationOrder(IRelationTypeSide relationEnumeration, Artifact targetArtifact, boolean insertAfterTarget, Artifact itemToAdd) throws OseeCoreException {
+ public final void setRelationOrder(RelationTypeSide 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)) {
@@ -1322,13 +1317,13 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
currentOrder);
}
- public final void deleteRelation(IRelationTypeSide relationTypeSide, Artifact artifact) throws OseeCoreException {
+ public final void deleteRelation(RelationTypeSide relationTypeSide, Artifact artifact) throws OseeCoreException {
Pair<Artifact, Artifact> sides = determineArtifactSides(artifact, relationTypeSide);
ArtifactPersistenceManager.performDeleteRelationChecks(artifact, relationTypeSide);
RelationManager.deleteRelation(relationTypeSide, sides.getFirst(), sides.getSecond());
}
- public final void deleteRelations(IRelationTypeSide relationSide) throws OseeCoreException {
+ public final void deleteRelations(RelationTypeSide relationSide) throws OseeCoreException {
for (Artifact art : getRelatedArtifacts(relationSide)) {
ArtifactPersistenceManager.performDeleteRelationChecks(art, relationSide);
deleteRelation(relationSide, art);
@@ -1338,7 +1333,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
/**
* Creates new relations that don't already exist and removes relations to artifacts that are not in collection
*/
- public final void setRelations(RelationSorter sorterId, IRelationTypeSide relationSide, Collection<? extends Artifact> artifacts) throws OseeCoreException {
+ public final void setRelations(RelationSorter sorterId, RelationTypeSide relationSide, Collection<? extends Artifact> artifacts) throws OseeCoreException {
Collection<Artifact> currentlyRelated = getRelatedArtifacts(relationSide, Artifact.class);
// Remove relations that have been removed
for (Artifact artifact : currentlyRelated) {
@@ -1357,7 +1352,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
/**
* Creates new relations that don't already exist and removes relations to artifacts that are not in collection
*/
- public final void setRelations(IRelationTypeSide relationSide, Collection<? extends Artifact> artifacts) throws OseeCoreException {
+ public final void setRelations(RelationTypeSide relationSide, Collection<? extends Artifact> artifacts) throws OseeCoreException {
setRelations(PREEXISTING, relationSide, artifacts);
}
@@ -1392,7 +1387,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
* 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<IRelationTypeSide> links) {
+ public final String isRelationsAndArtifactsDirty(Set<RelationTypeSide> links) {
try {
if (hasDirtyAttributes()) {
@@ -1404,7 +1399,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
return "Artifact isDirty == true??";
}
// Loop through all relations
- for (IRelationTypeSide side : links) {
+ for (RelationTypeSide side : links) {
for (Artifact art : getRelatedArtifacts(side)) {
// Check artifact dirty
if (art.hasDirtyAttributes()) {
@@ -1625,7 +1620,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
return relations;
}
- public final List<RelationLink> getRelations(IRelationTypeSide relationEnum) throws OseeCoreException {
+ public final List<RelationLink> getRelations(RelationTypeSide relationEnum) throws OseeCoreException {
return RelationManager.getRelations(this, relationEnum, relationEnum.getSide());
}
@@ -1633,7 +1628,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
* Return relations that exist between artifacts of type side
*/
@Deprecated
- public final ArrayList<RelationLink> getRelations(IRelationTypeSide side, Artifact artifact) throws OseeCoreException {
+ public final ArrayList<RelationLink> getRelations(RelationTypeSide side, Artifact artifact) throws OseeCoreException {
ArrayList<RelationLink> relations = new ArrayList<>();
for (RelationLink relation : getRelations(side)) {
try {
@@ -1727,7 +1722,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
return types;
}
- public Artifact getRelatedArtifactOrNull(IRelationTypeSide relationSide) {
+ public Artifact getRelatedArtifactOrNull(RelationTypeSide relationSide) {
Artifact artifact = null;
try {
artifact = getRelatedArtifact(relationSide);
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 ac23ab6834..4ef6f5fdfc 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 org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -54,7 +54,7 @@ public class InRelationSearch implements ISearchPrimitive {
builder.andExists(relationType);
} else {
RelationSide side = sideA.booleanValue() ? RelationSide.SIDE_A : RelationSide.SIDE_B;
- IRelationTypeSide rts = TokenFactory.createRelationTypeSide(side, relationType.getId(), "SearchRelTypeSide");
+ RelationTypeSide rts = RelationTypeSide.create(side, relationType.getId(), "SearchRelTypeSide");
builder.andExists(rts);
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/NotInRelationSearch.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/NotInRelationSearch.java
index 76016c6ef6..ff1229fd69 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/NotInRelationSearch.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/NotInRelationSearch.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.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -54,7 +54,7 @@ public class NotInRelationSearch implements ISearchPrimitive {
builder.andNotExists(relationType);
} else {
RelationSide side = sideA.booleanValue() ? RelationSide.SIDE_A : RelationSide.SIDE_B;
- IRelationTypeSide rts = TokenFactory.createRelationTypeSide(side, relationType.getId(), "SearchRelTypeSide");
+ RelationTypeSide rts = RelationTypeSide.create(side, relationType.getId(), "SearchRelTypeSide");
builder.andNotExists(rts);
}
}
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 1894d52814..257f1bd466 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
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.artifact.search;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -32,7 +32,7 @@ public class RelationCriteria implements ArtifactSearchCriteria {
*
* @param relationEnum the side to start following the link from
*/
- public RelationCriteria(IRelationTypeSide relationEnum) {
+ public RelationCriteria(RelationTypeSide relationEnum) {
this(relationEnum, relationEnum.getSide());
}
@@ -53,14 +53,14 @@ public class RelationCriteria implements ArtifactSearchCriteria {
@Override
public void addToQueryBuilder(QueryBuilder builder) throws OseeCoreException {
if (artifactId.isValid()) {
- IRelationTypeSide rts =
- TokenFactory.createRelationTypeSide(relationSide, relationType.getId(), Strings.EMPTY_STRING);
+ RelationTypeSide rts =
+ RelationTypeSide.create(relationSide, relationType.getId(), Strings.EMPTY_STRING);
builder.andRelatedTo(rts, artifactId);
} else if (relationSide == null) {
builder.andExists(relationType);
} else {
- IRelationTypeSide rts =
- TokenFactory.createRelationTypeSide(relationSide, relationType.getId(), "SearchRelationTypeSide");
+ RelationTypeSide rts =
+ RelationTypeSide.create(relationSide, relationType.getId(), "SearchRelationTypeSide");
builder.andExists(rts);
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/AccessPolicyImpl.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/AccessPolicyImpl.java
index a37685fa92..f53d446044 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/AccessPolicyImpl.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/AccessPolicyImpl.java
@@ -17,11 +17,11 @@ import org.eclipse.osee.framework.core.client.OseeClientProperties;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.access.AccessDataQuery;
import org.eclipse.osee.framework.core.model.access.PermissionStatus;
import org.eclipse.osee.framework.core.services.IAccessControlService;
@@ -183,7 +183,7 @@ public class AccessPolicyImpl implements AccessPolicy {
}
@Override
- public PermissionStatus canRelationBeModified(IBasicArtifact<?> subject, Collection<? extends IBasicArtifact<?>> toBeRelated, IRelationTypeSide relationTypeSide, Level level) throws OseeCoreException {
+ public PermissionStatus canRelationBeModified(IBasicArtifact<?> subject, Collection<? extends IBasicArtifact<?>> toBeRelated, RelationTypeSide relationTypeSide, Level level) throws OseeCoreException {
PermissionStatus subjectPermission = canRelationBeModifiedHelper(subject, null, relationTypeSide, level);
if (subjectPermission.matched() && toBeRelated != null && !toBeRelated.isEmpty()) {
for (IBasicArtifact<?> art : toBeRelated) {
@@ -198,7 +198,7 @@ public class AccessPolicyImpl implements AccessPolicy {
return subjectPermission;
}
- private PermissionStatus canRelationBeModifiedHelper(IBasicArtifact<?> subject, Collection<? extends IBasicArtifact<?>> toBeRelated, IRelationTypeSide relationTypeSide, Level level) throws OseeCoreException {
+ private PermissionStatus canRelationBeModifiedHelper(IBasicArtifact<?> subject, Collection<? extends IBasicArtifact<?>> toBeRelated, RelationTypeSide relationTypeSide, Level level) throws OseeCoreException {
PermissionStatus status = hasArtifactRelationPermission(java.util.Collections.singleton(subject),
java.util.Collections.singleton(relationTypeSide), PermissionEnum.WRITE, level);
@@ -213,7 +213,7 @@ public class AccessPolicyImpl implements AccessPolicy {
return status;
}
- private PermissionStatus hasArtifactRelationPermission(Collection<? extends IBasicArtifact<?>> artifacts, Collection<? extends IRelationTypeSide> relationTypeSides, PermissionEnum permission, Level level) throws OseeCoreException {
+ private PermissionStatus hasArtifactRelationPermission(Collection<? extends IBasicArtifact<?>> artifacts, Collection<? extends RelationTypeSide> relationTypeSides, PermissionEnum permission, Level level) throws OseeCoreException {
AccessDataQuery query = getAccessService().getAccessData(getCurrentUser(), artifacts);
PermissionStatus permissionStatus = null;
@@ -222,7 +222,7 @@ public class AccessPolicyImpl implements AccessPolicy {
if (!OseeClientProperties.isInDbInit()) {
permissionStatus = new PermissionStatus();
for (IBasicArtifact<?> artifact : artifacts) {
- for (IRelationTypeSide relationTypeSide : relationTypeSides) {
+ for (RelationTypeSide relationTypeSide : relationTypeSides) {
query.relationTypeMatches(permission, artifact, relationTypeSide, permissionStatus);
}
}
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 26bff43426..094a84e03c 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
@@ -26,7 +26,7 @@ import java.util.logging.Level;
import org.eclipse.osee.framework.core.data.ApplicabilityId;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -168,11 +168,11 @@ public class RelationManager {
return ret;
}
- public static Set<Artifact> getRelatedArtifacts(Collection<? extends Artifact> artifacts, int depth, IRelationTypeSide... relationEnums) throws OseeCoreException {
+ public static Set<Artifact> getRelatedArtifacts(Collection<? extends Artifact> artifacts, int depth, RelationTypeSide... relationEnums) throws OseeCoreException {
return getRelatedArtifacts(artifacts, depth, EXCLUDE_DELETED, relationEnums);
}
- public static Set<Artifact> getRelatedArtifacts(Collection<? extends Artifact> artifacts, int depth, DeletionFlag allowDeleted, IRelationTypeSide... relationEnums) throws OseeCoreException {
+ public static Set<Artifact> getRelatedArtifacts(Collection<? extends Artifact> artifacts, int depth, DeletionFlag allowDeleted, RelationTypeSide... relationEnums) throws OseeCoreException {
findHistoricalArtifacts(artifacts);
Set<Artifact> relatedArtifacts = new HashSet<>(artifacts.size() * 8);
@@ -201,7 +201,7 @@ public class RelationManager {
}
relatedArtIds.addAll(getRelatedArtifactIds(selectedRelations, RelationSide.SIDE_B, allowDeleted));
} else {
- for (IRelationTypeSide relationEnum : relationEnums) {
+ for (RelationTypeSide relationEnum : relationEnums) {
Collection<RelationLink> links = relationCache.getAllByType(artifact, relationEnum);
if (links != null) {
for (RelationLink rel : links) {
@@ -239,7 +239,7 @@ public class RelationManager {
}
}
- public static List<Artifact> getRelatedArtifacts(Artifact artifact, IRelationTypeSide relationType, DeletionFlag deletionFlag) throws OseeCoreException {
+ public static List<Artifact> getRelatedArtifacts(Artifact artifact, RelationTypeSide relationType, DeletionFlag deletionFlag) throws OseeCoreException {
List<Artifact> artifacts = getRelatedArtifacts(artifact, relationType, relationType.getSide());
Collection<Integer> artIds = new ArrayList<>();
@@ -270,11 +270,11 @@ public class RelationManager {
return artifacts;
}
- public static List<Artifact> getRelatedArtifactsUnSorted(Artifact artifact, IRelationTypeSide relationEnum) throws OseeCoreException {
+ public static List<Artifact> getRelatedArtifactsUnSorted(Artifact artifact, RelationTypeSide relationEnum) throws OseeCoreException {
return getRelatedArtifactsUnSorted(artifact, relationEnum, relationEnum.getSide());
}
- public static List<Artifact> getRelatedArtifacts(Artifact artifact, IRelationTypeSide relationEnum) throws OseeCoreException {
+ public static List<Artifact> getRelatedArtifacts(Artifact artifact, RelationTypeSide relationEnum) throws OseeCoreException {
return getRelatedArtifacts(artifact, relationEnum, relationEnum.getSide());
}
@@ -294,11 +294,11 @@ public class RelationManager {
return artifacts.get(0);
}
- public static Artifact getRelatedArtifact(Artifact artifact, IRelationTypeSide relationEnum) throws OseeCoreException {
+ public static Artifact getRelatedArtifact(Artifact artifact, RelationTypeSide relationEnum) throws OseeCoreException {
return getRelatedArtifact(artifact, relationEnum, relationEnum.getSide());
}
- public static int getRelatedArtifactsCount(Artifact artifact, IRelationTypeSide relationTypeEnum) throws OseeCoreException {
+ public static int getRelatedArtifactsCount(Artifact artifact, RelationTypeSide relationTypeEnum) throws OseeCoreException {
return getRelatedArtifactsCount(artifact, relationTypeEnum, relationTypeEnum.getSide());
}
@@ -563,7 +563,7 @@ public class RelationManager {
return relationOrderFactory.createRelationOrderData(artifact);
}
- public static void setRelationOrder(IArtifact artifact, IRelationType relationType, RelationSide side, RelationSorter orderId, List<Artifact> relatives) throws OseeCoreException {
+ public static void setRelationOrder(IArtifact artifact, IRelationType relationType, RelationSide side, RelationSorter orderId, List<? extends Artifact> relatives) throws OseeCoreException {
RelationTypeSideSorter sorter = createTypeSideSorter(artifact, relationType, side);
sorter.setOrder(relatives, orderId);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java
index 24cbcdc795..78ecef20e0 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java
@@ -15,9 +15,9 @@ import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING;
import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.Collections;
import java.util.List;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationSorter;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
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 db3866328d..f5607bfd2e 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
@@ -15,11 +15,11 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationSorter;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.Pair;
@@ -64,7 +64,7 @@ public class RelationOrderMergeUtility {
return rts;
}
- private static List<String> mergeTypeSideOrder(Artifact left, Artifact right, IRelationTypeSide rts) throws OseeCoreException {
+ private static List<String> mergeTypeSideOrder(Artifact left, Artifact right, RelationTypeSide rts) throws OseeCoreException {
RelationOrderMerger<String> merger = new RelationOrderMerger<>();
List<String> leftRelatives = getGuidList(left.getRelatedArtifacts(rts, DeletionFlag.EXCLUDE_DELETED));
List<String> rightRelatives = getGuidList(right.getRelatedArtifacts(rts, DeletionFlag.EXCLUDE_DELETED));
@@ -73,7 +73,7 @@ public class RelationOrderMergeUtility {
return merger.computeMergedOrder(leftRelatives, rightRelatives, mergedSet);
}
- private static Collection<String> getMergedSet(Artifact left, Artifact right, IRelationTypeSide relationTypeSide) throws OseeCoreException {
+ private static Collection<String> getMergedSet(Artifact left, Artifact right, RelationTypeSide relationTypeSide) throws OseeCoreException {
Collection<String> mergedSet = new HashSet<>();
Collection<String> deleted = new HashSet<>();
List<String> leftRelatives =
@@ -98,7 +98,7 @@ public class RelationOrderMergeUtility {
return toReturn;
}
- private static Collection<String> getDeleted(Artifact art, IRelationTypeSide relationType) throws OseeCoreException {
+ private static Collection<String> getDeleted(Artifact art, RelationTypeSide relationType) throws OseeCoreException {
Collection<String> toReturn = new HashSet<>();
for (RelationLink link : art.getRelationsAll(DeletionFlag.INCLUDE_DELETED)) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
index 84420db7e9..26324f7a1c 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
@@ -26,14 +26,13 @@ import java.util.Set;
import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.TokenFactory;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.model.access.PermissionStatus;
import org.eclipse.osee.framework.core.model.type.RelationType;
@@ -269,8 +268,7 @@ public final class SkynetTransaction extends TransactionOperation<BranchId> {
RelationSide sideToCheck = link.getOppositeSide(art);
int limitToCheck = sideToCheck.isSideA() ? multiplicity.getSideALimit() : multiplicity.getSideBLimit();
if (limitToCheck == 1) {
- int count = art.getRelatedArtifactsCount(
- TokenFactory.createRelationTypeSide(sideToCheck, relationType.getGuid(), relationType.getName()));
+ int count = art.getRelatedArtifactsCount(RelationTypeSide.create(relationType, sideToCheck));
if (count > 1) {
throw new OseeStateException("Artifact [%s] can only have 1 [%s] on [%s] but has %d", art.getName(),
link.getSideNameFor(art), sideToCheck.name(), count);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/IArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/IArtifact.java
index 824777b8fe..160b3f95df 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/IArtifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/types/IArtifact.java
@@ -11,8 +11,8 @@
package org.eclipse.osee.framework.skynet.core.types;
import java.util.List;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChangeTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChangeTest.java
index 9c21f0c4a9..6a3472d2a2 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChangeTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChangeTest.java
@@ -18,7 +18,7 @@ import java.util.logging.Level;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
import org.eclipse.osee.framework.core.model.IBasicArtifact;
@@ -83,7 +83,7 @@ public class ArtifactPromptChangeTest {
}
@Override
- public PermissionStatus canRelationBeModified(IBasicArtifact<?> subject, Collection<? extends IBasicArtifact<?>> toBeRelated, IRelationTypeSide relationTypeSide, Level level) {
+ public PermissionStatus canRelationBeModified(IBasicArtifact<?> subject, Collection<? extends IBasicArtifact<?>> toBeRelated, RelationTypeSide relationTypeSide, Level level) {
return new PermissionStatus();
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationCellModifier.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationCellModifier.java
index 860305edf7..81c55bd9e3 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationCellModifier.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationCellModifier.java
@@ -14,7 +14,7 @@ import java.util.Arrays;
import java.util.logging.Level;
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java
index f1bdd8d8ad..2c6edf8715 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java
@@ -14,9 +14,9 @@ import java.util.logging.Level;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.access.PermissionStatus;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationSkynetDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationSkynetDragAndDrop.java
index d21eb210c2..0c4194590a 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationSkynetDragAndDrop.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationSkynetDragAndDrop.java
@@ -24,10 +24,10 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
@@ -254,7 +254,7 @@ public final class RelationSkynetDragAndDrop extends SkynetDragAndDrop {
WrapperForRelationLink targetLink = (WrapperForRelationLink) object;
Artifact[] artifactsToMove = ((ArtifactData) event.data).getArtifacts();
for (Artifact artifactToMove : artifactsToMove) {
- IRelationTypeSide typeSide =
+ RelationTypeSide 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/RelationsComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
index e80a0a9db0..930494ddb3 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
@@ -28,9 +28,9 @@ import org.eclipse.jface.viewers.IStructuredSelection;
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.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.PresentationType;
import org.eclipse.osee.framework.core.enums.RelationSorter;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.help.ui.OseeHelpContext;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
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 9e0d169ee1..fbbcebcd4e 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
@@ -16,7 +16,7 @@ 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.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
@@ -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()) {
- IRelationTypeSide relationTypeSide = CoreRelationTypes.Default_Hierarchical__Child;
+ RelationTypeSide relationTypeSide = CoreRelationTypes.Default_Hierarchical__Child;
RelationOrderData data = RelationManager.createRelationOrderData(source);
RelationSorter 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/explorer/menu/ArtifactExplorerMenu.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/ArtifactExplorerMenu.java
index 2787e38eff..15c51b1308 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/ArtifactExplorerMenu.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/ArtifactExplorerMenu.java
@@ -24,7 +24,7 @@ import org.eclipse.jface.window.Window;
import org.eclipse.osee.framework.access.AccessControlManager;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreArtifactTokens;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
@@ -311,7 +311,7 @@ public class ArtifactExplorerMenu {
CoreRelationTypes.Default_Hierarchical__Child);
}
- public static Artifact handleCreateChild(Artifact parent, Collection<? extends IArtifactType> validArtifactTypes, TreeViewer treeViewer, IRelationTypeSide relationTypeSide) {
+ public static Artifact handleCreateChild(Artifact parent, Collection<? extends IArtifactType> validArtifactTypes, TreeViewer treeViewer, RelationTypeSide relationTypeSide) {
FilteredTreeArtifactTypeEntryDialog dialog = getDialog(validArtifactTypes);
if (dialog.open() == Window.OK) {
IArtifactType type = dialog.getSelection();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/CreateRelatedMenuItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/CreateRelatedMenuItem.java
index 69ba477afa..51cff4668d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/CreateRelatedMenuItem.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/menu/CreateRelatedMenuItem.java
@@ -21,12 +21,10 @@ import org.eclipse.jface.window.Window;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.TokenFactory;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.PresentationType;
import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.access.PermissionStatus;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.core.model.type.RelationType;
@@ -82,16 +80,14 @@ public class CreateRelatedMenuItem implements SelectionListener {
ArtifactExplorerLinkNode linkNode = (ArtifactExplorerLinkNode) obj;
Artifact existingArtifact = linkNode.getArtifact();
RelationType relationType = linkNode.getRelationType();
- IRelationTypeSide relationTypeSide = null;
+ RelationTypeSide relationTypeSide = null;
RelationSide relationSide = null;
if (linkNode.isParentIsOnSideA()) {
relationSide = RelationSide.SIDE_B;
- relationTypeSide = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B, relationType.getId(),
- relationType.getSideBName());
+ relationTypeSide = RelationTypeSide.create(relationType, RelationSide.SIDE_B);
} else {
relationSide = RelationSide.SIDE_A;
- relationTypeSide = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, relationType.getId(),
- relationType.getSideAName());
+ relationTypeSide = RelationTypeSide.create(relationType, RelationSide.SIDE_A);
}
AccessPolicy service = ServiceUtil.getAccessPolicy();
@@ -118,7 +114,7 @@ public class CreateRelatedMenuItem implements SelectionListener {
return;
}
- List<IRelationTypeSide> validRelationTypes = new LinkedList<>();
+ List<RelationTypeSide> validRelationTypes = new LinkedList<>();
for (RelationType relType : RelationTypeManager.getValidTypes(parentArt.getBranch())) {
if (relType.isArtifactTypeAllowed(RelationSide.SIDE_A, parentArt.getArtifactType())) {
validRelationTypes.add(new RelationTypeSide(relType, RelationSide.SIDE_B));
@@ -135,7 +131,7 @@ public class CreateRelatedMenuItem implements SelectionListener {
validRelationTypes, new RelationTypeSideLabelProvider());
int result = dialog.open();
if (result == 0) {
- IRelationTypeSide relationType = dialog.getSelectedFirst();
+ RelationTypeSide relationType = dialog.getSelectedFirst();
if (relationType != null) {
List<ArtifactType> validArtifactTypes = new LinkedList<>();
for (ArtifactType artifactType : getArtifactTypesFromRelationType(relationType,
@@ -156,7 +152,7 @@ public class CreateRelatedMenuItem implements SelectionListener {
}
- private void handleCreateRelated(Artifact existingArtifact, RelationType relationType, IRelationTypeSide relationTypeSide, RelationSide relationSide) {
+ private void handleCreateRelated(Artifact existingArtifact, RelationType relationType, RelationTypeSide relationTypeSide, RelationSide relationSide) {
// get valid artifact types for this relation
List<IArtifactType> artifactTypes = new ArrayList<>();
BranchId branch = artifactExplorer.getBranch();
@@ -191,7 +187,7 @@ public class CreateRelatedMenuItem implements SelectionListener {
}
}
- private void createRelatedArtifact(Artifact existingArtifact, IRelationTypeSide relationTypeSide, BranchId branch, IArtifactType type, String name) {
+ private void createRelatedArtifact(Artifact existingArtifact, RelationTypeSide relationTypeSide, BranchId branch, IArtifactType type, String name) {
SkynetTransaction transaction = TransactionManager.createTransaction(branch,
String.format("Created new %s \"%s\" in artifact explorer", type.getName(), name));
Artifact newArtifact = ArtifactTypeManager.addArtifact(type, branch, name);
@@ -215,13 +211,11 @@ public class CreateRelatedMenuItem implements SelectionListener {
ArtifactExplorerLinkNode linkNode = (ArtifactExplorerLinkNode) obj;
Artifact artifact = linkNode.getArtifact();
RelationType relationType = linkNode.getRelationType();
- IRelationTypeSide relationSide = null;
+ RelationTypeSide relationSide = null;
if (linkNode.isParentIsOnSideA()) {
- relationSide = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B, relationType.getId(),
- relationType.getSideBName());
+ relationSide = RelationTypeSide.create(relationType, RelationSide.SIDE_B);
} else {
- relationSide = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, relationType.getId(),
- relationType.getSideAName());
+ relationSide = RelationTypeSide.create(relationType, RelationSide.SIDE_A);
}
GlobalMenuPermissions permiss = new GlobalMenuPermissions(artifact);
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 0a602d25fb..31ddbde3ad 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,7 +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.data.RelationTypeSide;
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;
@@ -28,7 +28,7 @@ public class ArtifactProcessing implements ITemplateTask {
private final List<ITemplateTask> innerTasks;
private boolean outlining;
private boolean recurseChildren;
- private IRelationTypeSide outlineRelation;
+ private RelationTypeSide outlineRelation;
private String headingAttributeName;
private String outlineNumber;
private String cleanedText;
@@ -109,7 +109,7 @@ public class ArtifactProcessing implements ITemplateTask {
return recurseChildren;
}
- public IRelationTypeSide getOutlineRelation() {
+ public RelationTypeSide getOutlineRelation() {
return outlineRelation;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java
index 1988a61840..a454e9934b 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java
@@ -18,7 +18,7 @@ import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java
index 510fd45b5e..011b6ddec3 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java
@@ -14,8 +14,8 @@ package org.eclipse.osee.framework.ui.skynet.skywalker;
import java.util.Collection;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.RelationType;
/**
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java
index a43c5bb930..8607ff7022 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java
@@ -22,9 +22,9 @@ import java.util.logging.Level;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
-import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.AXml;
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImplTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImplTest.java
index ce7dfdaad7..69028465a0 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImplTest.java
@@ -35,7 +35,7 @@ import org.eclipse.osee.framework.core.data.BranchId;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
@@ -325,7 +325,7 @@ public class ArtifactReadOnlyImplTest {
@Test
public void testGetMaximumRelationAllowed() throws OseeCoreException {
- IRelationTypeSide typeAndSide = Default_Hierarchical__Child;
+ RelationTypeSide typeAndSide = Default_Hierarchical__Child;
when(relationManager.getMaximumRelationAllowed(session, DEFAULT_HIERARCHY, proxiedObject, IS_PARENT)).thenReturn(
6);
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java
index 11b8eff9a3..9d8cb6d800 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java
@@ -41,7 +41,7 @@ import java.util.Iterator;
import java.util.List;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -126,7 +126,7 @@ public class RelationManagerImplTest {
@Mock private IRelationType relType1;
@Mock private IRelationType relType2;
- @Mock private IRelationTypeSide typeAndSide1;
+ @Mock private RelationTypeSide typeAndSide1;
@Mock private ResultSet<Relation> rSet1;
@Mock private ResultSet<Relation> rSet2;
@@ -367,7 +367,7 @@ public class RelationManagerImplTest {
verify(resolver).resolve(session, graph, relations, SIDE_A);
- IRelationTypeSide typeSide = TokenFactory.createRelationTypeSide(SIDE_A, TYPE_1.getId(), TYPE_1.getName());
+ RelationTypeSide typeSide = RelationTypeSide.create(TYPE_1, SIDE_A);
verify(orderManager1).sort(typeSide, nodes);
}
@@ -533,7 +533,7 @@ public class RelationManagerImplTest {
manager.relate(session, node1, TYPE_1, node2, LEXICOGRAPHICAL_ASC);
- IRelationTypeSide typeSide = RelationUtil.asTypeSide(TYPE_1, SIDE_B);
+ RelationTypeSide typeSide = RelationUtil.asTypeSide(TYPE_1, SIDE_B);
verify(container1).getRelation(node1, TYPE_1, node2, INCLUDE_DELETED);
verify(container2).getRelation(node1, TYPE_1, node2, INCLUDE_DELETED);
@@ -552,7 +552,7 @@ public class RelationManagerImplTest {
when(orderFactory.createOrderManager(node1)).thenReturn(orderManager1);
- IRelationTypeSide typeSide = RelationUtil.asTypeSide(TYPE_1, SIDE_B);
+ RelationTypeSide typeSide = RelationUtil.asTypeSide(TYPE_1, SIDE_B);
when(orderManager1.getSorterId(typeSide)).thenReturn(UNORDERED);
when(node1.getArtifactType()).thenReturn(artifactType1);
@@ -599,7 +599,7 @@ public class RelationManagerImplTest {
verify(resolver).resolve(session, graph, toOrder, SIDE_B);
- IRelationTypeSide typeSide = RelationUtil.asTypeSide(TYPE_1, SIDE_B);
+ RelationTypeSide typeSide = RelationUtil.asTypeSide(TYPE_1, SIDE_B);
verify(orderManager1).sort(typeSide, nodesToOrder);
verify(orderManager1).setOrder(eq(typeSide), eq(USER_DEFINED), sortedListCaptor.capture());
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManagerTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManagerTest.java
index df7ac40029..d5b9d2063e 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManagerTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManagerTest.java
@@ -27,7 +27,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
@@ -56,9 +56,9 @@ public class OrderManagerTest {
@Mock private OrderAccessor accessor;
@Mock private RelationTypes relationTypeCache;
- @Mock private IRelationTypeSide typeSide1;
- @Mock private IRelationTypeSide typeSide2;
- @Mock private IRelationTypeSide typeSide3;
+ @Mock private RelationTypeSide typeSide1;
+ @Mock private RelationTypeSide typeSide2;
+ @Mock private RelationTypeSide typeSide3;
@Mock private OrderData orderData1;
@Mock private OrderData orderData2;
@@ -144,7 +144,7 @@ public class OrderManagerTest {
assertEquals(3, orderManager.size());
assertEquals(false, orderManager.isEmpty());
- Collection<IRelationTypeSide> items = orderManager.getExistingTypes();
+ Collection<RelationTypeSide> items = orderManager.getExistingTypes();
assertTrue(items.contains(typeSide1));
assertTrue(items.contains(typeSide2));
assertTrue(items.contains(typeSide3));
@@ -232,9 +232,9 @@ public class OrderManagerTest {
when(orderData2.getSorterId()).thenReturn(USER_DEFINED);
when(orderData3.getSorterId()).thenReturn(USER_DEFINED);
- IRelationTypeSide typeSide4 = mock(IRelationTypeSide.class);
- IRelationTypeSide typeSide5 = mock(IRelationTypeSide.class);
- IRelationTypeSide typeSide6 = mock(IRelationTypeSide.class);
+ RelationTypeSide typeSide4 = mock(RelationTypeSide.class);
+ RelationTypeSide typeSide5 = mock(RelationTypeSide.class);
+ RelationTypeSide typeSide6 = mock(RelationTypeSide.class);
when(typeSide4.getGuid()).thenReturn(11L);
when(typeSide5.getGuid()).thenReturn(11L);
@@ -248,10 +248,10 @@ public class OrderManagerTest {
orderManager.add(typeSide5, orderData2);
orderManager.add(typeSide6, orderData3);
- Iterator<Entry<IRelationTypeSide, OrderData>> iterator = orderManager.iterator();
- Entry<IRelationTypeSide, OrderData> actual1 = iterator.next();
- Entry<IRelationTypeSide, OrderData> actual2 = iterator.next();
- Entry<IRelationTypeSide, OrderData> actual3 = iterator.next();
+ Iterator<Entry<RelationTypeSide, OrderData>> iterator = orderManager.iterator();
+ Entry<RelationTypeSide, OrderData> actual1 = iterator.next();
+ Entry<RelationTypeSide, OrderData> actual2 = iterator.next();
+ Entry<RelationTypeSide, OrderData> actual3 = iterator.next();
assertEquals(typeSide5, actual1.getKey());
assertEquals(typeSide4, actual2.getKey());
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java
index 291c5faac9..f11a9e0727 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java
@@ -25,7 +25,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationSorter;
@@ -88,7 +88,7 @@ public class OrderParserTest {
@Mock private RelationTypes relationTypeCache;
@Mock private HasOrderData hasOrderData;
- @Captor private ArgumentCaptor<IRelationTypeSide> typeSideCaptor;
+ @Captor private ArgumentCaptor<RelationTypeSide> typeSideCaptor;
@Captor private ArgumentCaptor<OrderData> orderDataCaptor;
@Mock private IRelationType relationType1;
@@ -208,7 +208,7 @@ public class OrderParserTest {
@Test
public void testToXml() throws OseeCoreException {
//@formatter:off
- Map<IRelationTypeSide, OrderData> data = new LinkedHashMap<>();
+ Map<RelationTypeSide, OrderData> data = new LinkedHashMap<>();
add(data, REL_TYPE_1_ID, REL_TYPE_1_NAME, RelationSide.SIDE_B, USER_DEFINED, ORDER_LIST_2);
add(data, REL_TYPE_2_ID, REL_TYPE_2_NAME, RelationSide.SIDE_A, LEXICOGRAPHICAL_ASC, ORDER_LIST_3);
//@formatter:on
@@ -221,7 +221,7 @@ public class OrderParserTest {
@Test
public void testToXmlEmptyEntries() throws OseeCoreException {
- Map<IRelationTypeSide, OrderData> data = new LinkedHashMap<>();
+ Map<RelationTypeSide, OrderData> data = new LinkedHashMap<>();
when(hasOrderData.iterator()).thenReturn(data.entrySet().iterator());
String actual = parser.toXml(hasOrderData);
@@ -230,7 +230,7 @@ public class OrderParserTest {
@Test
public void testToXmlEmptyList() throws OseeCoreException {
- Map<IRelationTypeSide, OrderData> data = new LinkedHashMap<>();
+ Map<RelationTypeSide, OrderData> data = new LinkedHashMap<>();
add(data, REL_TYPE_1_ID, REL_TYPE_2_NAME, RelationSide.SIDE_A, LEXICOGRAPHICAL_DESC);
when(hasOrderData.iterator()).thenReturn(data.entrySet().iterator());
@@ -239,12 +239,12 @@ public class OrderParserTest {
assertEquals(DATA_4, actual);
}
- private void add(Map<IRelationTypeSide, OrderData> data, Long typeId, String typeName, RelationSide side, RelationSorter sorter) {
+ private void add(Map<RelationTypeSide, OrderData> data, Long typeId, String typeName, RelationSide side, RelationSorter sorter) {
add(data, typeId, typeName, side, sorter, java.util.Collections.<String> emptyList());
}
- private void add(Map<IRelationTypeSide, OrderData> data, Long typeId, String typeName, RelationSide side, RelationSorter sorter, List<String> list) {
- IRelationTypeSide typeSide = TokenFactory.createRelationTypeSide(side, typeId, typeName);
+ private void add(Map<RelationTypeSide, OrderData> data, Long typeId, String typeName, RelationSide side, RelationSorter sorter, List<String> list) {
+ RelationTypeSide typeSide = RelationTypeSide.create(side, typeId, typeName);
OrderData orderData = new OrderData(sorter, list);
data.put(typeSide, orderData);
}
@@ -254,7 +254,7 @@ public class OrderParserTest {
}
private void verifyData(int index, Long typeId, RelationSide side, RelationSorter sorter, List<String> list) {
- IRelationTypeSide actualTypeSide = typeSideCaptor.getAllValues().get(index);
+ RelationTypeSide actualTypeSide = typeSideCaptor.getAllValues().get(index);
OrderData actualData = orderDataCaptor.getAllValues().get(index);
assertEquals(side, actualTypeSide.getSide());
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java
index 8ae4df780a..5d610f030a 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java
@@ -43,7 +43,7 @@ import org.eclipse.osee.executor.admin.CancellableCallable;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
@@ -422,7 +422,7 @@ public class TransactionBuilderImplTest {
@Test
public void testUnrelateFromAllWithSide() throws OseeCoreException {
- IRelationTypeSide asTypeSide = RelationUtil.asTypeSide(TYPE_1, SIDE_B);
+ RelationTypeSide asTypeSide = RelationUtil.asTypeSide(TYPE_1, SIDE_B);
factory.unrelateFromAll(asTypeSide, expectedAuthor);
verify(txDataManager).unrelateFromAll(txData, TYPE_1, expectedAuthor, SIDE_B);
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelatedTo.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelatedTo.java
index a060fc8668..c8a03581f5 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelatedTo.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelatedTo.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.orcs.core.ds.criteria;
import java.util.Collection;
import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.orcs.core.ds.Criteria;
@@ -22,23 +22,23 @@ import org.eclipse.osee.orcs.core.ds.Options;
* @author Roberto E. Escobar
*/
public class CriteriaRelatedTo extends Criteria {
- private final IRelationTypeSide relationTypeSide;
+ private final RelationTypeSide relationTypeSide;
private final Collection<? extends ArtifactId> artifactIds;
private final ArtifactId artifactId;
- public CriteriaRelatedTo(IRelationTypeSide relationTypeSide, ArtifactId artifactId) {
+ public CriteriaRelatedTo(RelationTypeSide relationTypeSide, ArtifactId artifactId) {
this.relationTypeSide = relationTypeSide;
this.artifactId = artifactId;
this.artifactIds = null;
}
- public CriteriaRelatedTo(IRelationTypeSide relationTypeSide, Collection<? extends ArtifactId> artifactIds) {
+ public CriteriaRelatedTo(RelationTypeSide relationTypeSide, Collection<? extends ArtifactId> artifactIds) {
this.relationTypeSide = relationTypeSide;
this.artifactId = null;
this.artifactIds = artifactIds;
}
- public IRelationTypeSide getType() {
+ public RelationTypeSide getType() {
return relationTypeSide;
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeFollow.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeFollow.java
index c0c30dc194..c3f934491b 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeFollow.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeFollow.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.ds.criteria;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.orcs.core.ds.Criteria;
@@ -21,14 +21,14 @@ import org.eclipse.osee.orcs.core.ds.Options;
*/
public class CriteriaRelationTypeFollow extends Criteria {
- private final IRelationTypeSide typeSide;
+ private final RelationTypeSide typeSide;
- public CriteriaRelationTypeFollow(IRelationTypeSide typeSide) {
+ public CriteriaRelationTypeFollow(RelationTypeSide typeSide) {
super();
this.typeSide = typeSide;
}
- public IRelationTypeSide getType() {
+ public RelationTypeSide getType() {
return typeSide;
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeSideExists.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeSideExists.java
index 20c9868217..48f5af0815 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeSideExists.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeSideExists.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.ds.criteria;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.orcs.core.ds.Criteria;
@@ -20,14 +20,14 @@ import org.eclipse.osee.orcs.core.ds.Options;
* @author John Misinco
*/
public class CriteriaRelationTypeSideExists extends Criteria {
- private final IRelationTypeSide relationTypeSide;
+ private final RelationTypeSide relationTypeSide;
- public CriteriaRelationTypeSideExists(IRelationTypeSide relationTypeSide) {
+ public CriteriaRelationTypeSideExists(RelationTypeSide relationTypeSide) {
super();
this.relationTypeSide = relationTypeSide;
}
- public IRelationTypeSide getType() {
+ public RelationTypeSide getType() {
return relationTypeSide;
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeSideNotExists.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeSideNotExists.java
index 83a1651a69..54a16b1ad9 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeSideNotExists.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaRelationTypeSideNotExists.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.ds.criteria;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.orcs.core.ds.Criteria;
@@ -20,14 +20,14 @@ import org.eclipse.osee.orcs.core.ds.Options;
* @author John Misinco
*/
public class CriteriaRelationTypeSideNotExists extends Criteria {
- private final IRelationTypeSide relationTypeSide;
+ private final RelationTypeSide relationTypeSide;
- public CriteriaRelationTypeSideNotExists(IRelationTypeSide relationTypeSide) {
+ public CriteriaRelationTypeSideNotExists(RelationTypeSide relationTypeSide) {
super();
this.relationTypeSide = relationTypeSide;
}
- public IRelationTypeSide getType() {
+ public RelationTypeSide getType() {
return relationTypeSide;
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java
index 0dd170be63..11f79226e3 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.data.BranchId;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.enums.ModificationType;
@@ -191,7 +191,7 @@ public class ArtifactReadOnlyImpl extends AbstractProxied<Artifact> implements A
}
@Override
- public int getMaximumRelationAllowed(IRelationTypeSide typeAndSide) throws OseeCoreException {
+ public int getMaximumRelationAllowed(RelationTypeSide typeAndSide) throws OseeCoreException {
IRelationType type = asRelationType(typeAndSide);
RelationSide side = whichSideAmIOn(typeAndSide);
return getRelationManager().getMaximumRelationAllowed(getSession(), type, getProxiedObject(), side);
@@ -244,12 +244,12 @@ public class ArtifactReadOnlyImpl extends AbstractProxied<Artifact> implements A
}
@Override
- public ResultSet<ArtifactReadable> getRelated(IRelationTypeSide typeAndSide) throws OseeCoreException {
+ public ResultSet<ArtifactReadable> getRelated(RelationTypeSide typeAndSide) throws OseeCoreException {
return getRelated(typeAndSide, EXCLUDE_DELETED);
}
@Override
- public ResultSet<ArtifactReadable> getRelated(IRelationTypeSide typeAndSide, DeletionFlag deletionFlag) throws OseeCoreException {
+ public ResultSet<ArtifactReadable> getRelated(RelationTypeSide typeAndSide, DeletionFlag deletionFlag) throws OseeCoreException {
IRelationType type = asRelationType(typeAndSide);
RelationSide side = whichSideAmIOn(typeAndSide);
ResultSet<Artifact> related =
@@ -258,21 +258,21 @@ public class ArtifactReadOnlyImpl extends AbstractProxied<Artifact> implements A
}
@Override
- public int getRelatedCount(IRelationTypeSide typeAndSide) throws OseeCoreException {
+ public int getRelatedCount(RelationTypeSide typeAndSide) throws OseeCoreException {
IRelationType type = asRelationType(typeAndSide);
RelationSide side = whichSideAmIOn(typeAndSide);
return getRelationManager().getRelatedCount(getSession(), type, getProxiedObject(), side);
}
@Override
- public boolean areRelated(IRelationTypeSide typeAndSide, ArtifactReadable readable) throws OseeCoreException {
+ public boolean areRelated(RelationTypeSide typeAndSide, ArtifactReadable readable) throws OseeCoreException {
IRelationType type = asRelationType(typeAndSide);
Pair<RelationNode, RelationNode> nodes = asABNodes(typeAndSide.getSide(), readable);
return getRelationManager().areRelated(getSession(), nodes.getFirst(), type, nodes.getSecond());
}
@Override
- public String getRationale(IRelationTypeSide typeAndSide, ArtifactReadable readable) throws OseeCoreException {
+ public String getRationale(RelationTypeSide typeAndSide, ArtifactReadable readable) throws OseeCoreException {
IRelationType type = asRelationType(typeAndSide);
Pair<RelationNode, RelationNode> nodes = asABNodes(typeAndSide.getSide(), readable);
return getRelationManager().getRationale(getSession(), nodes.getFirst(), type, nodes.getSecond());
@@ -284,7 +284,7 @@ public class ArtifactReadOnlyImpl extends AbstractProxied<Artifact> implements A
return RelationUtil.asABNodes(thisArtifact, otherArtifact, side);
}
- private RelationSide whichSideAmIOn(IRelationTypeSide typeAndSide) {
+ private RelationSide whichSideAmIOn(RelationTypeSide typeAndSide) {
return typeAndSide.getSide().oppositeSide();
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationUtil.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationUtil.java
index 8eb5687341..802c85abc2 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationUtil.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationUtil.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.orcs.core.internal.relation;
import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.Default_Hierarchical__Parent;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -33,12 +33,12 @@ public final class RelationUtil {
// Utility
}
- public static IRelationType asRelationType(IRelationTypeSide typeAndSide) {
+ public static IRelationType asRelationType(RelationTypeSide typeAndSide) {
return TokenFactory.createRelationType(typeAndSide.getGuid(), typeAndSide.getName());
}
- public static IRelationTypeSide asTypeSide(IRelationType type, RelationSide side) {
- return TokenFactory.createRelationTypeSide(side, type.getId(), type.getName());
+ public static RelationTypeSide asTypeSide(IRelationType type, RelationSide side) {
+ return RelationTypeSide.create(side, type.getId(), type.getName());
}
/**
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java
index deb3e021f8..ce9e696d1a 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java
@@ -37,7 +37,7 @@ import java.util.Set;
import org.eclipse.osee.framework.core.data.ApplicabilityId;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationSorter;
@@ -180,7 +180,7 @@ public class RelationManagerImpl implements RelationManager {
result = resolver.resolve(session, graph, links, otherSide);
if (result.size() > 1) {
OrderManager orderManager = orderFactory.createOrderManager(node);
- IRelationTypeSide key = asTypeSide(type, otherSide);
+ RelationTypeSide key = asTypeSide(type, otherSide);
orderManager.sort(key, result);
}
}
@@ -359,7 +359,7 @@ public class RelationManagerImpl implements RelationManager {
List<Relation> sideLinks = getRelations(session, type, node, side, EXCLUDE_DELETED);
List<RelationNode> nodes = resolver.resolve(session, graph, sideLinks, side);
- IRelationTypeSide asTypeSide = asTypeSide(type, side);
+ RelationTypeSide asTypeSide = asTypeSide(type, side);
orderManager.setOrder(asTypeSide, nodes);
}
}
@@ -435,7 +435,7 @@ public class RelationManagerImpl implements RelationManager {
OrderManager orderManager = orderFactory.createOrderManager(node1);
RelationSide orderSide = side.oppositeSide();
- IRelationTypeSide key = asTypeSide(type, orderSide);
+ RelationTypeSide key = asTypeSide(type, orderSide);
RelationSorter sorterIdToUse = sorterId;
if (sorterIdToUse == PREEXISTING) {
sorterIdToUse = orderManager.getSorterId(key);
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/HasOrderData.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/HasOrderData.java
index 9ba103656d..0ff7208847 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/HasOrderData.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/HasOrderData.java
@@ -11,17 +11,17 @@
package org.eclipse.osee.orcs.core.internal.relation.order;
import java.util.Map.Entry;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
/**
* @author Roberto E. Escobar
*/
-public interface HasOrderData extends Iterable<Entry<IRelationTypeSide, OrderData>> {
+public interface HasOrderData extends Iterable<Entry<RelationTypeSide, OrderData>> {
- void add(IRelationTypeSide typeAndSide, OrderData data) throws OseeCoreException;
+ void add(RelationTypeSide typeAndSide, OrderData data) throws OseeCoreException;
- void remove(IRelationTypeSide typeAndSide) throws OseeCoreException;
+ void remove(RelationTypeSide typeAndSide) throws OseeCoreException;
void clear();
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderEntryComparator.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderEntryComparator.java
index 1b61b5febe..1423dd02ee 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderEntryComparator.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderEntryComparator.java
@@ -15,17 +15,17 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map.Entry;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
/**
* @author Roberto E. Escobar
*/
-public class OrderEntryComparator implements Comparator<Entry<IRelationTypeSide, OrderData>> {
+public class OrderEntryComparator implements Comparator<Entry<RelationTypeSide, OrderData>> {
@Override
- public int compare(Entry<IRelationTypeSide, OrderData> o1, Entry<IRelationTypeSide, OrderData> o2) {
- IRelationTypeSide typeSide1 = o1.getKey();
- IRelationTypeSide typeSide2 = o2.getKey();
+ public int compare(Entry<RelationTypeSide, OrderData> o1, Entry<RelationTypeSide, OrderData> o2) {
+ RelationTypeSide typeSide1 = o1.getKey();
+ RelationTypeSide typeSide2 = o2.getKey();
OrderData orderData1 = o1.getValue();
OrderData orderData2 = o2.getValue();
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java
index b246ff2bc6..49617e88f9 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java
@@ -20,7 +20,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -35,7 +35,7 @@ public class OrderManager implements HasOrderData {
private static final OrderEntryComparator ENTRY_COMPARATOR = new OrderEntryComparator();
- private final Map<IRelationTypeSide, OrderData> orderDataMap = new ConcurrentHashMap<>();
+ private final Map<RelationTypeSide, OrderData> orderDataMap = new ConcurrentHashMap<>();
private final OrderAccessor accessor;
private final SorterProvider sorterProvider;
@@ -46,7 +46,7 @@ public class OrderManager implements HasOrderData {
}
@Override
- public void add(IRelationTypeSide typeAndSide, OrderData data) throws OseeCoreException {
+ public void add(RelationTypeSide typeAndSide, OrderData data) throws OseeCoreException {
Conditions.checkNotNull(typeAndSide, "type and side key");
Conditions.checkNotNull(data, "orderData");
@@ -54,16 +54,16 @@ public class OrderManager implements HasOrderData {
}
@Override
- public void remove(IRelationTypeSide typeAndSide) throws OseeCoreException {
+ public void remove(RelationTypeSide typeAndSide) throws OseeCoreException {
Conditions.checkNotNull(typeAndSide, "type and side key");
orderDataMap.remove(typeAndSide);
}
@Override
- public Iterator<Entry<IRelationTypeSide, OrderData>> iterator() {
- List<Entry<IRelationTypeSide, OrderData>> entries =
- new ArrayList<Entry<IRelationTypeSide, OrderData>>(orderDataMap.entrySet());
+ public Iterator<Entry<RelationTypeSide, OrderData>> iterator() {
+ List<Entry<RelationTypeSide, OrderData>> entries =
+ new ArrayList<Entry<RelationTypeSide, OrderData>>(orderDataMap.entrySet());
Collections.sort(entries, ENTRY_COMPARATOR);
return entries.iterator();
}
@@ -91,22 +91,22 @@ public class OrderManager implements HasOrderData {
accessor.store(this, OrderChange.Forced);
}
- public Collection<IRelationTypeSide> getExistingTypes() {
+ public Collection<RelationTypeSide> getExistingTypes() {
return orderDataMap.keySet();
}
- private OrderData getOrderData(IRelationTypeSide typeAndSide) throws OseeCoreException {
+ private OrderData getOrderData(RelationTypeSide typeAndSide) throws OseeCoreException {
Conditions.checkNotNull(typeAndSide, "type and side key");
return orderDataMap.get(typeAndSide);
}
- public List<String> getOrderIds(IRelationTypeSide typeAndSide) throws OseeCoreException {
+ public List<String> getOrderIds(RelationTypeSide typeAndSide) throws OseeCoreException {
Conditions.checkNotNull(typeAndSide, "type and side key");
OrderData data = orderDataMap.get(typeAndSide);
return data != null ? data.getOrderIds() : Collections.<String> emptyList();
}
- public RelationSorter getSorterId(IRelationTypeSide typeAndSide) throws OseeCoreException {
+ public RelationSorter getSorterId(RelationTypeSide typeAndSide) throws OseeCoreException {
Conditions.checkNotNull(typeAndSide, "type and side key");
OrderData data = orderDataMap.get(typeAndSide);
RelationSorter sorterId = null;
@@ -122,7 +122,7 @@ public class OrderManager implements HasOrderData {
return sorterProvider.getDefaultSorterId(type);
}
- public void sort(IRelationTypeSide typeAndSide, List<? extends Identifiable<String>> listToOrder) throws OseeCoreException {
+ public void sort(RelationTypeSide typeAndSide, List<? extends Identifiable<String>> listToOrder) throws OseeCoreException {
if (listToOrder.size() > 1) {
RelationSorter sorterId = getSorterId(typeAndSide);
List<String> relativeOrder = getOrderIds(typeAndSide);
@@ -132,12 +132,12 @@ public class OrderManager implements HasOrderData {
}
}
- public void setOrder(IRelationTypeSide typeAndSide, List<? extends Identifiable<String>> relativeSequence) throws OseeCoreException {
+ public void setOrder(RelationTypeSide typeAndSide, List<? extends Identifiable<String>> relativeSequence) throws OseeCoreException {
RelationSorter sorterId = getSorterId(typeAndSide);
setOrder(typeAndSide, sorterId, relativeSequence);
}
- public void setOrder(IRelationTypeSide typeAndSide, RelationSorter sorterId, List<? extends Identifiable<String>> relativeSequence) throws OseeCoreException {
+ public void setOrder(RelationTypeSide typeAndSide, RelationSorter sorterId, List<? extends Identifiable<String>> relativeSequence) throws OseeCoreException {
List<String> sequence;
if (!relativeSequence.isEmpty()) {
sequence = new ArrayList<>();
@@ -150,7 +150,7 @@ public class OrderManager implements HasOrderData {
setAndStoreOrder(typeAndSide, sorterId, sequence);
}
- private void setAndStoreOrder(IRelationTypeSide typeAndSide, RelationSorter requestedSorterId, List<String> relativeSequence) throws OseeCoreException {
+ private void setAndStoreOrder(RelationTypeSide typeAndSide, RelationSorter requestedSorterId, List<String> relativeSequence) throws OseeCoreException {
boolean isDifferentSorterId = isDifferentSorterId(typeAndSide, requestedSorterId);
boolean changingRelatives = isRelativeOrderChange(typeAndSide, requestedSorterId, relativeSequence);
@@ -174,17 +174,17 @@ public class OrderManager implements HasOrderData {
accessor.store(this, changeType);
}
- private boolean isDifferentSorterId(IRelationTypeSide typeAndSide, RelationSorter newSorterId) throws OseeCoreException {
+ private boolean isDifferentSorterId(RelationTypeSide typeAndSide, RelationSorter newSorterId) throws OseeCoreException {
RelationSorter currentSorter = getSorterId(typeAndSide);
return !currentSorter.equals(newSorterId);
}
- private boolean isSetToDefaultSorter(IRelationTypeSide typeAndSide, RelationSorter sorterId) throws OseeCoreException {
+ private boolean isSetToDefaultSorter(RelationTypeSide typeAndSide, RelationSorter sorterId) throws OseeCoreException {
RelationSorter defaultSorterId = getDefaultSorterId(typeAndSide);
return defaultSorterId.equals(sorterId);
}
- private boolean isRelativeOrderChange(IRelationTypeSide typeAndSide, RelationSorter sorterId, List<String> relativeSequence) throws OseeCoreException {
+ private boolean isRelativeOrderChange(RelationTypeSide typeAndSide, RelationSorter sorterId, List<String> relativeSequence) throws OseeCoreException {
boolean result = false;
if (sorterId.equals(USER_DEFINED)) {
List<String> currentOrder = getOrderIds(typeAndSide);
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java
index 1cc8ec8ed6..66852b5c57 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java
@@ -27,8 +27,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.TokenFactory;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -119,7 +118,7 @@ public class OrderParser {
});
RelationSide side = RelationSide.fromString(relationSide);
- IRelationTypeSide typeSide = TokenFactory.createRelationTypeSide(side, type.getId(), type.getName());
+ RelationTypeSide typeSide = RelationTypeSide.create(type, side);
OrderData orderData = new OrderData(RelationSorter.valueOfGuid(orderType), list);
hasOrderData.add(typeSide, orderData);
}
@@ -137,7 +136,7 @@ public class OrderParser {
try {
xmlWriter = outputFactory.get().createXMLStreamWriter(writer);
xmlWriter.writeStartElement(ROOT_ELEMENT);
- for (Entry<IRelationTypeSide, OrderData> entry : hasOrderData) {
+ for (Entry<RelationTypeSide, OrderData> entry : hasOrderData) {
writeEntry(xmlWriter, entry.getKey(), entry.getValue());
}
xmlWriter.writeEndElement();
@@ -156,7 +155,7 @@ public class OrderParser {
return writer.toString();
}
- private void writeEntry(XMLStreamWriter xmlWriter, IRelationTypeSide typeAndSide, OrderData orderData) throws XMLStreamException {
+ private void writeEntry(XMLStreamWriter xmlWriter, RelationTypeSide typeAndSide, OrderData orderData) throws XMLStreamException {
xmlWriter.writeStartElement(START_TAG);
// TODO don't store relation type by name - use type UUID
xmlWriter.writeAttribute(RELATION_TYPE_TAG, typeAndSide.getName());
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java
index e42100ad5d..fcda9cc8aa 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java
@@ -26,7 +26,7 @@ import org.eclipse.osee.framework.core.data.BranchId;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
@@ -613,7 +613,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter {
getArtifactQuery().andNotExists(type);
}
} else {
- IRelationTypeSide typeSide = asRelationTypeSide(object.getType(), object.getSide());
+ RelationTypeSide typeSide = asRelationTypeSide(object.getType(), object.getSide());
if (OsExistenceOperator.EXISTS == op) {
getArtifactQuery().andExists(typeSide);
} else {
@@ -625,7 +625,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter {
@Override
public Void caseOsRelatedToClause(OsRelatedToClause object) {
- IRelationTypeSide typeSide = asRelationTypeSide(object.getType(), object.getSide());
+ RelationTypeSide typeSide = asRelationTypeSide(object.getType(), object.getSide());
Collection<Long> ids = resolver.resolve(Long.class, object.getIds());
getArtifactQuery().andRelatedTo(typeSide,
ids.stream().map(id -> ArtifactId.valueOf(id)).collect(Collectors.toList()));
@@ -634,7 +634,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter {
@Override
public Void caseOsFollowRelationType(OsFollowRelationType object) {
- IRelationTypeSide typeSide = asRelationTypeSide(object.getType(), object.getSide());
+ RelationTypeSide typeSide = asRelationTypeSide(object.getType(), object.getSide());
getArtifactQuery().followRelation(typeSide);
return null;
}
@@ -688,16 +688,16 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter {
return toReturn;
}
- private IRelationTypeSide asRelationTypeSide(OsExpression expression, OsRelationSide side) {
- IRelationTypeSide toReturn;
+ private RelationTypeSide asRelationTypeSide(OsExpression expression, OsRelationSide side) {
+ RelationTypeSide toReturn;
Class<?> clazz = resolver.resolveTypeSingle(expression);
if (clazz.isAssignableFrom(String.class)) {
String name = resolver.resolveSingle(String.class, expression);
IRelationType type = getRelationType(name);
- toReturn = TokenFactory.createRelationTypeSide(asSide(side), type.getId(), type.getName());
+ toReturn = RelationTypeSide.create(type, asSide(side));
} else {
long typeId = resolver.resolveSingle(Long.class, expression);
- toReturn = TokenFactory.createRelationTypeSide(asSide(side), typeId, "N/A");
+ toReturn = RelationTypeSide.create(asSide(side), typeId, "N/A");
}
return toReturn;
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java
index 640d166026..64cae3eae8 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.data.ArtifactId;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.CoreArtifactTokens;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
@@ -251,13 +251,13 @@ public class ArtifactQueryBuilderImpl<T> implements ArtifactQueryBuilder<T> {
}
@Override
- public T andNotExists(IRelationTypeSide relationTypeSide) {
+ public T andNotExists(RelationTypeSide relationTypeSide) {
Criteria criteria = criteriaFactory.createNotExistsCriteria(relationTypeSide);
return addAndCheck(getQueryData(), criteria);
}
@Override
- public T andExists(IRelationTypeSide relationTypeSide) {
+ public T andExists(RelationTypeSide relationTypeSide) {
Criteria criteria = criteriaFactory.createExistsCriteria(relationTypeSide);
return addAndCheck(getQueryData(), criteria);
}
@@ -294,23 +294,23 @@ public class ArtifactQueryBuilderImpl<T> implements ArtifactQueryBuilder<T> {
}
@Override
- public T andRelatedTo(IRelationTypeSide relationTypeSide, ArtifactReadable... artifacts) {
+ public T andRelatedTo(RelationTypeSide relationTypeSide, ArtifactReadable... artifacts) {
return andRelatedTo(relationTypeSide, Arrays.asList(artifacts));
}
@Override
- public T andRelatedTo(IRelationTypeSide relationTypeSide, Collection<? extends ArtifactId> artifacts) {
+ public T andRelatedTo(RelationTypeSide relationTypeSide, Collection<? extends ArtifactId> artifacts) {
return addAndCheck(getQueryData(), new CriteriaRelatedTo(relationTypeSide, artifacts));
}
@Override
- public T andRelatedTo(IRelationTypeSide relationTypeSide, ArtifactId artifactId) {
+ public T andRelatedTo(RelationTypeSide relationTypeSide, ArtifactId artifactId) {
return addAndCheck(getQueryData(), new CriteriaRelatedTo(relationTypeSide, artifactId));
}
@SuppressWarnings("unchecked")
@Override
- public T followRelation(IRelationTypeSide relationTypeSide) {
+ public T followRelation(RelationTypeSide relationTypeSide) {
Criteria criteria = criteriaFactory.createFollowRelationType(relationTypeSide);
addAndCheck(getQueryData(), criteria);
queryData.newCriteriaSet();
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CriteriaFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CriteriaFactory.java
index b0a9494875..8c0f4b9e99 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CriteriaFactory.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CriteriaFactory.java
@@ -17,7 +17,7 @@ import java.util.Set;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.orcs.core.ds.Criteria;
@@ -78,7 +78,7 @@ public class CriteriaFactory {
return new CriteriaRelationTypeExists(relationType);
}
- public Criteria createExistsCriteria(IRelationTypeSide relationTypeSide) throws OseeCoreException {
+ public Criteria createExistsCriteria(RelationTypeSide relationTypeSide) throws OseeCoreException {
return new CriteriaRelationTypeSideExists(relationTypeSide);
}
@@ -86,7 +86,7 @@ public class CriteriaFactory {
return new CriteriaRelationTypeNotExists(relationType);
}
- public Criteria createNotExistsCriteria(IRelationTypeSide relationTypeSide) {
+ public Criteria createNotExistsCriteria(RelationTypeSide relationTypeSide) {
return new CriteriaRelationTypeSideNotExists(relationTypeSide);
}
@@ -112,7 +112,7 @@ public class CriteriaFactory {
return new CriteriaAllArtifacts();
}
- public Criteria createFollowRelationType(IRelationTypeSide relationTypeSide) {
+ public Criteria createFollowRelationType(RelationTypeSide relationTypeSide) {
return new CriteriaRelationTypeFollow(relationTypeSide);
}
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java
index c7075d65f6..eb7a57260b 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.core.data.BranchId;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.Tuple2Type;
import org.eclipse.osee.framework.core.data.Tuple3Type;
import org.eclipse.osee.framework.core.data.Tuple4Type;
@@ -303,7 +303,7 @@ public class TransactionBuilderImpl implements TransactionBuilder {
}
@Override
- public void unrelateFromAll(IRelationTypeSide typeAndSide, ArtifactId art) throws OseeCoreException {
+ public void unrelateFromAll(RelationTypeSide typeAndSide, ArtifactId art) throws OseeCoreException {
IRelationType type = RelationUtil.asRelationType(typeAndSide);
txManager.unrelateFromAll(txData, type, art, typeAndSide.getSide());
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java
index 0874e18649..15a9d54aa9 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.orcs.db.internal.search.handlers;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.orcs.core.ds.OptionsUtil;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelatedTo;
@@ -101,7 +101,7 @@ public class RelatedToSqlHandler extends SqlHandler<CriteriaRelatedTo> {
private String getPredicate(AbstractSqlWriter writer, String txsAliasName, String relAliasName) throws OseeCoreException {
StringBuilder sb = new StringBuilder();
- IRelationTypeSide typeSide = criteria.getType();
+ RelationTypeSide typeSide = criteria.getType();
sb.append(relAliasName);
sb.append(".rel_link_type_id = ?");
writer.addParameter(typeSide.getGuid());
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeFollowSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeFollowSqlHandler.java
index 65128c4129..8cf90a1e37 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeFollowSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeFollowSqlHandler.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.orcs.db.internal.search.handlers;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.orcs.core.ds.OptionsUtil;
@@ -72,7 +72,7 @@ public class RelationTypeFollowSqlHandler extends SqlHandler<CriteriaRelationTyp
@Override
public boolean addPredicates(AbstractSqlWriter writer) throws OseeCoreException {
boolean includeDeletedRelations = OptionsUtil.areDeletedRelationsIncluded(writer.getOptions());
- IRelationTypeSide typeSide = criteria.getType();
+ RelationTypeSide typeSide = criteria.getType();
if (txsAlias0 != null && artAlias0 != null) {
writer.write(artAlias0);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideExistsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideExistsSqlHandler.java
index 25b562d0ba..32148f1b4c 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideExistsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideExistsSqlHandler.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.orcs.db.internal.search.handlers;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelationTypeSideExists;
import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter;
@@ -37,7 +37,7 @@ public class RelationTypeSideExistsSqlHandler extends AbstractRelationSqlHandler
public boolean addPredicates(AbstractSqlWriter writer) throws OseeCoreException {
super.addPredicates(writer);
- IRelationTypeSide type = criteria.getType();
+ RelationTypeSide type = criteria.getType();
writer.write(relAlias);
writer.write(".rel_link_type_id = ?");
writer.addParameter(type.getGuid());
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideNotExistsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideNotExistsSqlHandler.java
index ba55014f55..0a057badaf 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideNotExistsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideNotExistsSqlHandler.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.orcs.db.internal.search.handlers;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelationTypeSideNotExists;
import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter;
@@ -26,7 +26,7 @@ public class RelationTypeSideNotExistsSqlHandler extends AbstractRelationSqlHand
public boolean addPredicates(AbstractSqlWriter writer) throws OseeCoreException {
super.addPredicates(writer);
- IRelationTypeSide type = criteria.getType();
+ RelationTypeSide type = criteria.getType();
writer.write("NOT EXISTS (SELECT 1 FROM ");
writer.write(TableEnum.RELATION_TABLE.getName());
diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java
index 7ca2d8a395..f3894a6d4d 100644
--- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java
+++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.data.ArtifactToken;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.QueryOption;
@@ -132,7 +132,7 @@ public interface QueryBuilder {
*
* @param relationTypeSide the type to start following the link from
*/
- QueryBuilder andExists(IRelationTypeSide relationTypeSide) throws OseeCoreException;
+ QueryBuilder andExists(RelationTypeSide relationTypeSide) throws OseeCoreException;
/**
* Search criteria that checks for non-existence of a relation type
@@ -146,7 +146,7 @@ public interface QueryBuilder {
*
* @param relationTypeSide the type to check for non-existence
*/
- QueryBuilder andNotExists(IRelationTypeSide relationTypeSide) throws OseeCoreException;
+ QueryBuilder andNotExists(RelationTypeSide relationTypeSide) throws OseeCoreException;
/**
* Artifact name equals value
@@ -178,14 +178,14 @@ public interface QueryBuilder {
*
* @param relationTypeSide the type-side to search on
*/
- QueryBuilder andRelatedTo(IRelationTypeSide relationTypeSide, ArtifactId... artifacts) throws OseeCoreException;
+ QueryBuilder andRelatedTo(RelationTypeSide relationTypeSide, ArtifactId... artifacts) throws OseeCoreException;
/**
* Search for related artifacts
*
* @param relationTypeSide the type-side to search on
*/
- QueryBuilder andRelatedTo(IRelationTypeSide relationTypeSide, Collection<ArtifactId> artifactIds) throws OseeCoreException;
+ QueryBuilder andRelatedTo(RelationTypeSide relationTypeSide, Collection<ArtifactId> artifactIds) throws OseeCoreException;
/**
* Executes query
diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactory.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactory.java
index f9f2bf14d0..e2f8c5b50f 100644
--- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactory.java
+++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactory.java
@@ -15,7 +15,7 @@ import org.eclipse.osee.framework.core.data.ArtifactId;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.orcs.rest.model.search.artifact.Predicate;
@@ -47,10 +47,10 @@ public interface PredicateFactory {
Predicate createRelationNotExistsSearch(Collection<? extends IRelationType> relationTypes);
- Predicate createRelationTypeSideNotExistsSearch(IRelationTypeSide relationTypeSide);
+ Predicate createRelationTypeSideNotExistsSearch(RelationTypeSide relationTypeSide);
- Predicate createRelationTypeSideExistsSearch(IRelationTypeSide relationTypeSide);
+ Predicate createRelationTypeSideExistsSearch(RelationTypeSide relationTypeSide);
- Predicate createRelatedToSearch(IRelationTypeSide relationTypeSide, Collection<ArtifactId> ids);
+ Predicate createRelatedToSearch(RelationTypeSide relationTypeSide, Collection<ArtifactId> ids);
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java
index 3a5a92fca5..3db69fff4f 100644
--- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.data.ArtifactId;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.jdk.core.type.Id;
import org.eclipse.osee.framework.jdk.core.type.Identity;
@@ -109,13 +109,13 @@ public class PredicateFactoryImpl implements PredicateFactory {
}
@Override
- public Predicate createRelationTypeSideExistsSearch(IRelationTypeSide relationTypeSide) {
+ public Predicate createRelationTypeSideExistsSearch(RelationTypeSide relationTypeSide) {
String side = relationTypeSide.getSide().isSideA() ? "A" : "B";
return new Predicate(SearchMethod.EXISTS_TYPE, Arrays.asList("relTypeSide", side), getLongIds(relationTypeSide));
}
@Override
- public Predicate createRelationTypeSideNotExistsSearch(IRelationTypeSide relationTypeSide) {
+ public Predicate createRelationTypeSideNotExistsSearch(RelationTypeSide relationTypeSide) {
String side = relationTypeSide.getSide().isSideA() ? "A" : "B";
return new Predicate(SearchMethod.NOT_EXISTS_TYPE, Arrays.asList("relTypeSide", side),
getLongIds(relationTypeSide));
@@ -128,7 +128,7 @@ public class PredicateFactoryImpl implements PredicateFactory {
}
@Override
- public Predicate createRelatedToSearch(IRelationTypeSide relationTypeSide, Collection<ArtifactId> ids) {
+ public Predicate createRelatedToSearch(RelationTypeSide relationTypeSide, Collection<ArtifactId> ids) {
List<String> values = new LinkedList<>();
String side = relationTypeSide.getSide().isSideA() ? "A" : "B";
for (ArtifactId id : ids) {
diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java
index c37a9f6a1e..21f9980c7a 100644
--- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.data.ArtifactToken;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.QueryOption;
@@ -177,13 +177,13 @@ public class QueryBuilderImpl implements QueryBuilder {
}
@Override
- public QueryBuilder andExists(IRelationTypeSide relationTypeSide) throws OseeCoreException {
+ public QueryBuilder andExists(RelationTypeSide relationTypeSide) throws OseeCoreException {
predicates.add(predicateFactory.createRelationTypeSideExistsSearch(relationTypeSide));
return this;
}
@Override
- public QueryBuilder andNotExists(IRelationTypeSide relationTypeSide) throws OseeCoreException {
+ public QueryBuilder andNotExists(RelationTypeSide relationTypeSide) throws OseeCoreException {
predicates.add(predicateFactory.createRelationTypeSideNotExistsSearch(relationTypeSide));
return this;
}
@@ -217,12 +217,12 @@ public class QueryBuilderImpl implements QueryBuilder {
}
@Override
- public QueryBuilder andRelatedTo(IRelationTypeSide relationTypeSide, ArtifactId... artifacts) {
+ public QueryBuilder andRelatedTo(RelationTypeSide relationTypeSide, ArtifactId... artifacts) {
return andRelatedTo(relationTypeSide, Arrays.asList(artifacts));
}
@Override
- public QueryBuilder andRelatedTo(IRelationTypeSide relationTypeSide, Collection<ArtifactId> artifactIds) {
+ public QueryBuilder andRelatedTo(RelationTypeSide relationTypeSide, Collection<ArtifactId> artifactIds) {
predicates.add(predicateFactory.createRelatedToSearch(relationTypeSide, artifactIds));
return this;
}
diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java
index 6829e2140f..285f2933bf 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java
+++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistenceTypePredicateHandlerTest.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.List;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.orcs.rest.internal.search.artifact.predicate.ExistenceTypePredicateHandler;
@@ -155,7 +155,7 @@ public class ExistenceTypePredicateHandlerTest {
values = Collections.singletonList(value);
testPredicate = new Predicate(SearchMethod.EXISTS_TYPE, typeParameters, values, QueryOption.TOKEN_DELIMITER__ANY);
handler.handle(builder, testPredicate);
- verify(builder, never()).andExists(any(IRelationTypeSide.class));
+ verify(builder, never()).andExists(any(RelationTypeSide.class));
}
@Test(expected = OseeCoreException.class)
diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java
index 90fec4bb2b..1a4fd8d3b6 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java
+++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java
@@ -16,7 +16,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.QueryOption;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -43,7 +43,7 @@ public class RelatedToPredicateHandlerTest {
@Captor
private ArgumentCaptor<Collection<ArtifactId>> idsCaptor;
@Captor
- private ArgumentCaptor<IRelationTypeSide> rtsCaptor;
+ private ArgumentCaptor<RelationTypeSide> rtsCaptor;
@Before
public void initialize() {
@@ -57,7 +57,7 @@ public class RelatedToPredicateHandlerTest {
Arrays.asList("4", "5"), QueryOption.TOKEN_DELIMITER__ANY);
handler.handle(builder, testPredicate);
verify(builder, times(2)).andRelatedTo(rtsCaptor.capture(), idsCaptor.capture());
- List<IRelationTypeSide> rts = rtsCaptor.getAllValues();
+ List<RelationTypeSide> rts = rtsCaptor.getAllValues();
Assert.assertEquals(2, rts.size());
verifyRelationTypeSide(rts.get(0), "A1");
verifyRelationTypeSide(rts.get(1), "B2");
@@ -75,7 +75,7 @@ public class RelatedToPredicateHandlerTest {
handler.handle(builder, testPredicate);
}
- private void verifyRelationTypeSide(IRelationTypeSide rts, String input) {
+ private void verifyRelationTypeSide(RelationTypeSide rts, String input) {
if (input.startsWith("A")) {
Assert.assertEquals(RelationSide.SIDE_A, rts.getSide());
} else {
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/ExistenceTypePredicateHandler.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/ExistenceTypePredicateHandler.java
index 05a452f404..a044fd680b 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/ExistenceTypePredicateHandler.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/ExistenceTypePredicateHandler.java
@@ -14,7 +14,7 @@ import java.util.Collection;
import java.util.List;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
@@ -66,7 +66,7 @@ public class ExistenceTypePredicateHandler implements PredicateHandler {
} else if ("relTypeSide".equals(existsType)) {
RelationSide side = typeParameters.get(1).equals("A") ? RelationSide.SIDE_A : RelationSide.SIDE_B;
for (IRelationType rt : PredicateHandlerUtil.getIRelationTypes(values)) {
- IRelationTypeSide rts = TokenFactory.createRelationTypeSide(side, rt.getId(), "SearchRelTypeSide");
+ RelationTypeSide rts = RelationTypeSide.create(side, rt.getId(), "SearchRelTypeSide");
if (checkExists(predicate.getType())) {
builder.andExists(rts);
} else {
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/PredicateHandlerUtil.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/PredicateHandlerUtil.java
index 8b5127ed04..fb628c2a29 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/PredicateHandlerUtil.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/PredicateHandlerUtil.java
@@ -15,7 +15,7 @@ import java.util.LinkedHashSet;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -60,8 +60,8 @@ public class PredicateHandlerUtil {
return types;
}
- public static Collection<IRelationTypeSide> getIRelationTypeSides(Collection<String> rels) throws OseeCoreException {
- Collection<IRelationTypeSide> relSides = new LinkedHashSet<>();
+ public static Collection<RelationTypeSide> getRelationTypeSides(Collection<String> rels) throws OseeCoreException {
+ Collection<RelationTypeSide> relSides = new LinkedHashSet<>();
for (String value : rels) {
char sideChar = value.charAt(0);
String uuid = value.substring(1);
@@ -71,7 +71,7 @@ public class PredicateHandlerUtil {
}
long longUuid = parseUuid(uuid);
if (longUuid != -1L) {
- relSides.add(TokenFactory.createRelationTypeSide(side, longUuid, "SearchRelationTypeSide"));
+ relSides.add(RelationTypeSide.create(side, longUuid, "SearchRelationTypeSide"));
}
}
return relSides;
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/RelatedToPredicateHandler.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/RelatedToPredicateHandler.java
index 00b735b08e..c0ae2d3a5e 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/RelatedToPredicateHandler.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/artifact/predicate/RelatedToPredicateHandler.java
@@ -14,7 +14,7 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import org.eclipse.osee.framework.core.data.ArtifactId;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
@@ -40,7 +40,7 @@ public class RelatedToPredicateHandler implements PredicateHandler {
Conditions.checkNotNull(typeParameters, "typeParameters");
Conditions.checkNotNull(values, "values");
- Collection<IRelationTypeSide> types = PredicateHandlerUtil.getIRelationTypeSides(typeParameters);
+ Collection<RelationTypeSide> types = PredicateHandlerUtil.getRelationTypeSides(typeParameters);
Collection<ArtifactId> artIds = new LinkedList<>();
for (String value : values) {
@@ -53,11 +53,11 @@ public class RelatedToPredicateHandler implements PredicateHandler {
if (!artIds.isEmpty()) {
if (artIds.size() == 1) {
- for (IRelationTypeSide rts : types) {
+ for (RelationTypeSide rts : types) {
builder.andRelatedTo(rts, artIds.iterator().next());
}
} else {
- for (IRelationTypeSide rts : types) {
+ for (RelationTypeSide rts : types) {
builder.andRelatedTo(rts, artIds);
}
}
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java
index d6330fa6b5..5286519af4 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java
@@ -21,8 +21,7 @@ import org.eclipse.osee.framework.core.data.BranchId;
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.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.TokenFactory;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -299,14 +298,14 @@ public class OrcsCollectorWriter {
uuidToArtifact.put(artToken.getUuid(), otherArtifact);
}
if (relation.getType().isSideA()) {
- IRelationTypeSide relTypeSide = TokenFactory.createRelationTypeSide(RelationSide.SIDE_A,
- relation.getType().getUuid(), relation.getType().getName());
+ RelationTypeSide relTypeSide =
+ RelationTypeSide.create(RelationSide.SIDE_A, relation.getType().getUuid(), relation.getType().getName());
if (!otherArtifact.areRelated(relTypeSide, (ArtifactReadable) artifact)) {
getTransaction().relate(otherArtifact, relType, artifact);
}
} else {
- IRelationTypeSide relTypeSide = TokenFactory.createRelationTypeSide(RelationSide.SIDE_B,
- relation.getType().getUuid(), relation.getType().getName());
+ RelationTypeSide relTypeSide =
+ RelationTypeSide.create(RelationSide.SIDE_B, relation.getType().getUuid(), relation.getType().getName());
if (!otherArtifact.areRelated(relTypeSide, (ArtifactReadable) artifact)) {
getTransaction().relate(artifact, relType, otherArtifact);
}
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java
index e0c97c6d0d..3cd58f26f4 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OwFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.orcs.OrcsApi;
import org.eclipse.osee.orcs.rest.model.writer.reader.OwArtifact;
@@ -73,7 +73,7 @@ public class OwFactory {
return owType;
}
- public static OwRelationType createRelationType(OrcsApi orcsApi, IRelationTypeSide type) {
+ public static OwRelationType createRelationType(OrcsApi orcsApi, RelationTypeSide type) {
String sideAName = orcsApi.getOrcsTypes().getRelationTypes().getSideAName(type);
OwRelationType owType = OwFactory.createRelationType(type, sideAName, true);
return owType;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/ArtifactReadable.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/ArtifactReadable.java
index 5226cb8123..be7a0b8dec 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/ArtifactReadable.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/ArtifactReadable.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.data.HasLocalId;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -73,7 +73,7 @@ public interface ArtifactReadable extends ArtifactToken, HasLocalId<Integer>, Ha
<T> ResultSet<? extends AttributeReadable<T>> getAttributes(IAttributeType attributeType, DeletionFlag deletionFlag) throws OseeCoreException;
////////////////////
- int getMaximumRelationAllowed(IRelationTypeSide relationTypeSide) throws OseeCoreException;
+ int getMaximumRelationAllowed(RelationTypeSide relationTypeSide) throws OseeCoreException;
Collection<? extends IRelationType> getValidRelationTypes() throws OseeCoreException;
@@ -89,14 +89,14 @@ public interface ArtifactReadable extends ArtifactToken, HasLocalId<Integer>, Ha
ResultSet<ArtifactReadable> getChildren() throws OseeCoreException;
- ResultSet<ArtifactReadable> getRelated(IRelationTypeSide relationTypeSide) throws OseeCoreException;
+ ResultSet<ArtifactReadable> getRelated(RelationTypeSide relationTypeSide) throws OseeCoreException;
- ResultSet<ArtifactReadable> getRelated(IRelationTypeSide relationTypeSide, DeletionFlag deletionFlag) throws OseeCoreException;
+ ResultSet<ArtifactReadable> getRelated(RelationTypeSide relationTypeSide, DeletionFlag deletionFlag) throws OseeCoreException;
- boolean areRelated(IRelationTypeSide typeAndSide, ArtifactReadable readable) throws OseeCoreException;
+ boolean areRelated(RelationTypeSide typeAndSide, ArtifactReadable readable) throws OseeCoreException;
- int getRelatedCount(IRelationTypeSide typeAndSide) throws OseeCoreException;
+ int getRelatedCount(RelationTypeSide typeAndSide) throws OseeCoreException;
- String getRationale(IRelationTypeSide typeAndSide, ArtifactReadable readable) throws OseeCoreException;
+ String getRationale(RelationTypeSide typeAndSide, ArtifactReadable readable) throws OseeCoreException;
}
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java
index dba7f0e10f..280994972d 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java
@@ -15,7 +15,7 @@ import org.eclipse.osee.framework.core.data.ArtifactId;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.QueryOption;
@@ -138,14 +138,14 @@ public interface ArtifactQueryBuilder<T> {
*
* @param relationTypeSide the type to check for non-existence
*/
- T andNotExists(IRelationTypeSide relationTypeSide);
+ T andNotExists(RelationTypeSide relationTypeSide);
/**
* Search criteria that follows the relation link ending on the given side
*
* @param relationTypeSide the type to start following the link from
*/
- T andExists(IRelationTypeSide relationTypeSide);
+ T andExists(RelationTypeSide relationTypeSide);
/**
* Search criteria that checks for non-existence of a relation type
@@ -186,28 +186,28 @@ public interface ArtifactQueryBuilder<T> {
*
* @param relationTypeSide the type-side to search on
*/
- T andRelatedTo(IRelationTypeSide relationTypeSide, ArtifactReadable... artifacts);
+ T andRelatedTo(RelationTypeSide relationTypeSide, ArtifactReadable... artifacts);
/**
* Search for related artifacts
*
* @param relationTypeSide the type-side to search on
*/
- T andRelatedTo(IRelationTypeSide relationTypeSide, Collection<? extends ArtifactId> artifacts);
+ T andRelatedTo(RelationTypeSide relationTypeSide, Collection<? extends ArtifactId> artifacts);
/**
* Search for related artifacts
*
* @param relationTypeSide the type-side to search on
*/
- T andRelatedTo(IRelationTypeSide relationTypeSide, ArtifactId artifactId);
+ T andRelatedTo(RelationTypeSide relationTypeSide, ArtifactId artifactId);
/**
* Search related artifacts with specific criteria. Will only follow first level of relations
*
* @param relationTypeSide the type-side to search on
*/
- T followRelation(IRelationTypeSide relationTypeSide);
+ T followRelation(RelationTypeSide relationTypeSide);
/**
* @return DefaultHeirarchicalRootArtifact
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java
index 6894fe333e..74d34e2c7f 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.data.BranchId;
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.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.Tuple2Type;
import org.eclipse.osee.framework.core.data.Tuple3Type;
import org.eclipse.osee.framework.core.data.Tuple4Type;
@@ -134,7 +134,7 @@ public interface TransactionBuilder {
void unrelateFromAll(ArtifactId art) throws OseeCoreException;
- void unrelateFromAll(IRelationTypeSide typeSide, ArtifactId art) throws OseeCoreException;
+ void unrelateFromAll(RelationTypeSide typeSide, ArtifactId art) throws OseeCoreException;
void setRelationApplicability(ArtifactId artA, IRelationType relType, ArtifactId artB, ApplicabilityId applicId);
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 4d0dc76d6a..7dbc899b1e 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,15 +10,15 @@
*******************************************************************************/
package org.eclipse.osee.ote.define.AUTOGEN;
-import org.eclipse.osee.framework.core.data.IRelationTypeSide;
+import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
public final class OteRelationTypes {
- public static final IRelationTypeSide TEST_SCRIPT_TO_RUN_RELATION__TEST_SCRIPT =
- TokenFactory.createRelationTypeSide(RelationSide.SIDE_A, 0x2000000000000176L, "Test Case to Run Relation");
- public static final IRelationTypeSide TEST_SCRIPT_TO_RUN_RELATION__TEST_RUN = TokenFactory.createRelationTypeSide(
+ public static final RelationTypeSide TEST_SCRIPT_TO_RUN_RELATION__TEST_SCRIPT =
+ RelationTypeSide.create(RelationSide.SIDE_A, 0x2000000000000176L, "Test Case to Run Relation");
+ public static final RelationTypeSide TEST_SCRIPT_TO_RUN_RELATION__TEST_RUN = RelationTypeSide.create(
RelationSide.SIDE_B, 0x2000000000000176L, "Test Case to Run Relation");
private OteRelationTypes() {

Back to the top