diff options
author | Audrey Denk | 2022-06-14 00:38:17 +0000 |
---|---|---|
committer | Audrey Denk | 2022-06-14 00:38:17 +0000 |
commit | bba17004bb1bb7e2d740be1828c578a58b34e9b9 (patch) | |
tree | 21d555c23fd5a31f745f4bfb3902d3044baf6df3 | |
parent | dc17b39fb380f043bfb8705cdf10a38765316ed9 (diff) | |
download | org.eclipse.osee-mim_ptype_rework.tar.gz org.eclipse.osee-mim_ptype_rework.tar.xz org.eclipse.osee-mim_ptype_rework.zip |
feature[TW20770]: Remove PlatformType related code from CoreArtifactTypes and CoreRelationTypesmim_ptype_rework
Change-Id: Iee749e47f39f06246b72f84e9397d26958f07b82
Signed-off-by: Audrey Denk <audrey.e.denk@boeing.com>
2 files changed, 7 insertions, 14 deletions
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java index 41ca3698680..116d58ecd08 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java @@ -239,11 +239,7 @@ public interface CoreArtifactTypes { .zeroOrOne(GeneralStringData)); ArtifactTypeToken InterfaceDataElement = osee.add(osee.artifactType(2455059983007225765L, "Interface DataElement", false, Artifact) .zeroOrOne(InterfaceElementAlterable) - .zeroOrOne(Notes)); - ArtifactTypeToken InterfaceDataElementArray = osee.add(osee.artifactType(6360154518785980502L, "Interface DataElement Array", false, InterfaceDataElement) - .exactlyOne(InterfaceElementIndexStart) - .exactlyOne(InterfaceElementIndexEnd)); - ArtifactTypeToken InterfacePlatformType = osee.add(osee.artifactType(6360154518785980503L, "Interface Platform Type", false, Artifact) + .zeroOrOne(Notes) .exactlyOne(InterfaceLogicalType) .exactlyOne(InterfacePlatformTypeBitSize) .exactlyOne(InterfacePlatformType2sComplement) @@ -257,6 +253,9 @@ public interface CoreArtifactTypes { .zeroOrOne(InterfacePlatformTypeAnalogAccuracy) .zeroOrOne(InterfacePlatformTypeValidRangeDescription) .zeroOrOne(InterfacePlatformTypeEnumLiteral)); + ArtifactTypeToken InterfaceDataElementArray = osee.add(osee.artifactType(6360154518785980502L, "Interface DataElement Array", false, InterfaceDataElement) + .exactlyOne(InterfaceElementIndexStart) + .exactlyOne(InterfaceElementIndexEnd)); ArtifactTypeToken InterfaceEnum = osee.add(osee.artifactType(2455059983007225793L, "Interface Enumeration", false, Artifact) .exactlyOne(InterfaceEnumOrdinal)); ArtifactTypeToken InterfaceEnumSet = osee.add(osee.artifactType(2455059983007225791L, "Interface Enumeration Set", false, Artifact)); 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 f9e01126404..3c4d9b502a0 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 @@ -31,7 +31,6 @@ import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.InterfaceE import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.InterfaceEnumSet; import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.InterfaceMessage; import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.InterfaceNode; -import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.InterfacePlatformType; import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.InterfaceStructure; import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.InterfaceSubMessage; import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.Requirement; @@ -150,19 +149,14 @@ public interface CoreRelationTypes { RelationTypeSide InterfaceStructureContent_Structure = RelationTypeSide.create(InterfaceStructureContent, SIDE_A); RelationTypeSide InterfaceStructureContent_DataElement = RelationTypeSide.create(InterfaceStructureContent, SIDE_B); - RelationTypeToken InterfaceElementPlatformType = osee.addNewRelationType(3899709087455064781L, "Interface Element Platform Type", MANY_TO_MANY, RelationSorter.LEXICOGRAPHICAL_ASC, InterfaceDataElement, "Interface Data Element", InterfacePlatformType, "Interface Platform Type"); - RelationTypeSide InterfaceElementPlatformType_Element = RelationTypeSide.create(InterfaceElementPlatformType, SIDE_A); - RelationTypeSide InterfaceElementPlatformType_PlatformType = RelationTypeSide.create(InterfaceElementPlatformType, SIDE_B); - - RelationTypeToken InterfacePlatformTypeEnumeration = osee.addNewRelationType(2455059983007225794L, "Interface Platform Type Enumeration Set", MANY_TO_MANY, RelationSorter.USER_DEFINED, InterfacePlatformType, "Interface Platform Type", InterfaceEnumSet, "Interface Enumeration Set"); - RelationTypeSide InterfacePlatformTypeEnumeration_Element = RelationTypeSide.create(InterfacePlatformTypeEnumeration, SIDE_A); - RelationTypeSide InterfacePlatformTypeEnumeration_EnumerationSet = RelationTypeSide.create(InterfacePlatformTypeEnumeration, SIDE_B); + RelationTypeToken InterfaceElementEnumeration = osee.addNewRelationType(2455059983007225794L, "Interface Element Enumeration Set", MANY_TO_MANY, RelationSorter.USER_DEFINED, InterfaceDataElement, "Interface DataElement", InterfaceEnumSet, "Interface Enumeration Set"); + RelationTypeSide InterfaceElementEnumeration_Element = RelationTypeSide.create(InterfaceElementEnumeration, SIDE_A); + RelationTypeSide InterfaceElementEnumeration_EnumerationSet = RelationTypeSide.create(InterfaceElementEnumeration, SIDE_B); RelationTypeToken InterfaceEnumeration = osee.addNewRelationType(2455059983007225795L, "Interface Enumeration Definition", MANY_TO_MANY, RelationSorter.USER_DEFINED, InterfaceEnumSet, "Interface Enumeration Set", InterfaceEnum, "Interface Enumeration"); RelationTypeSide InterfaceEnumeration_EnumerationSet = RelationTypeSide.create(InterfaceEnumeration, SIDE_A); RelationTypeSide InterfaceEnumeration_EnumerationState = RelationTypeSide.create(InterfaceEnumeration, SIDE_B); - RelationTypeToken PlConfigurationGroup = osee.add(674505523757332017L, "Product Line Configuration Group", MANY_TO_MANY, RelationSorter.LEXICOGRAPHICAL_ASC, GroupArtifact, "Group", BranchView, "BranchView"); RelationTypeSide PlConfigurationGroup_Group = RelationTypeSide.create(PlConfigurationGroup, SIDE_A); RelationTypeSide PlConfigurationGroup_BranchView = RelationTypeSide.create(PlConfigurationGroup, SIDE_B); |