refinement[bgz_389846]: Update Type Model

Rename Imported Paragraph Number to Paragraph Number

11 files changed, 26 insertions, 23 deletions

diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoProgramAttributes.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoProgramAttributes.java
index 1e9d2019e93..2f665cd8c26 100644
--- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoProgramAttributes.java
+++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/DemoProgramAttributes.java
@@ -22,7 +22,7 @@ public enum DemoProgramAttributes {
    //
    Weight,
    Content_URL,
-   Imported_Paragraph_Number,
+   Paragraph_Number,
    Legacy_Id,
    Level_2_IPT,
    Level_3_IPT,
diff --git a/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java b/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java
index 4b659f1c1a5..8db00622f91 100644
--- a/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java
+++ b/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java
@@ -34,6 +34,7 @@ import org.eclipse.osee.display.api.data.ViewArtifact;
 import org.eclipse.osee.display.api.data.ViewId;
 import org.eclipse.osee.display.api.search.SearchNavigator;
 import org.eclipse.osee.display.presenter.mocks.MockSearchPresenter;
+import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 
 /**
  * @author Shawn F. Cook
@@ -232,15 +233,15 @@ public class MockAtsWebSearchPresenter<T extends AtsSearchHeaderComponent, K ext
                relComp.addRelationType(swReqRelationType);
 
                attrComp.clearAll();
-               attrComp.addAttribute("Category", "B");
-               attrComp.addAttribute("Developmental Assurance Level", "E");
-               attrComp.addAttribute("Imported Paragraph Number", "3.2.1.1");
-               attrComp.addAttribute("Partition", "CND");
-               attrComp.addAttribute("Qualification Method", "Test");
-               attrComp.addAttribute("Subsystem", "Communications");
-               attrComp.addAttribute("Technical Performance Parameter", "False");
+               attrComp.addAttribute(CoreAttributeTypes.Category.getName(), "B");
+               attrComp.addAttribute(CoreAttributeTypes.DevelopmentAssuranceLevel.getName(), "E");
+               attrComp.addAttribute(CoreAttributeTypes.ParagraphNumber.getName(), "3.2.1.1");
+               attrComp.addAttribute(CoreAttributeTypes.Partition.getName(), "CND");
+               attrComp.addAttribute(CoreAttributeTypes.QualificationMethod.getName(), "Test");
+               attrComp.addAttribute(CoreAttributeTypes.Subsystem.getName(), "Communications");
+               attrComp.addAttribute(CoreAttributeTypes.TechnicalPerformanceParameter.getName(), "False");
                attrComp.addAttribute(
-                  "Word Content Template",
+                  CoreAttributeTypes.WordTemplateContent.getName(),
                   "Type: Graphic Format (Location): {MAP_overlay_UIG} {FLIGHT_UIG} {WEAPON_UIG} Local Data Definition: [{RF_HANDOVER_TARGET}.DELTA_NORTH_BETWEEN_AIRCRAFT]: (floating point number) meters Mode: North_Dist returned from {FIND_NORTH_EAST_DIST_BETWEEN_TWO_POINTS}( [RFHO_DATA.RFHO_R_LAT_(MSW,LSW)]LM -> Pt1.Lat, [RFHO_DATA.RFHO_R_LONG_(MSW,LSW)]LM -> Pt1.Long, [.AIRCRAFT_LATITUDE] -> Pt2.Lat, [.AIRCRAFT_LONGITUDE] -> Pt2.Long)");
             } else {
                artHeaderComp.setErrorMessage("No artifact found with ID:" + artGuid, "[no more information]",
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 09ed946ebac..5ce2d8cad7c 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
@@ -87,7 +87,8 @@ public class PublishSubsystemToDesignTraceability extends AbstractBlam {
       excelWriter.writeRow(subsystem.getName() + " Subsystem To Design Traceability");
 
       excelWriter.writeRow("Subsystem Requirement", null, "Subsystem Design");
-      excelWriter.writeRow("Paragraph Number", "Paragraph Title", "Paragraph Number", "Paragraph Title");
+      excelWriter.writeRow(CoreAttributeTypes.ParagraphNumber.getName(), "Paragraph Title",
+         CoreAttributeTypes.ParagraphNumber.getName(), "Paragraph Title");
 
       for (Artifact subsystemRequirement : subsystem.getDescendants()) {
          excelWriter.writeCell(subsystemRequirement.getSoleAttributeValue(CoreAttributeTypes.ParagraphNumber, ""));
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 623e100bf00..9e113b84d24 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
@@ -111,7 +111,7 @@ public class PublishSystemLevelSSDD extends AbstractBlam {
    private void writeSystemRequirementAllocationToSubsystems() throws IOException, OseeCoreException {
       excelWriter.startSheet("5.2", 200);
 
-      excelWriter.writeCell("Paragraph Number");
+      excelWriter.writeCell(CoreAttributeTypes.ParagraphNumber.getName());
       excelWriter.writeCell(CoreArtifactTypes.Component.getName());
       for (Artifact subsystem : allSubsystems) {
          excelWriter.writeCell(subsystem.getName());
@@ -128,7 +128,8 @@ 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("Paragraph Number", CoreArtifactTypes.SystemRequirement.getName(), "Notes <rationale>");
+      excelWriter.writeRow(CoreAttributeTypes.ParagraphNumber.getName(), CoreArtifactTypes.SystemRequirement.getName(),
+         "Notes <rationale>");
 
       for (Artifact systemRequirement : subsystemToRequirements.getValues(subsystem)) {
          for (Artifact component : systemRequirement.getRelatedArtifacts(CoreRelationTypes.Allocation__Component)) {
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 0d919ff1705..82dd8b54e6a 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
@@ -58,7 +58,7 @@ public final class CoreAttributeTypes {
    public static final IAttributeType NativeContent = TokenFactory.createAttributeType(0x1000000000000079L, "Native Content");
    public static final IAttributeType Notes = TokenFactory.createAttributeType(0x100000000000006DL, "Notes");
    public static final IAttributeType PageType = TokenFactory.createAttributeType(0x1000000000000073L, "Page Type");
-   public static final IAttributeType ParagraphNumber = TokenFactory.createAttributeType(0x100000000000007DL, "Imported Paragraph Number");
+   public static final IAttributeType ParagraphNumber = TokenFactory.createAttributeType(0x100000000000007DL, "Paragraph Number");
    public static final IAttributeType Partition = TokenFactory.createAttributeType(0x1000000000000087L, "Partition");
    public static final IAttributeType Phone = TokenFactory.createAttributeType(0x1000000000000067L, "Phone");
    public static final IAttributeType PublishInline = TokenFactory.createAttributeType(0x1000000000000092L, "PublishInline");
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 a3de8f6aeb6..665d1a5ca63 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
@@ -542,7 +542,7 @@ relationType "Universal Grouping" {
 abstract artifactType "MS Word" extends "Artifact" {
 	guid "ABM8Rd_GKRGZWlU1JHAA"
 	uuid 0x0000000000000010
-	attribute "Imported Paragraph Number"
+	attribute "Paragraph Number"
 }
 
 abstract artifactType "Abstract Access Controlled" extends "Artifact" {
@@ -582,7 +582,7 @@ attributeType "Content URL" extends StringAttribute {
 	max 1
 }
 
-attributeType "Imported Paragraph Number" extends OutlineNumberAttribute {
+attributeType "Paragraph Number" extends OutlineNumberAttribute {
 	guid "AAMFEQ3boD3sp6VfArAA"
 	uuid 0x100000000000007D
 	dataProvider DefaultAttributeDataProvider
@@ -655,7 +655,7 @@ artifactType "Software Requirement" extends "MS Word Template" , "Direct Softwar
 artifactType "Plain Text" extends "Artifact" {
 	guid "ALjYFRdiGBfZs5lz7zwA"
 	uuid 0x0000000000000310
-	attribute "Imported Paragraph Number"
+	attribute "Paragraph Number"
 	attribute "Plain Text Content"
 }
 
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java
index 01cba393874..c02d15cae4b 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java
@@ -82,9 +82,9 @@ public final class ArtifactImportWizardTest {
 
    @Test
    public void attributeCopyTest() throws Exception {
-      // add imported paragraph number to sample artifacts, result should have copied that imported paragraph over...
+      // add paragraph number to sample artifacts, result should have copied that paragraph over...
 
-      // copy imported paragraph over... because they will be matched on guid...
+      // copy paragraph over... because they will be matched on guid...
       Map<String, String> answerParagraphNumbers = new HashMap<String, String>();
       answerParagraphNumbers.put("B", "3");
       answerParagraphNumbers.put("D", "2");
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/artifactExcelImportInput_Base.xml b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/artifactExcelImportInput_Base.xml
index 4aaf34fd428..f767c6f0b0b 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/artifactExcelImportInput_Base.xml
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/artifactExcelImportInput_Base.xml
@@ -120,7 +120,7 @@
    <Column ss:StyleID="s23" ss:AutoFitWidth="0" ss:Width="70.5"/>
    <Column ss:StyleID="s23" ss:Width="78.75"/>
    <Row ss:AutoFitHeight="0" ss:Height="38.25" ss:StyleID="s25">
-    <Cell ss:StyleID="s26"><Data ss:Type="String">Imported Paragraph Number</Data><NamedCell
+    <Cell ss:StyleID="s26"><Data ss:Type="String">Paragraph Number</Data><NamedCell
       ss:Name="_FilterDatabase"/></Cell>
     <Cell ss:StyleID="s27"><Data ss:Type="String">GUID</Data><NamedCell
       ss:Name="_FilterDatabase"/></Cell>
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/artifactExcelImportInput_SimpleChild.xml b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/artifactExcelImportInput_SimpleChild.xml
index 9af568cadcd..6d9e5cafab9 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/artifactExcelImportInput_SimpleChild.xml
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/artifactExcelImportInput_SimpleChild.xml
@@ -120,7 +120,7 @@
    <Column ss:StyleID="s23" ss:AutoFitWidth="0" ss:Width="70.5"/>
    <Column ss:StyleID="s23" ss:Width="78.75"/>
    <Row ss:AutoFitHeight="0" ss:Height="38.25" ss:StyleID="s25">
-    <Cell ss:StyleID="s26"><Data ss:Type="String">Imported Paragraph Number</Data><NamedCell
+    <Cell ss:StyleID="s26"><Data ss:Type="String">Paragraph Number</Data><NamedCell
       ss:Name="_FilterDatabase"/></Cell>
     <Cell ss:StyleID="s27"><Data ss:Type="String">GUID</Data><NamedCell
       ss:Name="_FilterDatabase"/></Cell>
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/artifactExcelImportInput_attributeCopyTest.xml b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/artifactExcelImportInput_attributeCopyTest.xml
index c2346c66899..ab8d2f567bf 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/artifactExcelImportInput_attributeCopyTest.xml
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/artifactExcelImportInput_attributeCopyTest.xml
@@ -120,7 +120,7 @@
    <Column ss:StyleID="s23" ss:AutoFitWidth="0" ss:Width="70.5"/>
    <Column ss:StyleID="s23" ss:Width="78.75"/>
    <Row ss:AutoFitHeight="0" ss:Height="38.25" ss:StyleID="s25">
-    <Cell ss:StyleID="s26"><Data ss:Type="String">Imported Paragraph Number</Data><NamedCell
+    <Cell ss:StyleID="s26"><Data ss:Type="String">Paragraph Number</Data><NamedCell
       ss:Name="_FilterDatabase"/></Cell>
     <Cell ss:StyleID="s27"><Data ss:Type="String">GUID</Data><NamedCell
       ss:Name="_FilterDatabase"/></Cell>
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java
index 425f927b0b7..13fa41ad582 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewerFactory.java
@@ -18,9 +18,9 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactTypeColumn;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.GuidColumn;
-import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.LastModifiedByColumn;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.HierarchyIndexColumn;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.HridColumn;
+import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.LastModifiedByColumn;
 import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.LastModifiedDateColumn;
 import org.eclipse.swt.SWT;
 
@@ -41,7 +41,7 @@ public class ChangeXViewerFactory extends SkynetXViewerFactory {
       SWT.LEFT, true, SortDataType.String, false, null);
    public final static XViewerColumn Was_Value = new XViewerColumn("framework.change.wasValue", "Was Value", 150,
       SWT.LEFT, true, SortDataType.String, false, null);
-   public final static XViewerColumn paraNumber = new XViewerColumn("attribute.Imported Paragraph Number",
+   public final static XViewerColumn paraNumber = new XViewerColumn("attribute.Paragraph Number",
       CoreAttributeTypes.ParagraphNumber.getName(), 50, SWT.LEFT, false, SortDataType.Paragraph_Number, false, null);
 
    public final static String NAMESPACE = "osee.skynet.gui.ChangeXViewer";