diff options
Diffstat (limited to 'plugins/org.eclipse.osee.define')
7 files changed, 31 insertions, 31 deletions
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java index f34ba767caa..941d7e6ff8b 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java @@ -36,8 +36,8 @@ import org.eclipse.osee.define.traceability.report.ArtifactToRelatedArtifact; import org.eclipse.osee.define.traceability.report.ArtifactTraceCount; import org.eclipse.osee.define.traceability.report.ArtifactsWithoutRelations; import org.eclipse.osee.define.traceability.report.IReportDataCollector; +import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; -import org.eclipse.osee.framework.core.enums.IRelationEnumeration; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; @@ -330,7 +330,7 @@ public class TraceReportBlam extends AbstractBlam { private void addRelationToCheck(List<TraceTypeEnum> traceTypes, AbstractArtifactRelationReport report, boolean fromTraceUnit) { for (TraceTypeEnum traceTypeEnum : traceTypes) { - IRelationEnumeration relation = + IRelationTypeSide relation = fromTraceUnit ? traceTypeEnum.getRelatedToRequirement() : traceTypeEnum.getRelatedToTraceUnit(); report.addRelationToCheck(relation); } @@ -395,21 +395,21 @@ public class TraceReportBlam extends AbstractBlam { Used_By_Test_Unit_Trace(CoreRelationTypes.Uses__Requirement, CoreRelationTypes.Uses__TestUnit, true), Validation_By_TestProcedure(CoreRelationTypes.Validation__Requirement, CoreRelationTypes.Validation__Validator, true); - private IRelationEnumeration toReq; - private IRelationEnumeration toTraceUnit; + private IRelationTypeSide toReq; + private IRelationTypeSide toTraceUnit; private boolean isTestType; - TraceTypeEnum(IRelationEnumeration toReq, IRelationEnumeration toTraceUnit, boolean isTestType) { + TraceTypeEnum(IRelationTypeSide toReq, IRelationTypeSide toTraceUnit, boolean isTestType) { this.toReq = toReq; this.toTraceUnit = toTraceUnit; this.isTestType = isTestType; } - public IRelationEnumeration getRelatedToRequirement() { + public IRelationTypeSide getRelatedToRequirement() { return toReq; } - public IRelationEnumeration getRelatedToTraceUnit() { + public IRelationTypeSide getRelatedToTraceUnit() { return toTraceUnit; } diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java index 35a2beaf2cc..137bdbc82f2 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/UiToTestBlam.java @@ -26,8 +26,8 @@ import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.define.traceability.data.RequirementData; +import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; -import org.eclipse.osee.framework.core.enums.IRelationEnumeration; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; @@ -189,7 +189,7 @@ public class UiToTestBlam extends AbstractBlam { return toReturn; } - private void processTrace(Appendable appendable, Artifact requirement, String testType, IRelationEnumeration relationType) throws OseeCoreException { + private void processTrace(Appendable appendable, Artifact requirement, String testType, IRelationTypeSide relationType) throws OseeCoreException { String uiTitle = requirement.getName(); String uiType = requirement.getArtifactTypeName(); @@ -214,7 +214,7 @@ public class UiToTestBlam extends AbstractBlam { } } - private List<String> getTrace(Artifact testUnit, IRelationEnumeration relation) throws OseeCoreException { + private List<String> getTrace(Artifact testUnit, IRelationTypeSide relation) throws OseeCoreException { List<String> toReturn = new ArrayList<String>(); for (Artifact item : testUnit.getRelatedArtifacts(relation)) { toReturn.add(item.getName()); diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java index 5b885b73f3c..90c4f039f16 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java @@ -32,11 +32,11 @@ import org.eclipse.osee.define.traceability.data.TestUnitData; import org.eclipse.osee.define.traceability.data.TraceMark; import org.eclipse.osee.define.traceability.data.TraceUnit; import org.eclipse.osee.framework.core.data.IArtifactType; +import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.enums.DeletionFlag; -import org.eclipse.osee.framework.core.enums.IRelationEnumeration; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.model.Branch; @@ -206,7 +206,7 @@ public class TraceUnitToArtifactProcessor implements ITraceUnitProcessor { Artifact requirementArtifact = getRequirementArtifact(traceMark.getRawTraceMark(), requirementData); if (requirementArtifact != null) { - IRelationEnumeration relationType = getRelationFromTraceType(traceUnitArtifact, traceMark.getTraceType()); + IRelationTypeSide relationType = getRelationFromTraceType(traceUnitArtifact, traceMark.getTraceType()); if (relationType == null) { unknownRelationError.put(traceUnitArtifact.getArtifactTypeName(), traceMark.getTraceType()); } else if (!requirementArtifact.isRelated(relationType, traceUnitArtifact)) { @@ -240,7 +240,7 @@ public class TraceUnitToArtifactProcessor implements ITraceUnitProcessor { return traceType.equalsIgnoreCase("USES"); } - private IRelationEnumeration getRelationFromTraceType(Artifact traceUnitArtifact, String traceType) { + private IRelationTypeSide getRelationFromTraceType(Artifact traceUnitArtifact, String traceType) { if (traceUnitArtifact.isOfType(CoreArtifactTypes.TestUnit)) { if (isUsesTraceType(traceType)) { return CoreRelationTypes.Uses__TestUnit; diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractArtifactRelationReport.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractArtifactRelationReport.java index e7618524be3..d7586c400ef 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractArtifactRelationReport.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/AbstractArtifactRelationReport.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.eclipse.osee.framework.core.enums.IRelationEnumeration; +import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; /** @@ -24,12 +24,12 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; public abstract class AbstractArtifactRelationReport extends AbstractReport { private final Set<Artifact> artifactsToCheck; - private final List<IRelationEnumeration> relationsToCheck; + private final List<IRelationTypeSide> relationsToCheck; public AbstractArtifactRelationReport() { super(); this.artifactsToCheck = new HashSet<Artifact>(); - this.relationsToCheck = new ArrayList<IRelationEnumeration>(); + this.relationsToCheck = new ArrayList<IRelationTypeSide>(); } public void setArtifacts(Collection<Artifact> artifacts) { @@ -38,7 +38,7 @@ public abstract class AbstractArtifactRelationReport extends AbstractReport { } } - public void addRelationToCheck(IRelationEnumeration relation) { + public void addRelationToCheck(IRelationTypeSide relation) { if (relation != null) { this.relationsToCheck.add(relation); } @@ -48,8 +48,8 @@ public abstract class AbstractArtifactRelationReport extends AbstractReport { return artifactsToCheck.toArray(new Artifact[artifactsToCheck.size()]); } - public IRelationEnumeration[] getRelationsToCheck() { - return relationsToCheck.toArray(new IRelationEnumeration[relationsToCheck.size()]); + public IRelationTypeSide[] getRelationsToCheck() { + return relationsToCheck.toArray(new IRelationTypeSide[relationsToCheck.size()]); } @Override diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactToRelatedArtifact.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactToRelatedArtifact.java index 33d2cbf078a..a43350c13fc 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactToRelatedArtifact.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactToRelatedArtifact.java @@ -13,7 +13,7 @@ package org.eclipse.osee.define.traceability.report; import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.enums.IRelationEnumeration; +import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -34,11 +34,11 @@ public class ArtifactToRelatedArtifact extends AbstractArtifactRelationReport { return toReturn.toArray(new String[toReturn.size()]); } - public List<String[]> getRelatedRows(IRelationEnumeration[] relations, Artifact artifact) throws OseeCoreException { + public List<String[]> getRelatedRows(IRelationTypeSide[] relations, Artifact artifact) throws OseeCoreException { List<String[]> toReturn = new ArrayList<String[]>(); int maxSize = 0; List<List<String>> items = new ArrayList<List<String>>(); - for (IRelationEnumeration relationEnum : relations) { + for (IRelationTypeSide relationEnum : relations) { List<String> entries = new ArrayList<String>(); for (Artifact relArtifact : artifact.getRelatedArtifacts(relationEnum)) { entries.add(relArtifact.getName()); @@ -63,10 +63,10 @@ public class ArtifactToRelatedArtifact extends AbstractArtifactRelationReport { @Override public void process(IProgressMonitor monitor) throws OseeCoreException { notifyOnTableHeader(getHeader()); - IRelationEnumeration[] relations = getRelationsToCheck(); + IRelationTypeSide[] relations = getRelationsToCheck(); for (Artifact artifact : getArtifactsToCheck()) { String name = artifact.getName(); - for (IRelationEnumeration relationEnum : relations) { + for (IRelationTypeSide relationEnum : relations) { String typeName = relationEnum.getName(); for (Artifact relArtifact : artifact.getRelatedArtifacts(relationEnum)) { notifyOnRowData(name, typeName, relArtifact.getName()); diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactTraceCount.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactTraceCount.java index 080acfe8ab7..9dff862989d 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactTraceCount.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactTraceCount.java @@ -14,8 +14,8 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; -import org.eclipse.osee.framework.core.enums.IRelationEnumeration; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -33,7 +33,7 @@ public class ArtifactTraceCount extends AbstractArtifactRelationReport { List<String> header = new ArrayList<String>(); header.add("Name"); header.add("Type"); - for (IRelationEnumeration relation : getRelationsToCheck()) { + for (IRelationTypeSide relation : getRelationsToCheck()) { header.add(relation.getName() + " Trace Count"); } header.add("Subsystem"); @@ -55,13 +55,13 @@ public class ArtifactTraceCount extends AbstractArtifactRelationReport { public void process(IProgressMonitor monitor) throws OseeCoreException { String[] header = getHeader(); notifyOnTableHeader(header); - IRelationEnumeration[] relations = getRelationsToCheck(); + IRelationTypeSide[] relations = getRelationsToCheck(); for (Artifact art : getArtifactsToCheck()) { String[] rowData = new String[header.length]; int index = 0; rowData[index++] = art.getName(); rowData[index++] = art.getArtifactTypeName(); - for (IRelationEnumeration relationType : relations) { + for (IRelationTypeSide relationType : relations) { rowData[index++] = String.valueOf(art.getRelatedArtifactsCount(relationType)); } IAttributeType attributeType = getSubsystemAttributeType(art); diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactsWithoutRelations.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactsWithoutRelations.java index 0905f912340..0e6971d7c74 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactsWithoutRelations.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/report/ArtifactsWithoutRelations.java @@ -11,7 +11,7 @@ package org.eclipse.osee.define.traceability.report; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.enums.IRelationEnumeration; +import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; /** @@ -26,10 +26,10 @@ public class ArtifactsWithoutRelations extends AbstractArtifactRelationReport { @Override public void process(IProgressMonitor monitor) { notifyOnTableHeader("Item Name", "Type"); - IRelationEnumeration[] relations = getRelationsToCheck(); + IRelationTypeSide[] relations = getRelationsToCheck(); for (Artifact artifact : getArtifactsToCheck()) { int count = 0; - for (IRelationEnumeration relation : relations) { + for (IRelationTypeSide relation : relations) { count += artifact.getRelatedArtifactsCount(relation); } if (count <= 0) { |