Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpotterc0k2013-01-30 19:26:40 +0000
committerRoberto E. Escobar2013-01-30 19:26:40 +0000
commit40b7a46744e8a49194bb30fe2c682634e47f1cdc (patch)
tree7157dda34694ec7a6a4c052ad11336c22e8fde76
parentdf4beeb09fcd8e8a90882dd09bfe7cbf510382b7 (diff)
downloadorg.eclipse.osee-40b7a46744e8a49194bb30fe2c682634e47f1cdc.tar.gz
org.eclipse.osee-40b7a46744e8a49194bb30fe2c682634e47f1cdc.tar.xz
org.eclipse.osee-40b7a46744e8a49194bb30fe2c682634e47f1cdc.zip
feature[ats_P63MP]: Change artifacts and attributes for DOORS import
-rw-r--r--plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/PopulateDemoActions.java16
-rw-r--r--plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/internal/AddRequirementData.java12
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactImportWizardTest.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSubsystemToDesignTraceability.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSystemLevelSSDD.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemFullTraceReport.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemRequirementVerificationLevel.java2
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemToLowLevelReqTraceReport.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SystemSubsystemReport.java16
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/RelationImporter.java2
-rw-r--r--plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java10
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee69
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java14
16 files changed, 117 insertions, 53 deletions
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 83dff9800b5..1689b03ef13 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
@@ -348,10 +348,10 @@ public class PopulateDemoActions extends XNavigateItemAction {
try {
importRequirements(DemoSawBuilds.SAW_Bld_1, CoreArtifactTypes.SoftwareRequirement.getName() + "s",
CoreArtifactTypes.SoftwareRequirement, "support/SAW-SoftwareRequirements.xml");
- importRequirements(DemoSawBuilds.SAW_Bld_1, CoreArtifactTypes.SystemRequirement.getName() + "s",
- CoreArtifactTypes.SystemRequirement, "support/SAW-SystemRequirements.xml");
- importRequirements(DemoSawBuilds.SAW_Bld_1, CoreArtifactTypes.SubsystemRequirement.getName() + "s",
- CoreArtifactTypes.SubsystemRequirement, "support/SAW-SubsystemRequirements.xml");
+ importRequirements(DemoSawBuilds.SAW_Bld_1, CoreArtifactTypes.SystemRequirementMSWord.getName() + "s",
+ CoreArtifactTypes.SystemRequirementMSWord, "support/SAW-SystemRequirements.xml");
+ importRequirements(DemoSawBuilds.SAW_Bld_1, CoreArtifactTypes.SubsystemRequirementMSWord.getName() + "s",
+ CoreArtifactTypes.SubsystemRequirementMSWord, "support/SAW-SubsystemRequirements.xml");
} catch (Exception ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
}
@@ -395,7 +395,7 @@ public class PopulateDemoActions extends XNavigateItemAction {
private void demoDbTraceabilityTx(SkynetTransaction transaction, IOseeBranch branch) {
try {
Collection<Artifact> systemArts =
- DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SystemRequirement, "Robot", branch);
+ DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SystemRequirementMSWord, "Robot", branch);
Collection<Artifact> component =
DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.Component, "API", branch);
@@ -403,10 +403,10 @@ public class PopulateDemoActions extends XNavigateItemAction {
component.addAll(DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.Component, "Sensor", branch));
Collection<Artifact> subSystemArts =
- DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirement, "Robot", branch);
- subSystemArts.addAll(DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirement, "Video",
+ DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirementMSWord, "Robot", branch);
+ subSystemArts.addAll(DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirementMSWord, "Video",
branch));
- subSystemArts.addAll(DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirement,
+ subSystemArts.addAll(DemoDbUtil.getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirementMSWord,
"Interface", branch));
Collection<Artifact> softArts =
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 120ae57ed3b..6ba3e8e9b4b 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
@@ -65,8 +65,8 @@ public class AddRequirementData implements IDbInitializationTask {
IOseeBranch branch = DemoBranches.SAW_Bld_1;
importRequirements(branch, CoreArtifactTypes.SoftwareRequirement, "support/SAW-SoftwareRequirements.xml");
- importRequirements(branch, CoreArtifactTypes.SystemRequirement, "support/SAW-SystemRequirements.xml");
- importRequirements(branch, CoreArtifactTypes.SubsystemRequirement, "support/SAW-SubsystemRequirements.xml");
+ importRequirements(branch, CoreArtifactTypes.SystemRequirementMSWord, "support/SAW-SystemRequirements.xml");
+ importRequirements(branch, CoreArtifactTypes.SubsystemRequirementMSWord, "support/SAW-SubsystemRequirements.xml");
SkynetTransaction demoDbTraceability =
TransactionManager.createTransaction(branch, "Populate Demo DB - Create Traceability");
@@ -139,16 +139,16 @@ public class AddRequirementData implements IDbInitializationTask {
private void demoDbTraceabilityTx(SkynetTransaction transaction, IOseeBranch branch) throws Exception {
Collection<Artifact> systemArts =
- getArtTypeRequirements(DEBUG, CoreArtifactTypes.SystemRequirement, "Robot", branch);
+ getArtTypeRequirements(DEBUG, CoreArtifactTypes.SystemRequirementMSWord, "Robot", branch);
Collection<Artifact> component = getArtTypeRequirements(DEBUG, CoreArtifactTypes.Component, "API", branch);
component.addAll(getArtTypeRequirements(DEBUG, CoreArtifactTypes.Component, "Hardware", branch));
component.addAll(getArtTypeRequirements(DEBUG, CoreArtifactTypes.Component, "Sensor", branch));
Collection<Artifact> subSystemArts =
- getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirement, "Robot", branch);
- subSystemArts.addAll(getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirement, "Video", branch));
- subSystemArts.addAll(getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirement, "Interface", branch));
+ getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirementMSWord, "Robot", branch);
+ subSystemArts.addAll(getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirementMSWord, "Video", branch));
+ subSystemArts.addAll(getArtTypeRequirements(DEBUG, CoreArtifactTypes.SubsystemRequirementMSWord, "Interface", branch));
Collection<Artifact> softArts =
getArtTypeRequirements(DEBUG, CoreArtifactTypes.SoftwareRequirement, "Robot", branch);
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactImportWizardTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactImportWizardTest.java
index 32f4f356270..951fe4113ac 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactImportWizardTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactImportWizardTest.java
@@ -190,14 +190,14 @@ public final class ArtifactImportWizardTest {
Assert.assertTrue(inputExcelFile.exists());
try {
IArtifactImportResolver resolver =
- MatchingStrategy.GUID.getResolver(CoreArtifactTypes.SystemRequirement, null, true, true);
+ MatchingStrategy.GUID.getResolver(CoreArtifactTypes.SystemRequirementMSWord, null, true, true);
RoughArtifactCollector collector = new RoughArtifactCollector(new RoughArtifact(RoughArtifactKind.PRIMARY));
collector.reset();
IOperation operation =
ArtifactImportOperationFactory.createOperation(inputExcelFile, myRootArtifact, null,
- new ExcelArtifactExtractor(), resolver, collector, Arrays.asList(CoreArtifactTypes.SystemRequirement),
+ new ExcelArtifactExtractor(), resolver, collector, Arrays.asList(CoreArtifactTypes.SystemRequirementMSWord),
true, true, false);
Operations.executeWorkAndCheckStatus(operation);
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSubsystemToDesignTraceability.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSubsystemToDesignTraceability.java
index 5ce2d8cad7c..62b8d7c41a2 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSubsystemToDesignTraceability.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSubsystemToDesignTraceability.java
@@ -64,7 +64,7 @@ public class PublishSubsystemToDesignTraceability extends AbstractBlam {
monitor.worked(10);
monitor.subTask("Aquiring Subsystem Requirements"); // bulk load for performance reasons
- ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SubsystemRequirement, branch);
+ ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SubsystemRequirementMSWord, branch);
monitor.worked(60);
int workIncrement = 30 / subsystems.size();
@@ -94,7 +94,7 @@ public class PublishSubsystemToDesignTraceability extends AbstractBlam {
excelWriter.writeCell(subsystemRequirement.getSoleAttributeValue(CoreAttributeTypes.ParagraphNumber, ""));
excelWriter.writeCell(subsystemRequirement.getName());
- if (subsystemRequirement.isOfType(CoreArtifactTypes.SubsystemRequirement)) {
+ if (subsystemRequirement.isOfType(CoreArtifactTypes.SubsystemRequirementMSWord)) {
boolean loopNeverRan = true;
for (Artifact subsystemDesign : subsystemRequirement.getRelatedArtifacts(CoreRelationTypes.Design__Design)) {
if (subsystemDesign.isOfType(CoreArtifactTypes.SubsystemDesign)) {
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSystemLevelSSDD.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSystemLevelSSDD.java
index 9e113b84d24..08a475a8369 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSystemLevelSSDD.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSystemLevelSSDD.java
@@ -77,7 +77,7 @@ public class PublishSystemLevelSSDD extends AbstractBlam {
ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.Component, branch);
monitor.subTask("Aquiring System Requirements");
- ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SystemRequirement, branch);
+ ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SystemRequirementMSWord, branch);
Artifact root = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(branch);
sysReqs = root.getChild(Requirements.SYSTEM_REQUIREMENTS).getDescendants();
@@ -128,7 +128,7 @@ public class PublishSystemLevelSSDD extends AbstractBlam {
private void writeSystemRequirementAllocationBySubsystem(Artifact subsystem) throws IOException, OseeCoreException {
excelWriter.startSheet(subsystem.getName(), 200);
excelWriter.writeRow("System Requirements Allocated to the " + subsystem.getName());
- excelWriter.writeRow(CoreAttributeTypes.ParagraphNumber.getName(), CoreArtifactTypes.SystemRequirement.getName(),
+ excelWriter.writeRow(CoreAttributeTypes.ParagraphNumber.getName(), CoreArtifactTypes.SystemRequirementMSWord.getName(),
"Notes <rationale>");
for (Artifact systemRequirement : subsystemToRequirements.getValues(subsystem)) {
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemFullTraceReport.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemFullTraceReport.java
index bc353f90015..0e61bbd5aee 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemFullTraceReport.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemFullTraceReport.java
@@ -122,8 +122,8 @@ public class SubsystemFullTraceReport extends AbstractBlam {
private void writeMainSheet(List<Artifact> artifacts) throws IOException, OseeCoreException {
writer.startSheet("report", 18);
- writer.writeRow(CoreArtifactTypes.SystemRequirement.getName(), null, null,
- CoreArtifactTypes.SubsystemRequirement.getName(), null, null, null, null, null,
+ writer.writeRow(CoreArtifactTypes.SystemRequirementMSWord.getName(), null, null,
+ CoreArtifactTypes.SubsystemRequirementMSWord.getName(), null, null, null, null, null,
CoreArtifactTypes.SoftwareRequirement.getName());
writer.writeRow("Paragraph #", "Requirement Name", "Requirement Text", "Paragraph #", "Requirement Name",
"Requirement Text", "Subsystem", CoreAttributeTypes.QualificationMethod.getName(), "Test Procedure",
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemRequirementVerificationLevel.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemRequirementVerificationLevel.java
index 2787d25c459..34586b1006c 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemRequirementVerificationLevel.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemRequirementVerificationLevel.java
@@ -58,7 +58,7 @@ public class SubsystemRequirementVerificationLevel extends AbstractBlam {
private void loadFields(VariableMap variableMap) throws OseeCoreException {
branch = variableMap.getBranch("Branch");
- subsystemRequirements = ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SubsystemRequirement, branch);
+ subsystemRequirements = ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SubsystemRequirementMSWord, branch);
bulkRequirements =
RelationManager.getRelatedArtifacts(subsystemRequirements, 1, CoreRelationTypes.Requirement_Trace__Lower_Level);
report = new StringBuilder(AHTML.beginMultiColumnTable(100, 1));
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemToLowLevelReqTraceReport.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemToLowLevelReqTraceReport.java
index a1a560c64e4..bbcfdf73ea3 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemToLowLevelReqTraceReport.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemToLowLevelReqTraceReport.java
@@ -86,7 +86,7 @@ public class SubsystemToLowLevelReqTraceReport extends AbstractBlam {
monitor.subTask("Loading Higher Level Requirements"); // bulk load to improve performance
monitor.worked(1);
- ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SubsystemRequirement, branch);
+ ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SubsystemRequirementMSWord, branch);
monitor.worked(30);
Artifact root = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(branch);
@@ -161,7 +161,7 @@ public class SubsystemToLowLevelReqTraceReport extends AbstractBlam {
excelWriter.writeRow();
excelWriter.writeRow();
excelWriter.writeRow("5.2." + count++ + " " + subSysName + " Requirements Allocation Traceability to Lower Level Requirements");
- excelWriter.writeRow(CoreArtifactTypes.SubsystemRequirement.getName(), null,
+ excelWriter.writeRow(CoreArtifactTypes.SubsystemRequirementMSWord.getName(), null,
"Traceable Lower Level Requirements", null);
excelWriter.writeRow("Paragraph #", "Paragraph Title", "Paragraph #", "Paragraph Title");
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SystemSubsystemReport.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SystemSubsystemReport.java
index eedbd87f591..536dd6bdbbb 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SystemSubsystemReport.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SystemSubsystemReport.java
@@ -107,10 +107,10 @@ public class SystemSubsystemReport extends AbstractBlam {
ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.Component, branch);
monitor.subTask("Aquiring System Requirements");
- ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SystemRequirement, branch);
+ ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SystemRequirementMSWord, branch);
monitor.subTask("Aquiring Subsystem Requirements"); // bulk load for performance reasons
- ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SubsystemRequirement, branch);
+ ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SubsystemRequirementMSWord, branch);
Artifact root = OseeSystemArtifacts.getDefaultHierarchyRootArtifact(branch);
Artifact subsysTopFolder = root.getChild(Requirements.SUBSYSTEM_REQUIREMENTS);
@@ -237,7 +237,7 @@ public class SystemSubsystemReport extends AbstractBlam {
row[SubsystemCompletness.subSys.ordinal()] = artifact.getSoleAttributeValue(CoreAttributeTypes.Subsystem, "");
- if (artifact.isOfType(CoreArtifactTypes.SubsystemRequirement)) {
+ if (artifact.isOfType(CoreArtifactTypes.SubsystemRequirementMSWord)) {
row[SubsystemCompletness.qualMethod.ordinal()] =
artifact.getAttributesToStringSorted(CoreAttributeTypes.QualificationMethod);
} else {
@@ -266,7 +266,7 @@ public class SystemSubsystemReport extends AbstractBlam {
row[0] = artifact.getSoleAttributeValue(CoreAttributeTypes.ParagraphNumber, "");
row[1] = artifact.getName();
- if (artifact.isOfType(CoreArtifactTypes.SubsystemRequirement)) {
+ if (artifact.isOfType(CoreArtifactTypes.SubsystemRequirementMSWord)) {
for (Artifact component : artifact.getRelatedArtifacts(CoreRelationTypes.Allocation__Component)) {
components.add(component);
row[2] = component.getName();
@@ -328,7 +328,7 @@ public class SystemSubsystemReport extends AbstractBlam {
private void countDescendants(String subSysName, Set<Artifact> subsysReqs, Artifact artifact, Set<String> missingAllocationGuids) throws OseeCoreException {
for (Artifact child : artifact.getChildren()) {
- if (child.isOfType(CoreArtifactTypes.SubsystemRequirement)) {
+ if (child.isOfType(CoreArtifactTypes.SubsystemRequirementMSWord)) {
subsysDescendantCount++;
String selectedSubSystem = child.getSoleAttributeValue(CoreAttributeTypes.Subsystem, "");
@@ -362,7 +362,7 @@ public class SystemSubsystemReport extends AbstractBlam {
excelWriter.startSheet(getShortSheetName(subSysName, "System Trace"), 4);
excelWriter.writeRow(subSysName, "System To Subsystem Trace");
- excelWriter.writeRow(CoreArtifactTypes.SystemRequirement.getName(), null, "Traceable Subsystem Requirement", null);
+ excelWriter.writeRow(CoreArtifactTypes.SystemRequirementMSWord.getName(), null, "Traceable Subsystem Requirement", null);
excelWriter.writeRow("Paragraph #", "Paragraph Title", "Paragraph #", "Paragraph Title");
String[] row = new String[4];
@@ -401,7 +401,7 @@ public class SystemSubsystemReport extends AbstractBlam {
Set<Artifact> subsysReqs = subsysToSubsysReqsMap.get(subSysName);
excelWriter.writeRow(subSysName, "Subsystem To System Trace");
- excelWriter.writeRow(CoreArtifactTypes.SubsystemRequirement.getName(), null, null,
+ excelWriter.writeRow(CoreArtifactTypes.SubsystemRequirementMSWord.getName(), null, null,
"Traceable System Requirement", null);
excelWriter.writeRow("Paragraph #", "Paragraph Title", CoreAttributeTypes.QualificationMethod.getName(),
"Paragraph #", "Paragraph Title");
@@ -411,7 +411,7 @@ public class SystemSubsystemReport extends AbstractBlam {
for (Artifact subsysReq : subsysReqs) {
row[0] = subsysReq.getSoleAttributeValue(CoreAttributeTypes.ParagraphNumber, "");
row[1] = subsysReq.getName();
- if (subsysReq.isOfType(CoreArtifactTypes.SubsystemRequirement)) {
+ if (subsysReq.isOfType(CoreArtifactTypes.SubsystemRequirementMSWord)) {
row[2] = subsysReq.getAttributesToStringSorted(CoreAttributeTypes.QualificationMethod);
} else {
row[2] = "N/A: " + subsysReq.getArtifactTypeName();
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/RelationImporter.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/RelationImporter.java
index a890a0bee4a..f97f4ce889c 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/RelationImporter.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/RelationImporter.java
@@ -63,7 +63,7 @@ public class RelationImporter implements RowProcessor {
}
monitor.worked(1);
Collection<Artifact> artifacts =
- ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.SubsystemRequirement,
+ ArtifactQuery.getArtifactListFromTypeAndAttribute(CoreArtifactTypes.SubsystemRequirementMSWord,
CoreAttributeTypes.ParagraphNumber, row[1], branch);
Artifact rowArtifact = getSoleArtifact(artifacts);
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java
index d972be35c72..e82c4753019 100644
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java
+++ b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java
@@ -12,7 +12,6 @@ package org.eclipse.osee.display.presenter;
import java.util.Arrays;
import java.util.List;
-
import org.eclipse.osee.display.api.search.ArtifactProvider;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -29,8 +28,8 @@ public class ArtifactFilter implements Filter<ArtifactReadable> {
private static final IArtifactType[] allowedTypes = {
CoreArtifactTypes.SoftwareRequirement,
- CoreArtifactTypes.SubsystemRequirement,
- CoreArtifactTypes.SystemRequirement,
+ CoreArtifactTypes.SubsystemRequirementMSWord,
+ CoreArtifactTypes.SystemRequirementMSWord,
CoreArtifactTypes.IndirectSoftwareRequirement,
CoreArtifactTypes.TestUnit};
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 bff51e81df4..3b77445b060 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
@@ -21,6 +21,8 @@ public final class CoreArtifactTypes {
// @formatter:off
public static final IArtifactType AccessControlModel = TokenFactory.createArtifactType(0x0000000000000002L, "Access Control Model");
public static final IArtifactType AbstractSoftwareRequirement = TokenFactory.createArtifactType(0x0000000000000017L, "Abstract Software Requirement");
+ public static final IArtifactType AbstractSystemRequirement = TokenFactory.createArtifactType(0x000000000000101EL, "Abstract System Requirement");
+ public static final IArtifactType AbstractSubsystemRequirement = TokenFactory.createArtifactType(0x000000000001001EL, "Abstract Subsystem Requirement");
public static final IArtifactType AbstractTestResult = TokenFactory.createArtifactType(0x0000000000000026L, "Abstract Test Result");
public static final IArtifactType Artifact = TokenFactory.createArtifactType(0x0000000000000001L, "Artifact");
public static final IArtifactType CodeUnit = TokenFactory.createArtifactType(0x000000000000003AL, "Code Unit");
@@ -33,6 +35,8 @@ public final class CoreArtifactTypes {
public static final IArtifactType GlobalPreferences = TokenFactory.createArtifactType(0x0000000000000003L, "Global Preferences");
public static final IArtifactType HardwareRequirement = TokenFactory.createArtifactType(0x0000000000000021L, "Hardware Requirement");
public static final IArtifactType Heading = TokenFactory.createArtifactType(0x0000000000000038L, "Heading");
+ public static final IArtifactType HTMLArtifact = TokenFactory.createArtifactType(0x000000000000031EL, "HTML Artifact");
+ public static final IArtifactType ImageArtifact = TokenFactory.createArtifactType(0x0000000000000320L, "Image Artifact");
public static final IArtifactType IndirectSoftwareRequirement = TokenFactory.createArtifactType(0x0000000000000019L, "Indirect Software Requirement");
public static final IArtifactType InterfaceRequirement = TokenFactory.createArtifactType(0x0000000000000020L, "Interface Requirement");
public static final IArtifactType ImplementationDetails = TokenFactory.createArtifactType(0x000000000000001AL, "Implementation Details");
@@ -49,11 +53,13 @@ public final class CoreArtifactTypes {
public static final IArtifactType SoftwareRequirementProcedure = TokenFactory.createArtifactType(0x000000000000001BL, "Software Requirement Procedure");
public static final IArtifactType SubsystemDesign = TokenFactory.createArtifactType(0x000000000000002BL, "Subsystem Design");
public static final IArtifactType SubsystemFunction = TokenFactory.createArtifactType(0x0000000000000024L, "Subsystem Function");
- public static final IArtifactType SubsystemRequirement = TokenFactory.createArtifactType(0x000000000000001FL, "Subsystem Requirement");
+ public static final IArtifactType SubsystemRequirementMSWord = TokenFactory.createArtifactType(0x000000000000001FL, "Subsystem Requirement - MS Word");
+ public static final IArtifactType SubsystemRequirementHTML = TokenFactory.createArtifactType(0x000000000000031BL, "Subsystem Requirement - HTML");
public static final IArtifactType SupportingContent = TokenFactory.createArtifactType(0x0000000000000031L, "Supporting Content");
public static final IArtifactType SystemDesign = TokenFactory.createArtifactType(0x000000000000002CL, "System Design");
public static final IArtifactType SystemFunction = TokenFactory.createArtifactType(0x0000000000000023L, "System Function");
- public static final IArtifactType SystemRequirement = TokenFactory.createArtifactType(0x000000000000001EL, "System Requirement");
+ public static final IArtifactType SystemRequirementMSWord = TokenFactory.createArtifactType(0x000000000000001EL, "System Requirement - MS Word");
+ public static final IArtifactType SystemRequirementHTML = TokenFactory.createArtifactType(0x000000000000031AL, "System Requirement - HTML");
public static final IArtifactType TestCase = TokenFactory.createArtifactType(0x0000000000000052L, "Test Case");
public static final IArtifactType TestInformationSheet = TokenFactory.createArtifactType(0x0000000000000029L, "Test Information Sheet");
public static final IArtifactType TestPlanElement = TokenFactory.createArtifactType(0x0000000000000025L, "Test Plan Element");
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java
index d554436a68d..f8348372610 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreAttributeTypes.java
@@ -52,6 +52,8 @@ public final class CoreAttributeTypes {
public static final IAttributeType GfeCfe = TokenFactory.createAttributeType(0x10000000000000A8L, "GFE / CFE");
public static final IAttributeType Hazard = TokenFactory.createAttributeType(0x10000000000000A2L, "Hazard");
public static final IAttributeType HazardSeverity = TokenFactory.createAttributeType(0x10000000000000A5L, "Hazard Severity");
+ public static final IAttributeType HTMLContent = TokenFactory.createAttributeType(0x100000000000037DL, "HTML Content");
+ public static final IAttributeType ImageContent = TokenFactory.createAttributeType(0x100000000000037CL, "Image Content");
public static final IAttributeType LegacyId = TokenFactory.createAttributeType(0x1000000000000083L, "Legacy Id");
public static final IAttributeType MobilePhone = TokenFactory.createAttributeType(0x1000000000000068L, "Mobile Phone");
public static final IAttributeType Name = TokenFactory.createAttributeType(0x1000000000000070L, "Name");
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee b/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee
index f50332408b0..c538180e59a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee
+++ b/plugins/org.eclipse.osee.framework.skynet.core/support/OseeTypes_Framework.osee
@@ -484,6 +484,16 @@ attributeType "Native Content" extends CompressedContentAttribute {
fileExtension "bin"
}
+attributeType "Image Content" extends CompressedContentAttribute {
+ guid "AA5h+kkRmm7I4TzZmVwA"
+ uuid 0x100000000000037C
+ dataProvider UriAttributeDataProvider
+ min 0
+ max unlimited
+ description "Binary Image content"
+ fileExtension "bin"
+}
+
attributeType "Plain Text Content" extends StringAttribute {
guid "ALCoFaWDHHVgdAf2vOgA"
uuid 0x100000000000037A
@@ -494,6 +504,17 @@ attributeType "Plain Text Content" extends StringAttribute {
fileExtension "txt"
}
+attributeType "HTML Content" extends StringAttribute {
+ guid "AAPGqIWsgnaSPB5p4KAA"
+ uuid 0x000000000000037D
+ dataProvider UriAttributeDataProvider
+ min 0
+ max unlimited
+ taggerId XmlAttributeTaggerProvider
+ description "HTML format text must be a valid xhtml file"
+ fileExtension "html"
+}
+
attributeType "Word Template Content" extends WordAttribute {
guid "AAMFEcfcGS2V3SqQN2wA"
uuid 0x100000000000007A
@@ -576,6 +597,22 @@ abstract artifactType "Native Artifact" extends "Artifact" {
attribute "Native Content"
}
+artifactType "HTML Artifact" extends "Artifact" {
+ guid "AATyFmmwZzItgwtxImAA"
+ uuid 0x000000000000031E
+ attribute "Paragraph Number"
+ attribute "HTML Content"
+ attribute "Image Content"
+ attribute "PublishInline"
+}
+
+artifactType "Image Artifact" extends "Artifact" {
+ guid "ABpsLRWluR_gZraQj6wA"
+ uuid 0x0000000000000320
+ attribute "Paragraph Number"
+ attribute "Image Content"
+}
+
attributeType "Content URL" extends StringAttribute {
guid "AAMFEcIP+U+ML_gzH7AA"
uuid 0x100000000000007C
@@ -698,9 +735,9 @@ artifactType "Software Requirement Data Definition" extends "Indirect Software R
uuid 0x0000000000000319
}
-artifactType "System Requirement" extends "Requirement" , "MS Word Template" {
- guid "AAMFDiSTcDGdUd9+tHAA"
- uuid 0x000000000000001E
+abstract artifactType "Abstract System Requirement" extends "Requirement" {
+ guid "AAVaC7M+cBb4ksLwy1gA"
+ uuid 0x000000000000031C
attribute "Legacy Id"
attribute "Verification Level"
attribute "Effectivity"
@@ -708,15 +745,35 @@ artifactType "System Requirement" extends "Requirement" , "MS Word Template" {
attribute "Verification Event"
}
-artifactType "Subsystem Requirement" extends "Requirement" , "MS Word Template" {
- guid "AAMFDiN9KiAkhuLqOhQA"
- uuid 0x000000000000001F
+artifactType "System Requirement - MS Word" extends "Abstract System Requirement" , "MS Word Template" {
+ guid "AAMFDiSTcDGdUd9+tHAA"
+ uuid 0x000000000000001E
+}
+
+artifactType "System Requirement - HTML" extends "Abstract System Requirement" , "HTML Artifact" {
+ guid "AAWAvGX_v3sdjnOGOrAA"
+ uuid 0x000000000000031A
+}
+
+abstract artifactType "Abstract Subsystem Requirement" extends "Requirement" {
+ guid "AARxa7RcITBOilT50gAA"
+ uuid 0x000000000000031D
attribute "Legacy Id"
attribute "Verification Level"
attribute "Verification Event"
attribute "Effectivity"
}
+artifactType "Subsystem Requirement - MS Word" extends "Abstract Subsystem Requirement" , "MS Word Template" {
+ guid "AAMFDiN9KiAkhuLqOhQA"
+ uuid 0x000000000000001F
+}
+
+artifactType "Subsystem Requirement - HTML" extends "Abstract Subsystem Requirement" , "HTML Artifact" {
+ guid "AAS+1esqZlCSEheTPOgA"
+ uuid 0x000000000000031B
+}
+
artifactType "Interface Requirement" extends "Requirement" , "MS Word Template" {
guid "AAMFDjgcukv7xEsPf2QA"
uuid 0x0000000000000020
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java
index 5bbda10bc82..85ca3e65e21 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java
@@ -309,7 +309,7 @@ public class ArtifactImportPage extends WizardDataTransferPage {
return sourceFile;
}
- private IArtifactExtractor getArtifactParser() {
+ public IArtifactExtractor getArtifactParser() {
return parserSelectPanel.getArtifactExtractor();
}
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java
index ebab15aae20..4764d099a05 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java
@@ -203,8 +203,8 @@ public class OrcsQueryTest {
Assert.assertEquals(7, builder.getCount());
List<ArtifactReadable> artifacts = builder.getResults().getList();
Assert.assertEquals(7, artifacts.size());
- checkContainsTypes(artifacts, CoreArtifactTypes.Folder, CoreArtifactTypes.SubsystemRequirement,
- CoreArtifactTypes.SystemRequirement);
+ checkContainsTypes(artifacts, CoreArtifactTypes.Folder, CoreArtifactTypes.SubsystemRequirementMSWord,
+ CoreArtifactTypes.SystemRequirementMSWord);
builder.andIsOfType(CoreArtifactTypes.Folder);
Assert.assertEquals(4, builder.getCount());
@@ -222,12 +222,12 @@ public class OrcsQueryTest {
//////////////////////
QueryBuilder builder1 = factory.fromBranch(TestBranches.SAW_Bld_1);
builder1.and(CoreAttributeTypes.Name, Operator.EQUAL, "%Requirement%");
- builder1.andIsOfType(CoreArtifactTypes.SubsystemRequirement);
+ builder1.andIsOfType(CoreArtifactTypes.SubsystemRequirementMSWord);
Assert.assertEquals(1, builder1.getCount());
List<ArtifactReadable> subSystemReqs = builder1.getResults().getList();
Assert.assertEquals(1, subSystemReqs.size());
Assert.assertEquals("Subsystem Requirements", subSystemReqs.get(0).getName());
- checkContainsTypes(subSystemReqs, CoreArtifactTypes.SubsystemRequirement);
+ checkContainsTypes(subSystemReqs, CoreArtifactTypes.SubsystemRequirementMSWord);
//////////////////////
QueryBuilder builder2 = factory.fromBranch(TestBranches.SAW_Bld_1);
@@ -243,7 +243,7 @@ public class OrcsQueryTest {
Assert.assertEquals("Performance Requirements", reqIterator.next().getName());
Assert.assertEquals("Safety Requirements", reqIterator.next().getName());
Assert.assertEquals("Subsystem Requirements", reqIterator.next().getName());
- checkContainsTypes(subSystemReqs, CoreArtifactTypes.SubsystemRequirement, CoreArtifactTypes.SystemRequirement);
+ checkContainsTypes(subSystemReqs, CoreArtifactTypes.SubsystemRequirementMSWord, CoreArtifactTypes.SystemRequirementMSWord);
}
@Test
@@ -254,8 +254,8 @@ public class OrcsQueryTest {
Assert.assertEquals(7, builder.getCount());
List<ArtifactReadable> requirements = builder.getResults().getList();
Assert.assertEquals(7, requirements.size());
- checkContainsTypes(requirements, CoreArtifactTypes.Folder, CoreArtifactTypes.SubsystemRequirement,
- CoreArtifactTypes.SystemRequirement);
+ checkContainsTypes(requirements, CoreArtifactTypes.Folder, CoreArtifactTypes.SubsystemRequirementMSWord,
+ CoreArtifactTypes.SystemRequirementMSWord);
Collections.sort(requirements, new NameComparator(SortOrder.ASCENDING));
Iterator<ArtifactReadable> reqIterator = requirements.iterator();
Assert.assertEquals("Hardware Requirements", reqIterator.next().getName());

Back to the top