diff options
author | Stephen J. Molaro | 2019-08-21 21:25:33 +0000 |
---|---|---|
committer | Baily Roberts | 2019-08-29 19:37:17 +0000 |
commit | 9ca67a02a59d7e86dcac0e2076431357867bd923 (patch) | |
tree | 80a4d2301fbd00ebf434ec9fde801d9adcd9caa1 | |
parent | 48af97dc55c55fc7078cdcfd4cfc472cee1da062 (diff) | |
download | org.eclipse.osee-9ca67a02a59d7e86dcac0e2076431357867bd923.tar.gz org.eclipse.osee-9ca67a02a59d7e86dcac0e2076431357867bd923.tar.xz org.eclipse.osee-9ca67a02a59d7e86dcac0e2076431357867bd923.zip |
refactor: Change AtsAttributeType Names to be More Consistent
Change-Id: Iccf3bb76d55c32e95211d3ec87c72fbc0b936045
Signed-off-by: Stephen J. Molaro <stephen.j.molaro@boeing.com>
44 files changed, 111 insertions, 115 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java index f8a600e867e..802e5a504eb 100644 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java @@ -29,20 +29,20 @@ public final class AtsAttributeTypes { public static final AttributeTypeToken Actionable = createType(1152921504606847160L, "Actionable", "True if item can have Action written against or assigned to."); public static final AttributeTypeToken ActionableItemReference = createType(6780739363553225476L, "Actionable Item Reference", "Actionable Items that are impacted by this change."); public static final AttributeTypeToken Active = createType(1152921504606847153L, "Active", "Active ATS configuration object."); - public static final AttributeTypeToken ActivityId = createType(1152921504606847874L, "Activity ID"); + public static final AttributeTypeToken ActivityId = createType(1152921504606847874L, "Activity Id"); public static final AttributeTypeToken ActivityName = createType(1152921504606847875L, "Activity Name"); public static final AttributeTypeToken AllowCommitBranch = createType(1152921504606847162L, "Allow Commit Branch"); public static final AttributeTypeToken AllowCreateBranch = createType(1152921504606847161L, "Allow Create Branch"); public static final AttributeTypeToken AllowUserActionCreation = createType(1322118789779953012L, "Allow User Action Creation"); public static final AttributeTypeToken AllowWebExport = createType(1244831604424847172L, "Allow Web Export"); - public static final AttributeTypeToken ArtifactsChanged = createType(1815723890L, "Artifacts Changed"); public static final AttributeTypeToken ApplicabilityWorkflow = createType(1152922022510067882L, "Applicability Workflow"); public static final AttributeTypeToken ApplicableToProgram = createType(1152921949227188394L, "Applicable To Program"); public static final AttributeTypeToken AtsConfig = createType(2348752981434455L, "ATS Config", "Saved ATS Configures"); public static final AttributeTypeToken AtsConfiguredBranch = createType(72063456936722683L, "ATS Configured Branch", "ATS Configured Branch"); - public static final AttributeTypeToken AtsId = createType(1152921504606847877L, "ATS Id", "ATS Generated Id"); + public static final AttributeTypeToken AtsId = createType(1152921504606847877L, "Id", "ATS Generated Id"); public static final AttributeTypeToken AtsIdPrefix = createType(1162773128791720837L, "ATS Id Prefix", "ATS Id Prefix"); public static final AttributeTypeToken AtsIdSequenceName = createType(1163054603768431493L, "ATS Id Sequence Name", "ATS Id Sequence Name"); + public static final AttributeTypeToken AtsQuickSearch = createType(72063457009467643L, "ATS Quick Search", "Saved ATS Quick Searches."); public static final AttributeTypeToken BaselineBranchId = createType(1152932018686787753L, "Baseline Branch Id", "Baseline branch associated with ATS object."); public static final AttributeTypeToken BlockedReason = createType(7797797474874870503L, "Blocked Reason", "Reason for action being blocked"); public static final AttributeTypeToken CSCI = createType(72063457007112443L, "CSCI", "CSCI this Team is reponsible for."); @@ -52,7 +52,7 @@ public final class AtsAttributeTypes { public static final AttributeTypeToken CancelledReason = createType(1152921504606847171L, "Cancelled Reason", "Explanation of why worklfow was cancelled."); public static final AttributeTypeToken CancelReason = createType(5718762723487704057L, "Cancel Reason"); public static final AttributeTypeToken CancelledReasonDetails = createType(8279626026752029322L, "Cancelled Reason Details", "Explanation of why worklfow was cancelled."); - public static final AttributeTypeToken Category1 = createType(1152921504606847212L, "Category", "Open field for user to be able to enter text to use for categorizing/sorting."); + public static final AttributeTypeToken Category1 = createType(1152921504606847212L, "Category1", "Open field for user to be able to enter text to use for categorizing/sorting."); public static final AttributeTypeToken Category2 = createType(1152921504606847217L, "Category2", Category1.getDescription()); public static final AttributeTypeToken Category3 = createType(1152921504606847218L, "Category3", Category1.getDescription()); public static final AttributeTypeToken ChangeType = createType(1152921504606847180L, "Change Type", "Type of change."); @@ -72,7 +72,7 @@ public final class AtsAttributeTypes { public static final AttributeTypeToken DecisionReviewOptions = createType(1152921504606847220L, "Decision Review Options", "Options available for selection in review. Each line is a separate option. Format: <option name>;<state to transition to>;<assignee>"); public static final AttributeTypeToken Default = createType(1152921875139002538L, "Default", "Default"); public static final AttributeTypeToken Description = createType(1152921504606847196L, "Description", "Detailed explanation."); - public static final AttributeTypeToken DslSheet = createType(1152921504606847197L, "DSL Sheet", "XText DSL Sheet for ATS"); + public static final AttributeTypeToken DslSheet = createType(1152921504606847197L, "Dsl Sheet", "XText DSL Sheet for ATS"); public static final AttributeTypeToken DuplicatedPcrId = createType(1152922093378076842L, "Duplicated PCR Id"); public static final AttributeTypeToken EndDate = createType(1152921504606847383L, "End Date"); public static final AttributeTypeToken EstimateAssumptions = createType(7714952282787917834L, "Estimate Assumptions"); @@ -115,14 +115,12 @@ public final class AtsAttributeTypes { public static final AttributeTypeToken Points = createType(1152921504606847178L, "Points", "Abstract value that describes risk, complexity, and size of Actions."); public static final AttributeTypeToken PointsAttributeType = createType(1152921573057888257L, "Points Attribute Type", "Used to store the agile points type name (ats.Points or ats.Points Numeric)."); public static final AttributeTypeToken PointsNumeric = createType(1728793301637070003L, "Points Numeric", "Abstract value that describes risk, complexity, and size of Actions as float."); - public static final AttributeTypeToken PrepareHoursSpent = createType(3384497588485147406L, "Prepare Hours Spent"); - public static final AttributeTypeToken PriorityType = createType(1152921504606847179L, "Priority", "1 = High; 5 = Low"); + public static final AttributeTypeToken Priority = createType(1152921504606847179L, "Priority", "1 = High; 5 = Low"); public static final AttributeTypeToken Problem = createType(1152921504606847193L, "Problem", "Problem found during analysis."); public static final AttributeTypeToken ProgramId = createType(1152922093377028266L, "Program Id"); public static final AttributeTypeToken ProposedResolution = createType(1152921504606847194L, "Proposed Resolution", "Recommended resolution."); - public static final AttributeTypeToken QuickSearch = createType(72063457009467643L, "ATS Quick Search", "Saved ATS Quick Searches."); public static final AttributeTypeToken Rationale = createType(1152922093379715242L, "Rationale"); - public static final AttributeTypeToken RelatedPeerWorkDefinitionReference = createType(6245695017677665082L, "Related Peer Workflow Definition", "Specific work flow definition id used by Peer To Peer Reviews for this Team"); + public static final AttributeTypeToken RelatedPeerWorkDefinitionReference = createType(6245695017677665082L, "Related Peer Workflow Definition Reference", "Specific work flow definition id used by Peer To Peer Reviews for this Team"); public static final AttributeTypeToken RelatedTaskWorkDefinitionReference = createType(2492475839748929444L, "Related Task Workflow Definition Reference", "Specific work flow definition id used by Tasks related to this Workflow"); public static final AttributeTypeToken RelatedToState = createType(1152921504606847204L, "Related To State", "State of parent workflow this object is related to."); public static final AttributeTypeToken ReleaseDate = createType(1152921504606847175L, "Release Date", "Date the changes were made available to the users."); @@ -136,20 +134,18 @@ public final class AtsAttributeTypes { public static final AttributeTypeToken StartDate = createType(1152921504606847382L, "Start Date"); public static final AttributeTypeToken State = createType(1152921504606847191L, "State", "States of workflow state machine."); public static final AttributeTypeToken StateNotes = createType(1152921504606847203L, "State Notes"); - public static final AttributeTypeToken StateReviews = createType(4857870296805156518L, "State Reviews"); public static final AttributeTypeToken SwEnhancement = createType(1152921504606847227L, "SW Enhancement"); public static final AttributeTypeToken TaskToChangedArtifactReference = createType(1153126013769613562L, "Task To Changed Artifact Reference"); public static final AttributeTypeToken TeamDefinitionReference = createType(4730961339090285773L, "Team Definition Reference"); public static final AttributeTypeToken TeamWorkflowArtifactType = createType(1152921504606847148L, "Team Workflow Artifact Type", "Specific Artifact Type to use in creation of Team Workflow"); - public static final AttributeTypeToken TestToSourceLocator = AttributeTypeToken.valueOf(130595201919637916L, "Test Run to Source Locator"); + public static final AttributeTypeToken TestRunToSourceLocator = AttributeTypeToken.valueOf(130595201919637916L, "Test Run to Source Locator"); public static final AttributeTypeToken Title = createType(CoreAttributeTypes.Name.getId(), CoreAttributeTypes.Name.getName(), "Enter clear and concise title that can be generally understood."); - public static final AttributeTypeToken UnPlannedPoints = createType(284254492767020802L, "Un-Planned Points"); - public static final AttributeTypeToken UnPlannedWork = createType(2421093774890249189L, "Unplanned Work"); + public static final AttributeTypeToken UnplannedPoints = createType(284254492767020802L, "Unplanned Points"); + public static final AttributeTypeToken UnplannedWork = createType(2421093774890249189L, "Unplanned Work"); public static final AttributeTypeToken ValidationRequired = createType(1152921504606847146L, "Validation Required", "If selected, originator will be asked to validate the implementation."); public static final AttributeTypeToken VerificationCodeInspection = createType(3454966334779726518L, "Verification Code Inspection"); public static final AttributeTypeToken VersionLocked = createType(1152921504606847156L, "Version Locked", "True if version artifact is locked."); public static final AttributeTypeToken WeeklyBenefit = createType(1152921504606847186L, "Weekly Benefit", "Estimated number of hours that will be saved over a single year if this change is completed."); - public static final AttributeTypeToken WorkaroundDescription = createType(8968417615996828357L, "Workaround Description.", "Describe a modified method or process where an engineer can get the correct or valid results."); public static final AttributeTypeToken WorkPackage = createType(1152921504606847206L, "Work Package", "Designated accounting work package for completing workflow."); public static final AttributeTypeToken WorkPackageId = createType(1152921504606847872L, "Work Package ID"); public static final AttributeTypeToken WorkPackageProgram = createType(1152921504606847873L, "Work Package Program"); diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/AttributeKey.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/AttributeKey.java index 8d20ca7737a..6d9a624e851 100644 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/AttributeKey.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/AttributeKey.java @@ -19,7 +19,7 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes; */ public enum AttributeKey { Title("N/A"), - Priority("/ats/attr/" + AtsAttributeTypes.PriorityType.getIdString()), + Priority("/ats/attr/" + AtsAttributeTypes.Priority.getIdString()), ColorTeam("/ats/attr/" + AtsAttributeTypes.ColorTeam.getIdString()), Assignee("/ats/attr/Assignee"), IPT("/ats/attr/" + AtsAttributeTypes.IPT.getIdString()), diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/SprintDataBuilder.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/SprintDataBuilder.java index 8a41ae26d62..95923a76c1b 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/SprintDataBuilder.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/SprintDataBuilder.java @@ -70,7 +70,7 @@ public class SprintDataBuilder { // retrieve and store unPlanned points Integer unPlannedPoints = - atsApi.getAttributeResolver().getSoleAttributeValue(sprintArt, AtsAttributeTypes.UnPlannedPoints, 0); + atsApi.getAttributeResolver().getSoleAttributeValue(sprintArt, AtsAttributeTypes.UnplannedPoints, 0); sprintData.setUnPlannedPoints(unPlannedPoints); // retrieve and store planned points @@ -108,7 +108,7 @@ public class SprintDataBuilder { for (IAgileItem item : items) { boolean completed = item.isCompletedOrCancelled(); boolean unPlanned = - atsApi.getAttributeResolver().getSoleAttributeValue(item, AtsAttributeTypes.UnPlannedWork, false); + atsApi.getAttributeResolver().getSoleAttributeValue(item, AtsAttributeTypes.UnplannedWork, false); Date completedCancelledDate = item.isCompleted() ? item.getCompletedDate() : item.getCancelledDate(); // loop through all dates and add points for dates after item was completed/cancelled for (AgileSprintDateData dateBucket : sprintData.getDates()) { diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/SprintUtil.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/SprintUtil.java index 4c952f3c15f..a9e1bb4b484 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/SprintUtil.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/agile/SprintUtil.java @@ -80,7 +80,7 @@ public class SprintUtil { } } if (sprintData.getUnPlannedPoints() != null) { - changes.setSoleAttributeValue(sprint, AtsAttributeTypes.UnPlannedPoints, sprintData.getUnPlannedPoints()); + changes.setSoleAttributeValue(sprint, AtsAttributeTypes.UnplannedPoints, sprintData.getUnPlannedPoints()); } if (sprintData.getPlannedPoints() != null) { changes.setSoleAttributeValue(sprint, AtsAttributeTypes.PlannedPoints, sprintData.getPlannedPoints()); @@ -136,7 +136,7 @@ public class SprintUtil { IAtsVersion ver = atsApi.getVersionService().getTargetedVersion(workItem); item.setVersion(ver == null ? "" : ver.getName()); Boolean unplanned = - atsApi.getAttributeResolver().getSoleAttributeValue(aItem, AtsAttributeTypes.UnPlannedWork, false); + atsApi.getAttributeResolver().getSoleAttributeValue(aItem, AtsAttributeTypes.UnplannedWork, false); item.setUnPlannedWork(unplanned ? "U" : ""); item.setNotes(atsApi.getAttributeResolver().getSoleAttributeValue(aItem, AtsAttributeTypes.WorkflowNotes, "")); item.setCreateDate(CreatedDateColumn.getDateStr(workItem)); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AtsColumnToken.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AtsColumnToken.java index 3d6919b40f0..43d4187bdd6 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AtsColumnToken.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AtsColumnToken.java @@ -68,8 +68,8 @@ public class AtsColumnToken { public static AtsAttributeValueColumn LegacyPcrIdColumn = new AtsAttributeValueColumn(AtsAttributeTypes.LegacyPcrId, AtsColumnId.LegacyPcrId.getId(), AtsAttributeTypes.LegacyPcrId.getUnqualifiedName(), 40, ColumnAlign.Left.name(), false, ColumnType.String, false, "", true, true); public static AtsAttributeValueColumn NotesColumn = new AtsAttributeValueColumn(AtsAttributeTypes.WorkflowNotes, AtsColumnId.Notes.getId(), "Notes", 80, ColumnAlign.Left.name(), true, ColumnType.String, true, "", false, false); public static AtsAttributeValueColumn PercentCompleteWorkflowColumn = new AtsAttributeValueColumn(AtsAttributeTypes.PercentComplete, AtsColumnId.PercentCompleteWorkflow.getId(), "Workflow Percent Complete", 40, ColumnAlign.Center.name(), false, ColumnType.Percent, false, "Percent Complete for full workflow (if work definition configured for single percent).\n\nAmount entered from user.", true, false); - public static AtsAttributeValueColumn PriorityColumn = new AtsAttributeValueColumn(AtsAttributeTypes.PriorityType, AtsColumnId.Priority.getId(), AtsAttributeTypes.PriorityType.getUnqualifiedName(), 20, ColumnAlign.Left.name(), true, ColumnType.String, true, "", true, false); + public static AtsAttributeValueColumn PriorityColumn = new AtsAttributeValueColumn(AtsAttributeTypes.Priority, AtsColumnId.Priority.getId(), AtsAttributeTypes.Priority.getUnqualifiedName(), 20, ColumnAlign.Left.name(), true, ColumnType.String, true, "", true, false); public static AtsAttributeValueColumn TitleColumn = new AtsAttributeValueColumn(CoreAttributeTypes.Name, "framework.artifact.name.Title", "Title", 150, ColumnAlign.Left.name(), true, ColumnType.String, true, "", true, false); - public static AtsAttributeValueColumn UnPlannedWorkColumn = new AtsAttributeValueColumn(AtsAttributeTypes.UnPlannedWork, AtsColumnId.UnPlannedWork.getId(), AtsAttributeTypes.UnPlannedWork.getUnqualifiedName(), 20, ColumnAlign.Left.name(), false, ColumnType.Boolean, true, "", false, false); + public static AtsAttributeValueColumn UnPlannedWorkColumn = new AtsAttributeValueColumn(AtsAttributeTypes.UnplannedWork, AtsColumnId.UnPlannedWork.getId(), AtsAttributeTypes.UnplannedWork.getUnqualifiedName(), 20, ColumnAlign.Left.name(), false, ColumnType.Boolean, true, "", false, false); // @formatter:on } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ActionFactory.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ActionFactory.java index 4266db2794a..325e70e11ae 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ActionFactory.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ActionFactory.java @@ -156,7 +156,7 @@ public class ActionFactory implements IAtsActionFactory { if (data.isUnplanned()) { for (IAtsTeamWorkflow teamWf : result.getTeamWfs()) { - changes.setSoleAttributeValue(teamWf, AtsAttributeTypes.UnPlannedWork, true); + changes.setSoleAttributeValue(teamWf, AtsAttributeTypes.UnplannedWork, true); } } @@ -551,7 +551,7 @@ public class ActionFactory implements IAtsActionFactory { setArtifactIdentifyData(toTeam, fromAction.getName(), attrResolver.getSoleAttributeValue(fromAction, AtsAttributeTypes.Description, ""), atsApi.getChangeType(fromAction), - attrResolver.getSoleAttributeValue(fromAction, AtsAttributeTypes.PriorityType, ""), + attrResolver.getSoleAttributeValue(fromAction, AtsAttributeTypes.Priority, ""), attrResolver.getSoleAttributeValue(fromAction, AtsAttributeTypes.ValidationRequired, false), attrResolver.getSoleAttributeValue(fromAction, AtsAttributeTypes.NeedBy, (Date) null), changes); } @@ -568,7 +568,7 @@ public class ActionFactory implements IAtsActionFactory { atsApi.setChangeType(atsObject, changeType, changes); } if (Strings.isValid(priority)) { - changes.addAttribute(atsObject, AtsAttributeTypes.PriorityType, priority); + changes.addAttribute(atsObject, AtsAttributeTypes.Priority, priority); } if (needByDate != null) { changes.addAttribute(atsObject, AtsAttributeTypes.NeedBy, needByDate); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ConvertAtsConfigGuidAttributesOperations.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ConvertAtsConfigGuidAttributesOperations.java index 99f4c8fed30..417c42b458b 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ConvertAtsConfigGuidAttributesOperations.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/ConvertAtsConfigGuidAttributesOperations.java @@ -37,8 +37,9 @@ public class ConvertAtsConfigGuidAttributesOperations { // Remove static after 26.0 public static final AttributeTypeToken WorkflowDefinition = AtsAttributeTypes.createType(1152921504606847149L, "Workflow Definition", "Specific work flow definition id used by this Workflow artifact"); - public static final AttributeTypeToken RelatedTaskWorkDefinition = AtsAttributeTypes.createType(1152921504606847152L, - "Related Task Workflow Definition", "Specific work flow definition id used by Tasks related to this Workflow"); + public static final AttributeTypeToken RelatedTaskWorkflowDefinition = + AtsAttributeTypes.createType(1152921504606847152L, "Related Task Workflow Definition", + "Specific work flow definition id used by Tasks related to this Workflow"); public static final AttributeTypeToken RelatedPeerWorkflowDefinition = AtsAttributeTypes.createType(1152921504606847870L, "Related Peer Workflow Definition", "Specific work flow definition id used by Peer To Peer Reviews for this Team"); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionServiceImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionServiceImpl.java index f8bfe54e08c..6364c36d02d 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/AtsWorkDefinitionServiceImpl.java @@ -158,7 +158,7 @@ public class AtsWorkDefinitionServiceImpl implements IAtsWorkDefinitionService { if (workDefinition == null && atsApi.isWorkDefAsName()) { // If this artifact specifies it's own workflow definition, use it String workFlowDefName = atsApi.getAttributeResolver().getSoleAttributeValueAsString(teamDef, - ConvertAtsConfigGuidAttributesOperations.RelatedTaskWorkDefinition, ""); + ConvertAtsConfigGuidAttributesOperations.RelatedTaskWorkflowDefinition, ""); if (Strings.isValid(workFlowDefName)) { workDefinition = getWorkDefinitionByName(workFlowDefName); } diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefSprint.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefSprint.java index 98dd8b50994..d809d1c933e 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefSprint.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefSprint.java @@ -54,7 +54,7 @@ public class WorkDefSprint extends AbstractWorkDef { new WidgetDefinition(AtsAttributeTypes.KanbanStoryName, "XTextDam", FILL_VERTICALLY), // new CompositeLayoutItem(4, // new WidgetDefinition(AtsAttributeTypes.PlannedPoints, "XIntegerDam"), // - new WidgetDefinition(AtsAttributeTypes.UnPlannedPoints, "XIntegerDam") // + new WidgetDefinition(AtsAttributeTypes.UnplannedPoints, "XIntegerDam") // ), // new CompositeLayoutItem(4, // new WidgetDefinition("Open Sprint Summary", "XOpenSprintSummaryButton"), // diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamAtsConfig2Example.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamAtsConfig2Example.java index 02d7540c473..a94e40f5b4a 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamAtsConfig2Example.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamAtsConfig2Example.java @@ -49,7 +49,7 @@ public class WorkDefTeamAtsConfig2Example extends AbstractWorkDef { new WidgetDefinition(AtsAttributeTypes.ProposedResolution, "XTextDam", FILL_VERTICALLY), // new CompositeLayoutItem(6, // new WidgetDefinition(AtsAttributeTypes.ChangeType, "XComboDam(Improvement,Problem,Refinement,Support)"), // - new WidgetDefinition(AtsAttributeTypes.PriorityType, "XComboDam(1,2,3,4,5)"), // + new WidgetDefinition(AtsAttributeTypes.Priority, "XComboDam(1,2,3,4,5)"), // new WidgetDefinition(AtsAttributeTypes.NeedBy, "XDateDam") // ), // new WidgetDefinition(AtsAttributeTypes.EstimatedHours, "XFloatDam")); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDefault.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDefault.java index e3bab56d33a..d31248509df 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDefault.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDefault.java @@ -51,7 +51,7 @@ public class WorkDefTeamDefault extends AbstractWorkDef { new CompositeLayoutItem(6, // new WidgetDefinition(AtsAttributeTypes.ChangeType, "XComboDam(OPTIONS_FROM_ATTRIBUTE_VALIDITY)", REQUIRED_FOR_TRANSITION), // - new WidgetDefinition(AtsAttributeTypes.PriorityType, "XComboDam(OPTIONS_FROM_ATTRIBUTE_VALIDITY)", + new WidgetDefinition(AtsAttributeTypes.Priority, "XComboDam(OPTIONS_FROM_ATTRIBUTE_VALIDITY)", REQUIRED_FOR_TRANSITION), // new WidgetDefinition(AtsAttributeTypes.NeedBy, "XDateDam", HORIZONTAL_LABEL) // ), // @@ -72,7 +72,7 @@ public class WorkDefTeamDefault extends AbstractWorkDef { new CompositeLayoutItem(6, // new WidgetDefinition(AtsAttributeTypes.ChangeType, "XComboDam(OPTIONS_FROM_ATTRIBUTE_VALIDITY)", REQUIRED_FOR_TRANSITION), // - new WidgetDefinition(AtsAttributeTypes.PriorityType, "XComboDam(OPTIONS_FROM_ATTRIBUTE_VALIDITY)", + new WidgetDefinition(AtsAttributeTypes.Priority, "XComboDam(OPTIONS_FROM_ATTRIBUTE_VALIDITY)", REQUIRED_FOR_TRANSITION), // new WidgetDefinition(AtsAttributeTypes.NeedBy, "XDateDam", HORIZONTAL_LABEL) // ), // diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoCode.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoCode.java index 3b9c3d7c236..4548fbf05f6 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoCode.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoCode.java @@ -51,7 +51,7 @@ public class WorkDefTeamDemoCode extends AbstractWorkDef { new WidgetDefinition(AtsAttributeTypes.ProposedResolution, "XTextDam", FILL_VERTICALLY), // new CompositeLayoutItem(6, // new WidgetDefinition(AtsAttributeTypes.ChangeType, "XComboDam(Improvement,Problem,Refinement,Support)"), // - new WidgetDefinition(AtsAttributeTypes.PriorityType, "XComboDam(1,2,3,4,5)"), // + new WidgetDefinition(AtsAttributeTypes.Priority, "XComboDam(1,2,3,4,5)"), // new WidgetDefinition(AtsAttributeTypes.NeedBy, "XDateDam") // ), // new WidgetDefinition(AtsAttributeTypes.ValidationRequired, "XComboBooleanDam"), // @@ -71,7 +71,7 @@ public class WorkDefTeamDemoCode extends AbstractWorkDef { new WidgetDefinition(AtsAttributeTypes.ProposedResolution, "XTextDam", FILL_VERTICALLY), // new CompositeLayoutItem(6, // new WidgetDefinition(AtsAttributeTypes.ChangeType, "XComboDam(Improvement,Problem,Refinement,Support)"), // - new WidgetDefinition(AtsAttributeTypes.PriorityType, "XComboDam(1,2,3,4,5)"), // + new WidgetDefinition(AtsAttributeTypes.Priority, "XComboDam(1,2,3,4,5)"), // new WidgetDefinition(AtsAttributeTypes.NeedBy, "XDateDam") // ), // new WidgetDefinition(AtsAttributeTypes.EstimatedHours, "XFloatDam")); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoReq.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoReq.java index c449fecf2ca..360e1e3a475 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoReq.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoReq.java @@ -49,7 +49,7 @@ public class WorkDefTeamDemoReq extends AbstractWorkDef { new WidgetDefinition(AtsAttributeTypes.ProposedResolution, "XTextDam", FILL_VERTICALLY), // new CompositeLayoutItem(6, // new WidgetDefinition(AtsAttributeTypes.ChangeType, "XComboDam(Improvement,Problem,Refinement,Support)"), // - new WidgetDefinition(AtsAttributeTypes.PriorityType, "XComboDam(1,2,3,4,5)"), // + new WidgetDefinition(AtsAttributeTypes.Priority, "XComboDam(1,2,3,4,5)"), // new WidgetDefinition(AtsAttributeTypes.NeedBy, "XDateDam") // ), // new WidgetDefinition(AtsAttributeTypes.ValidationRequired, "XComboBooleanDam"), // @@ -67,7 +67,7 @@ public class WorkDefTeamDemoReq extends AbstractWorkDef { new WidgetDefinition(AtsAttributeTypes.ProposedResolution, "XTextDam", FILL_VERTICALLY), // new CompositeLayoutItem(6, // new WidgetDefinition(AtsAttributeTypes.ChangeType, "XComboDam(Improvement,Problem,Refinement,Support)"), // - new WidgetDefinition(AtsAttributeTypes.PriorityType, "XComboDam(1,2,3,4,5)"), // + new WidgetDefinition(AtsAttributeTypes.Priority, "XComboDam(1,2,3,4,5)"), // new WidgetDefinition(AtsAttributeTypes.NeedBy, "XDateDam") // ), // new WidgetDefinition(AtsAttributeTypes.EstimatedHours, "XFloatDam")); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoSwDesign.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoSwDesign.java index 41ac40a3824..8042d1d0688 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoSwDesign.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoSwDesign.java @@ -93,7 +93,7 @@ public class WorkDefTeamDemoSwDesign extends AbstractWorkDef { new WidgetDefinition(AtsAttributeTypes.ProposedResolution, "XTextDam", FILL_VERTICALLY), // new CompositeLayoutItem(6, // new WidgetDefinition(AtsAttributeTypes.ChangeType, "XComboDam(Improvement,Problem,Refinement,Support)"), // - new WidgetDefinition(AtsAttributeTypes.PriorityType, "XComboDam(1,2,3,4,5)"), // + new WidgetDefinition(AtsAttributeTypes.Priority, "XComboDam(1,2,3,4,5)"), // new WidgetDefinition(AtsAttributeTypes.NeedBy, "XDateDam") // ), // new WidgetDefinition(AtsAttributeTypes.ValidationRequired, "XComboBooleanDam"), // @@ -112,7 +112,7 @@ public class WorkDefTeamDemoSwDesign extends AbstractWorkDef { new WidgetDefinition(AtsAttributeTypes.ProposedResolution, "XTextDam", FILL_VERTICALLY), // new CompositeLayoutItem(6, // new WidgetDefinition(AtsAttributeTypes.ChangeType, "XComboDam(Improvement,Problem,Refinement,Support)"), // - new WidgetDefinition(AtsAttributeTypes.PriorityType, "XComboDam(1,2,3,4,5)"), // + new WidgetDefinition(AtsAttributeTypes.Priority, "XComboDam(1,2,3,4,5)"), // new WidgetDefinition(AtsAttributeTypes.NeedBy, "XDateDam") // ), // new WidgetDefinition(AtsAttributeTypes.EstimatedHours, "XFloatDam")); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoTest.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoTest.java index e45de60c51f..ce33e9a0ef9 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoTest.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamDemoTest.java @@ -49,7 +49,7 @@ public class WorkDefTeamDemoTest extends AbstractWorkDef { new WidgetDefinition(AtsAttributeTypes.ProposedResolution, "XTextDam", FILL_VERTICALLY), // new CompositeLayoutItem(6, // new WidgetDefinition(AtsAttributeTypes.ChangeType, "XComboDam(Improvement,Problem,Refinement,Support)"), // - new WidgetDefinition(AtsAttributeTypes.PriorityType, "XComboDam(1,2,3,4,5)"), // + new WidgetDefinition(AtsAttributeTypes.Priority, "XComboDam(1,2,3,4,5)"), // new WidgetDefinition(AtsAttributeTypes.NeedBy, "XDateDam") // ), // new WidgetDefinition(AtsAttributeTypes.ValidationRequired, "XComboBooleanDam"), // @@ -67,7 +67,7 @@ public class WorkDefTeamDemoTest extends AbstractWorkDef { new WidgetDefinition(AtsAttributeTypes.ProposedResolution, "XTextDam", FILL_VERTICALLY), // new CompositeLayoutItem(6, // new WidgetDefinition(AtsAttributeTypes.ChangeType, "XComboDam(Improvement,Problem,Refinement,Support)"), // - new WidgetDefinition(AtsAttributeTypes.PriorityType, "XComboDam(1,2,3,4,5)"), // + new WidgetDefinition(AtsAttributeTypes.Priority, "XComboDam(1,2,3,4,5)"), // new WidgetDefinition(AtsAttributeTypes.NeedBy, "XDateDam") // ), // new WidgetDefinition(AtsAttributeTypes.EstimatedHours, "XFloatDam")); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamSimple.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamSimple.java index b6b98389313..ad2203032cc 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamSimple.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/internal/workdefs/WorkDefTeamSimple.java @@ -49,7 +49,7 @@ public class WorkDefTeamSimple extends AbstractWorkDef { new WidgetDefinition(AtsAttributeTypes.ProposedResolution, "XTextDam", FILL_VERTICALLY), // new CompositeLayoutItem(6, // new WidgetDefinition(AtsAttributeTypes.ChangeType, "XComboDam(Improvement,Problem,Refinement,Support)"), // - new WidgetDefinition(AtsAttributeTypes.PriorityType, "XComboDam(1,2,3,4,5)"), // + new WidgetDefinition(AtsAttributeTypes.Priority, "XComboDam(1,2,3,4,5)"), // new WidgetDefinition(AtsAttributeTypes.NeedBy, "XDateDam") // ), // new WidgetDefinition(AtsAttributeTypes.ValidationRequired, "XComboBooleanDam")); diff --git a/plugins/org.eclipse.osee.ats.ide.demo/src/org/eclipse/osee/ats/ide/demo/populate/Pdd93CreateDemoAgile.java b/plugins/org.eclipse.osee.ats.ide.demo/src/org/eclipse/osee/ats/ide/demo/populate/Pdd93CreateDemoAgile.java index be031d411b8..d70497fd787 100644 --- a/plugins/org.eclipse.osee.ats.ide.demo/src/org/eclipse/osee/ats/ide/demo/populate/Pdd93CreateDemoAgile.java +++ b/plugins/org.eclipse.osee.ats.ide.demo/src/org/eclipse/osee/ats/ide/demo/populate/Pdd93CreateDemoAgile.java @@ -411,7 +411,7 @@ public class Pdd93CreateDemoAgile { } } changes.setSoleAttributeValue(sprint, AtsAttributeTypes.EndDate, cal.getTime()); - changes.setSoleAttributeValue(sprint, AtsAttributeTypes.UnPlannedPoints, 45); + changes.setSoleAttributeValue(sprint, AtsAttributeTypes.UnplannedPoints, 45); changes.setSoleAttributeValue(sprint, AtsAttributeTypes.PlannedPoints, 200); changes.addAttribute(sprint, AtsAttributeTypes.Holiday, holiday1); changes.addAttribute(sprint, AtsAttributeTypes.Holiday, holiday2); diff --git a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/demo/IPopulateDemoDatabaseTest.java b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/demo/IPopulateDemoDatabaseTest.java index 8d4730986c9..b7b5955b2a4 100644 --- a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/demo/IPopulateDemoDatabaseTest.java +++ b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/demo/IPopulateDemoDatabaseTest.java @@ -61,8 +61,8 @@ public interface IPopulateDemoDatabaseTest { default void testTeamContents(IAtsTeamWorkflow teamWf, String title, String priority, String versionName, String currentStateName, String actionableItemStr, String assigneeStr, ArtifactTypeToken artifactType, IAtsTeamDefinition teamDef) { Assert.assertEquals(currentStateName, teamWf.getStateMgr().getCurrentStateName()); - Assert.assertEquals(priority, AtsClientService.get().getAttributeResolver().getSoleAttributeValue(teamWf, - AtsAttributeTypes.PriorityType, "")); + Assert.assertEquals(priority, + AtsClientService.get().getAttributeResolver().getSoleAttributeValue(teamWf, AtsAttributeTypes.Priority, "")); // want targeted version, not error/exception String targetedVerStr = ""; IAtsVersion version = AtsClientService.get().getVersionService().getTargetedVersion(teamWf); diff --git a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/AtsActionEndpointImplTest.java b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/AtsActionEndpointImplTest.java index 878227a9a1e..cbb0f83efa1 100644 --- a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/AtsActionEndpointImplTest.java +++ b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/AtsActionEndpointImplTest.java @@ -461,7 +461,7 @@ public class AtsActionEndpointImplTest extends AbstractRestTest { @Test public void testSetActionPriorityByKey() { - testSetActionByKey("", "5", AtsAttributeTypes.PriorityType, AttributeKey.Priority); + testSetActionByKey("", "5", AtsAttributeTypes.Priority, AttributeKey.Priority); } @Test @@ -595,8 +595,8 @@ public class AtsActionEndpointImplTest extends AbstractRestTest { AtsClientService.get().getQueryServiceClient().getArtifact(teamWf).getLastModifiedBy()); Assert.assertEquals(ChangeType.Improvement.name(), AtsClientService.get().getAttributeResolver().getSoleAttributeValue(teamWf, AtsAttributeTypes.ChangeType, "")); - Assert.assertEquals("3", AtsClientService.get().getAttributeResolver().getSoleAttributeValue(teamWf, - AtsAttributeTypes.PriorityType, "")); + Assert.assertEquals("3", + AtsClientService.get().getAttributeResolver().getSoleAttributeValue(teamWf, AtsAttributeTypes.Priority, "")); Assert.assertEquals(ai, teamWf.getActionableItems().iterator().next()); Assert.assertEquals(needBy, AtsClientService.get().getAttributeResolver().getSoleAttributeValue(teamWf, AtsAttributeTypes.NeedBy, "")); diff --git a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/util/ImportActionsViaSpreadsheetTest.java b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/util/ImportActionsViaSpreadsheetTest.java index 2e62348dbea..627541d0fef 100644 --- a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/util/ImportActionsViaSpreadsheetTest.java +++ b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/util/ImportActionsViaSpreadsheetTest.java @@ -101,7 +101,7 @@ public class ImportActionsViaSpreadsheetTest { Assert.assertNotNull(testWf); Assert.assertEquals("What needs to be done by Test team", testWf.getDescription()); - Assert.assertEquals("5", testWf.getSoleAttributeValue(AtsAttributeTypes.PriorityType, "")); + Assert.assertEquals("5", testWf.getSoleAttributeValue(AtsAttributeTypes.Priority, "")); Assert.assertTrue(testWf.getSoleAttributeValue(AtsAttributeTypes.EstimatedHours, 0.0) == 4.0); Assert.assertEquals("Improvement", testWf.getSoleAttributeValue(AtsAttributeTypes.ChangeType, null)); Assert.assertEquals("SAW_Bld_3", AtsClientService.get().getVersionService().getTargetedVersion(testWf).getName()); diff --git a/plugins/org.eclipse.osee.ats.ide/OSEE-INF/atsImport/Action_Import.xml b/plugins/org.eclipse.osee.ats.ide/OSEE-INF/atsImport/Action_Import.xml index 7960f58113a..f0cade2ec2f 100644 --- a/plugins/org.eclipse.osee.ats.ide/OSEE-INF/atsImport/Action_Import.xml +++ b/plugins/org.eclipse.osee.ats.ide/OSEE-INF/atsImport/Action_Import.xml @@ -47,7 +47,7 @@ <Cell><Data ss:Type="String">Priority</Data></Cell> <Cell><Data ss:Type="String">Version</Data></Cell> <Cell><Data ss:Type="String">EstimatedHours</Data></Cell> - <Cell><Data ss:Type="String">ats.Category</Data></Cell> + <Cell><Data ss:Type="String">ats.Category1</Data></Cell> </Row> <Row> <Cell><Data ss:Type="String">Fix the SAW Editor</Data></Cell> diff --git a/plugins/org.eclipse.osee.ats.ide/OSEE-INF/atsImport/Task_Import.xml b/plugins/org.eclipse.osee.ats.ide/OSEE-INF/atsImport/Task_Import.xml index 02d074120e4..4c085425e76 100644 --- a/plugins/org.eclipse.osee.ats.ide/OSEE-INF/atsImport/Task_Import.xml +++ b/plugins/org.eclipse.osee.ats.ide/OSEE-INF/atsImport/Task_Import.xml @@ -49,7 +49,7 @@ <Cell><Data ss:Type="String">Estimated Hours</Data></Cell> <Cell><Data ss:Type="String">Percent Complete</Data></Cell> <Cell><Data ss:Type="String">Notes</Data></Cell> - <Cell><Data ss:Type="String">ats.Category</Data></Cell> + <Cell><Data ss:Type="String">ats.Category1</Data></Cell> </Row> <Row> <Cell><Data ss:Type="String">1st Task</Data></Cell> diff --git a/plugins/org.eclipse.osee.ats.ide/OSEE-INF/orcsTypes/OseeTypes_ATS.osee b/plugins/org.eclipse.osee.ats.ide/OSEE-INF/orcsTypes/OseeTypes_ATS.osee index d222e9a3050..2fbbe07ea9f 100644 --- a/plugins/org.eclipse.osee.ats.ide/OSEE-INF/orcsTypes/OseeTypes_ATS.osee +++ b/plugins/org.eclipse.osee.ats.ide/OSEE-INF/orcsTypes/OseeTypes_ATS.osee @@ -66,7 +66,7 @@ artifactType "Agile Sprint" extends "ats.State Machine" { id 9088615648290692675 attribute "ats.Holiday" attribute "ats.Planned Points" - attribute "ats.Un-Planned Points" + attribute "ats.Unplanned Points" attribute "ats.kb.Story Name" } @@ -193,7 +193,7 @@ artifactType "Team Definition" extends "Responsible Team" , "Abstract Access Con attribute "ats.Team Uses Versions" attribute "ats.Require Targeted Version" attribute "ats.Baseline Branch Guid" - attribute "ats.Baseline Branch Uuid" + attribute "ats.Baseline Branch Id" attribute "ats.Action Details Format" attribute "ats.Allow Create Branch" attribute "ats.Allow Commit Branch" @@ -204,10 +204,10 @@ artifactType "Team Definition" extends "Responsible Team" , "Abstract Access Con attribute "ats.Related Peer Workflow Definition Reference" attribute "ats.Workflow Definition" attribute "ats.Workflow Definition Reference" - attribute "ats.Id Prefix" - attribute "ats.Id Sequence Name" + attribute "ats.ATS Id Prefix" + attribute "ats.ATS Id Sequence Name" attribute "ats.Team Workflow Artifact Type" - attribute "ats.closure.Active" + attribute "ats.Closure Active" attribute "ats.Work Type" attribute "ats.CSCI" attribute "ats.Program Uuid" @@ -229,11 +229,11 @@ artifactType "Version" extends "ats.Ats Artifact" { attribute "ats.Full Name" attribute "ats.Next Version" attribute "ats.Baseline Branch Guid" - attribute "ats.Baseline Branch Uuid" + attribute "ats.Baseline Branch Id" attribute "ats.Release Date" attribute "ats.Released" attribute "ats.Version Locked" - attribute "ats.TestRunToSourceLocator" + attribute "ats.Test Run To Source Locator" attribute "ats.closure.Closure State" attribute "ats.Allow Web Export" } @@ -241,7 +241,7 @@ artifactType "Version" extends "ats.Ats Artifact" { abstract artifactType "ats.State Machine" extends "ats.Ats Artifact" { id 71 attribute "ats.Work Package" - attribute "ats.Category" + attribute "ats.Category1" attribute "ats.Category2" attribute "ats.Category3" attribute "ats.Points" @@ -297,7 +297,7 @@ artifactType "Team Workflow" extends "ats.State Machine" , "Abstract Access Cont attribute "ats.Actionable Item Reference" attribute "ats.Branch Metrics" attribute "ats.Baseline Branch Guid" - attribute "ats.Baseline Branch Uuid" + attribute "ats.Baseline Branch Id" attribute "ats.Validation Required" attribute "ats.Weekly Benefit" attribute "ats.Change Type" @@ -493,7 +493,7 @@ attributeType "ats.Planned Points" extends IntegerAttribute { mediaType "text/plain" } -attributeType "ats.Un-Planned Points" extends IntegerAttribute { +attributeType "ats.Unplanned Points" extends IntegerAttribute { id 284254492767020802 dataProvider DefaultAttributeDataProvider min 0 @@ -779,7 +779,7 @@ attributeType "ats.Baseline Branch Guid" extends StringAttribute { mediaType "text/plain" } -attributeType "ats.Baseline Branch Uuid" extends StringAttribute { +attributeType "ats.Baseline Branch Id" extends StringAttribute { id 1152932018686787753 dataProvider DefaultAttributeDataProvider min 0 @@ -1519,7 +1519,7 @@ attributeType "ats.Goal Order Vote" extends StringAttribute { mediaType "text/plain" } -attributeType "ats.Category" extends StringAttribute { +attributeType "ats.Category1" extends StringAttribute { id 1152921504606847212 dataProvider DefaultAttributeDataProvider min 0 @@ -2046,7 +2046,7 @@ attributeType "ats.Id" extends StringAttribute { mediaType "text/plain" } -attributeType "ats.Id Prefix" extends StringAttribute { +attributeType "ats.ATS Id Prefix" extends StringAttribute { id 1162773128791720837 dataProvider DefaultAttributeDataProvider min 0 @@ -2055,7 +2055,7 @@ attributeType "ats.Id Prefix" extends StringAttribute { mediaType "text/plain" } -attributeType "ats.Id Sequence Name" extends StringAttribute { +attributeType "ats.ATS Id Sequence Name" extends StringAttribute { id 1163054603768431493 dataProvider DefaultAttributeDataProvider min 0 @@ -2064,7 +2064,7 @@ attributeType "ats.Id Sequence Name" extends StringAttribute { mediaType "text/plain" } -attributeType "ats.TestRunToSourceLocator" extends StringAttribute { +attributeType "ats.Test Run To Source Locator" extends StringAttribute { id 130595201919637916 dataProvider DefaultAttributeDataProvider min 0 @@ -2072,7 +2072,7 @@ attributeType "ats.TestRunToSourceLocator" extends StringAttribute { mediaType "text/plain" } -attributeType "ats.closure.Active" extends BooleanAttribute { +attributeType "ats.Closure Active" extends BooleanAttribute { id 1152921875139002555 dataProvider DefaultAttributeDataProvider min 0 diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/actions/wizard/AbstractWizardItem.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/actions/wizard/AbstractWizardItem.java index 0bf5f083add..16db10fd48f 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/actions/wizard/AbstractWizardItem.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/actions/wizard/AbstractWizardItem.java @@ -355,7 +355,7 @@ public abstract class AbstractWizardItem implements IAtsWizardItem, IDynamicWidg XCheckBox unPlanedCheckBox = (XCheckBox) teamDefFieldToWidget.get(teamDef, WizardFields.UnPlannedWork); if (unPlanedCheckBox != null) { boolean unplanned = unPlanedCheckBox.isChecked(); - changes.setSoleAttributeValue(teamWf, AtsAttributeTypes.UnPlannedWork, unplanned); + changes.setSoleAttributeValue(teamWf, AtsAttributeTypes.UnplannedWork, unplanned); } } diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/column/PriorityColumnUI.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/column/PriorityColumnUI.java index 37ebe7ca5c8..00b6f00c7ca 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/column/PriorityColumnUI.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/column/PriorityColumnUI.java @@ -70,7 +70,7 @@ public class PriorityColumnUI extends XViewerAtsAttributeValueColumn { return false; } } - PromptChangeUtil.promptChangeAttribute(teams, AtsAttributeTypes.PriorityType, persist, false); + PromptChangeUtil.promptChangeAttribute(teams, AtsAttributeTypes.Priority, persist, false); return true; } catch (Exception ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Can't change priority", ex); diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/config/AtsConfig2DataExample.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/config/AtsConfig2DataExample.java index da868dd32c0..1082a36f575 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/config/AtsConfig2DataExample.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/config/AtsConfig2DataExample.java @@ -46,7 +46,8 @@ public class AtsConfig2DataExample extends AbstractAtsConfig2Data { IAtsTeamDefinition dtsSoftwareTeam = AtsClientService.get().getTeamDefinitionService().getTeamDefinitionById(dtsSoftwareArt); - changes.setSoleAttributeValue(dtsSoftwareTeam, ConvertAtsConfigGuidAttributesOperations.RelatedTaskWorkDefinition, + changes.setSoleAttributeValue(dtsSoftwareTeam, + ConvertAtsConfigGuidAttributesOperations.RelatedTaskWorkflowDefinition, AtsWorkDefinitionTokens.WorkDef_Task_AtsConfig2Example); changes.setSoleAttributeValue(dtsSoftwareTeam, AtsAttributeTypes.RelatedTaskWorkDefinitionReference, AtsWorkDefinitionTokens.WorkDef_Task_AtsConfig2Example); diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/config/version/VersionReportJob.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/config/version/VersionReportJob.java index 55f259bdcf9..7a17c63ad45 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/config/version/VersionReportJob.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/config/version/VersionReportJob.java @@ -163,15 +163,13 @@ public class VersionReportJob extends Job { if (monitor != null) { monitor.subTask(str); } - sb.append(AHTML.addRowMultiColumnTable( - new String[] { - "Action", - teamWf.getTeamName(), - teamWf.getSoleAttributeValue(AtsAttributeTypes.PriorityType, ""), - ChangeTypeUtil.getChangeTypeStr(teamWf), - teamWf.getName(), - teamWf.getAtsId()}, - null, x % 2 == 0 ? null : "#cccccc")); + sb.append(AHTML.addRowMultiColumnTable(new String[] { + "Action", + teamWf.getTeamName(), + teamWf.getSoleAttributeValue(AtsAttributeTypes.Priority, ""), + ChangeTypeUtil.getChangeTypeStr(teamWf), + teamWf.getName(), + teamWf.getAtsId()}, null, x % 2 == 0 ? null : "#cccccc")); for (IAtsTask task : AtsClientService.get().getTaskService().getTasks(teamWf)) { sb.append( diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/editor/tab/workflow/util/WfePrint.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/editor/tab/workflow/util/WfePrint.java index ff3e75e268d..2b7e1e922c9 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/editor/tab/workflow/util/WfePrint.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/editor/tab/workflow/util/WfePrint.java @@ -97,7 +97,7 @@ public class WfePrint extends Action { // AHTML.getLabelValueStr(AHTML.LABEL_FONT, "Change Type: ", ChangeTypeUtil.getChangeTypeStr(sma)), AHTML.getLabelValueStr(AHTML.LABEL_FONT, "Priority: ", - sma.getSoleAttributeValue(AtsAttributeTypes.PriorityType, "")), + sma.getSoleAttributeValue(AtsAttributeTypes.Priority, "")), AHTML.getLabelValueStr(AHTML.LABEL_FONT, "Need By: ", DeadlineColumn.getDateStr(sma))})); String computedId = AtsClientService.get().getWorkItemService().getCombinedPcrId(sma); diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/navigate/AtsRemoteEventTestItem.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/navigate/AtsRemoteEventTestItem.java index 0cafda737fc..c40e6bf60c8 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/navigate/AtsRemoteEventTestItem.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/navigate/AtsRemoteEventTestItem.java @@ -214,7 +214,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { changes.deleteAttributes(teamWf, AtsAttributeTypes.Resolution); changes.setSoleAttributeFromString(teamWf, AtsAttributeTypes.Description, "description 4"); ChangeTypeUtil.setChangeType(teamWf, ChangeType.Support); - changes.setSoleAttributeFromString(teamWf, AtsAttributeTypes.PriorityType, "3"); + changes.setSoleAttributeFromString(teamWf, AtsAttributeTypes.Priority, "3"); AtsClientService.get().getVersionService().setTargetedVersion(teamWf, getSawBld3(), changes); changes.execute(); } @@ -240,7 +240,7 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { IAtsChangeSet changes = AtsClientService.get().createChangeSet(getClass().getSimpleName() + " Changes1"); changes.setSoleAttributeFromString(teamWf, AtsAttributeTypes.Description, "description 2"); changes.setSoleAttributeValue(teamWf, AtsAttributeTypes.ChangeType, ChangeType.Problem.name()); - changes.setSoleAttributeFromString(teamWf, AtsAttributeTypes.PriorityType, "2"); + changes.setSoleAttributeFromString(teamWf, AtsAttributeTypes.Priority, "2"); changes.setSoleAttributeFromString(teamWf, AtsAttributeTypes.ValidationRequired, "true"); AtsClientService.get().getVersionService().setTargetedVersion(teamWf, getSawBld1(), changes); changes.execute(); @@ -271,8 +271,8 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { testEquals("Description", "description", AtsClientService.get().getAttributeResolver().getSoleAttributeValue( teamWf, AtsAttributeTypes.Description, null)); testEquals("Change Type", ChangeType.Improvement, ChangeTypeUtil.getChangeType(teamWf)); - testEquals("Priority", "1", AtsClientService.get().getAttributeResolver().getSoleAttributeValue(teamWf, - AtsAttributeTypes.PriorityType, null)); + testEquals("Priority", "1", + AtsClientService.get().getAttributeResolver().getSoleAttributeValue(teamWf, AtsAttributeTypes.Priority, null)); } private void validateActionAtEnd(IAtsTeamWorkflow teamWf) { @@ -288,8 +288,8 @@ public class AtsRemoteEventTestItem extends WorldXNavigateItemAction { testEquals("Description", "description 4", AtsClientService.get().getAttributeResolver().getSoleAttributeValue( teamWf, AtsAttributeTypes.Description, null)); testEquals("Change Type", ChangeType.Support, ChangeTypeUtil.getChangeType(teamWf)); - testEquals("Priority", "3", AtsClientService.get().getAttributeResolver().getSoleAttributeValue(teamWf, - AtsAttributeTypes.PriorityType, null)); + testEquals("Priority", "3", + AtsClientService.get().getAttributeResolver().getSoleAttributeValue(teamWf, AtsAttributeTypes.Priority, null)); testEquals("Validation Required", false, AtsClientService.get().getAttributeResolver().getSoleAttributeValue( teamWf, AtsAttributeTypes.ValidationRequired, null)); diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/navigate/FirstTimeQualityMetricReportItem.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/navigate/FirstTimeQualityMetricReportItem.java index 5ca028024b2..d9f6ed7afa2 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/navigate/FirstTimeQualityMetricReportItem.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/navigate/FirstTimeQualityMetricReportItem.java @@ -151,7 +151,7 @@ public class FirstTimeQualityMetricReportItem extends XNavigateItemAction { Collection<TeamWorkFlowArtifact> arts = teamMet.getWorkflowsOriginatedBetween(nextReleaseStartDate, nextReleaseEndDate); for (TeamWorkFlowArtifact team : arts) { - String priorityStr = team.getSoleAttributeValue(AtsAttributeTypes.PriorityType, ""); + String priorityStr = team.getSoleAttributeValue(AtsAttributeTypes.Priority, ""); if (!team.isCancelled() && ChangeTypeUtil.getChangeType( team) == ChangeType.Problem && (priorityStr.equals("1") || priorityStr.equals("2"))) { numOrigDurningNextReleaseCycle++; diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/operation/CreateActionFromTaskBlam.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/operation/CreateActionFromTaskBlam.java index 8d361bfaa0c..0616a1af1be 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/operation/CreateActionFromTaskBlam.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/operation/CreateActionFromTaskBlam.java @@ -179,7 +179,7 @@ public class CreateActionFromTaskBlam extends AbstractBlam { // "<XWidget displayName=\"" + PRIORITY + "\" xwidgetType=\"XCombo(" + Collections.toString(",", AttributeTypeManager.getEnumerationValues( - AtsAttributeTypes.PriorityType)) + ")\" required=\"true\" horizontalLabel=\"true\"/>" + + AtsAttributeTypes.Priority)) + ")\" required=\"true\" horizontalLabel=\"true\"/>" + // "</xWidgets>"; } diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/internal/query/AtsQueryServiceImpl.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/internal/query/AtsQueryServiceImpl.java index 83dbed7c707..b2978b45194 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/internal/query/AtsQueryServiceImpl.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/internal/query/AtsQueryServiceImpl.java @@ -99,7 +99,7 @@ public class AtsQueryServiceImpl extends AbstractAtsQueryService { ArrayList<AtsSearchData> searches = new ArrayList<>(); ArtifactId userArt = atsUser.getStoreObject(); for (IAttribute<Object> attr : atsClient.getAttributeResolver().getAttributes(userArt, - AtsAttributeTypes.QuickSearch)) { + AtsAttributeTypes.AtsQuickSearch)) { String jsonValue = (String) attr.getValue(); if (jsonValue.contains("\"" + namespace + "\"")) { try { @@ -124,7 +124,7 @@ public class AtsQueryServiceImpl extends AbstractAtsQueryService { try { IAttribute<Object> attr = getAttrById(userArt, data.getId()); if (attr == null) { - changes.addAttribute((IAtsObject) atsUser, AtsAttributeTypes.QuickSearch, getStoreString(data)); + changes.addAttribute((IAtsObject) atsUser, AtsAttributeTypes.AtsQuickSearch, getStoreString(data)); } else { changes.setAttribute(userArt, attr, getStoreString(data)); } @@ -139,7 +139,7 @@ public class AtsQueryServiceImpl extends AbstractAtsQueryService { private IAttribute<Object> getAttrById(ArtifactId artifact, Long attrId) { for (IAttribute<Object> attr : atsClient.getAttributeResolver().getAttributes(artifact, - AtsAttributeTypes.QuickSearch)) { + AtsAttributeTypes.AtsQuickSearch)) { String jsonValue = (String) attr.getValue(); try { AtsSearchData data = fromJson(jsonValue); diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/util/Import/ExcelAtsActionArtifactExtractor.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/util/Import/ExcelAtsActionArtifactExtractor.java index 73be445f5f0..04894b0d9de 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/util/Import/ExcelAtsActionArtifactExtractor.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/util/Import/ExcelAtsActionArtifactExtractor.java @@ -253,7 +253,7 @@ public class ExcelAtsActionArtifactExtractor { createdBy, null, CreateTeamOption.Duplicate_If_Exists); changes.setSoleAttributeValue(teamWf, AtsAttributeTypes.Description, aData.desc); if (Strings.isValid(aData.priorityStr) && !aData.priorityStr.equals("<Select>")) { - changes.setSoleAttributeValue(teamWf, AtsAttributeTypes.PriorityType, aData.priorityStr); + changes.setSoleAttributeValue(teamWf, AtsAttributeTypes.Priority, aData.priorityStr); } changes.setSoleAttributeValue(teamWf, AtsAttributeTypes.ChangeType, aData.changeType); @@ -390,8 +390,7 @@ public class ExcelAtsActionArtifactExtractor { } public Map<IAtsTeamDefinition, Collection<IAtsActionableItem>> getTeamDefToAias(Collection<IAtsActionableItem> aias) { - Map<IAtsTeamDefinition, Collection<IAtsActionableItem>> teamDefToAias = - new HashMap<>(); + Map<IAtsTeamDefinition, Collection<IAtsActionableItem>> teamDefToAias = new HashMap<>(); for (IAtsActionableItem aia : aias) { IAtsTeamDefinition teamDef = TeamDefinitions.getImpactedTeamDefs(Arrays.asList(aia)).iterator().next(); if (teamDefToAias.containsKey(teamDef)) { diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/util/widgets/AtsAttributeXWidgetProvider.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/util/widgets/AtsAttributeXWidgetProvider.java index 410125a9c11..d975dff9525 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/util/widgets/AtsAttributeXWidgetProvider.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/util/widgets/AtsAttributeXWidgetProvider.java @@ -61,7 +61,7 @@ public class AtsAttributeXWidgetProvider extends DefaultAttributeXWidgetProvider layouts = super.getDynamicXWidgetLayoutData(attributeType); XWidgetRendererItem layoutData = layouts.get(0); layoutData.setXWidgetName(XTextFlatDam.WIDGET_ID); - } else if (attributeType.matches(AtsAttributeTypes.DslSheet, AtsAttributeTypes.TestToSourceLocator)) { + } else if (attributeType.matches(AtsAttributeTypes.DslSheet, AtsAttributeTypes.TestRunToSourceLocator)) { layouts = super.getDynamicXWidgetLayoutData(attributeType); XWidgetRendererItem layoutData = layouts.get(0); layoutData.getXOptionHandler().add(XOption.FILL_VERTICALLY); diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/action/ActionArtifactRollup.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/action/ActionArtifactRollup.java index 2060801aca0..5c33c6f55f1 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/action/ActionArtifactRollup.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/action/ActionArtifactRollup.java @@ -124,20 +124,20 @@ public class ActionArtifactRollup { String priorityType = null; Collection<TeamWorkFlowArtifact> teamArts = action.getTeams(); if (teamArts.size() == 1) { - priorityType = teamArts.iterator().next().getSoleAttributeValue(AtsAttributeTypes.PriorityType, ""); + priorityType = teamArts.iterator().next().getSoleAttributeValue(AtsAttributeTypes.Priority, ""); } else { for (TeamWorkFlowArtifact team : teamArts) { if (!team.isCancelled()) { if (priorityType == null) { - priorityType = team.getSoleAttributeValue(AtsAttributeTypes.PriorityType, ""); - } else if (!priorityType.equals(team.getSoleAttributeValue(AtsAttributeTypes.PriorityType, ""))) { + priorityType = team.getSoleAttributeValue(AtsAttributeTypes.Priority, ""); + } else if (!priorityType.equals(team.getSoleAttributeValue(AtsAttributeTypes.Priority, ""))) { return; } } } } if (Strings.isValid(priorityType)) { - action.setSoleAttributeValue(AtsAttributeTypes.PriorityType, priorityType); + action.setSoleAttributeValue(AtsAttributeTypes.Priority, priorityType); } } diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java index 1bc5a2260e8..192f162eba7 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/AgileEndpointImpl.java @@ -98,8 +98,8 @@ import org.eclipse.osee.ats.rest.internal.query.TokenSearchOperations; import org.eclipse.osee.ats.rest.internal.world.WorldResource; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.ArtifactToken; -import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.core.data.ArtifactTypeToken; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.util.JsonUtil; @@ -1129,7 +1129,7 @@ public class AgileEndpointImpl implements AgileEndpointApi { Conditions.assertNotNull(itemArt, "Work Item not found with id %s", itemId); IAgileItem item = atsApi.getWorkItemService().getAgileItem(itemArt); IAtsChangeSet changes = atsApi.createChangeSet("Set Agile UnPlanned", AtsCoreUsers.SYSTEM_USER); - changes.setSoleAttributeValue(item, AtsAttributeTypes.UnPlannedWork, unPlanned); + changes.setSoleAttributeValue(item, AtsAttributeTypes.UnplannedWork, unPlanned); changes.execute(); return Response.ok().build(); } diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/SprintPageBuilder.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/SprintPageBuilder.java index 8a37d021ffe..a418567b0e7 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/SprintPageBuilder.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/SprintPageBuilder.java @@ -79,7 +79,7 @@ public class SprintPageBuilder { if (includeInCount(item)) { ++numActionsCompleted; double points = getPointsFromAction(item); - if (item.getSoleAttributeValue(AtsAttributeTypes.UnPlannedWork, false)) { + if (item.getSoleAttributeValue(AtsAttributeTypes.UnplannedWork, false)) { walkupCompleted += points; } else { workCompleted += points; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/operations/SprintConfigOperations.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/operations/SprintConfigOperations.java index b55ed15f794..8850bb31f7a 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/operations/SprintConfigOperations.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/agile/operations/SprintConfigOperations.java @@ -49,7 +49,7 @@ public class SprintConfigOperations { configs.setPlannedPoints( atsApi.getAttributeResolver().getSoleAttributeValue(sprint, AtsAttributeTypes.PlannedPoints, 0).toString()); configs.setUnPlannedPoints( - atsApi.getAttributeResolver().getSoleAttributeValue(sprint, AtsAttributeTypes.UnPlannedPoints, 0).toString()); + atsApi.getAttributeResolver().getSoleAttributeValue(sprint, AtsAttributeTypes.UnplannedPoints, 0).toString()); for (Object holiday : atsApi.getAttributeResolver().getAttributeValues(sprint, AtsAttributeTypes.Holiday)) { if (holiday instanceof Date) { configs.addHoliday(AgileUtil.getDateStr((Date) holiday)); @@ -79,7 +79,7 @@ public class SprintConfigOperations { return sprintConfig; } updatePointsIfNecessary(sprintConfig.getUnPlannedPoints(), sprintConfig, sprint, - AtsAttributeTypes.UnPlannedPoints, changes); + AtsAttributeTypes.UnplannedPoints, changes); if (sprintConfig.getResults().isErrors()) { return sprintConfig; } diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java index a59f07bce35..4846dd44681 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java @@ -99,7 +99,7 @@ public class ActionPage { page.param("id", workItem.getId()); page.param("atsId", workItem.getAtsId()); page.param("originator", getCreatedByStr(workItem, action)); - page.param("priority", action.getSoleAttributeAsString(AtsAttributeTypes.PriorityType, "")); + page.param("priority", action.getSoleAttributeAsString(AtsAttributeTypes.Priority, "")); page.param("changeType", action.getSoleAttributeAsString(AtsAttributeTypes.ChangeType, "")); page.param("needBy", action.getSoleAttributeAsString(AtsAttributeTypes.NeedBy, "")); page.param("workflow", action.getArtifactType().toString()); diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsActionEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsActionEndpointImpl.java index 3663e9fbdd7..0c61314a1c8 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsActionEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsActionEndpointImpl.java @@ -278,8 +278,8 @@ public final class AtsActionEndpointImpl implements AtsActionEndpointApi { changes.setSoleAttributeValue(workItem, CoreAttributeTypes.Name, values.iterator().next()); attrTypeId = CoreAttributeTypes.Name; } else if (attrTypeIdOrKey.equals(AttributeKey.Priority.name())) { - changes.setSoleAttributeValue(workItem, AtsAttributeTypes.PriorityType, values.iterator().next()); - attrTypeId = AtsAttributeTypes.PriorityType; + changes.setSoleAttributeValue(workItem, AtsAttributeTypes.Priority, values.iterator().next()); + attrTypeId = AtsAttributeTypes.Priority; } else if (attrTypeIdOrKey.equals(AttributeKey.ColorTeam.name())) { changes.setSoleAttributeValue(workItem, AtsAttributeTypes.ColorTeam, values.iterator().next()); attrTypeId = AtsAttributeTypes.ColorTeam; @@ -477,7 +477,7 @@ public final class AtsActionEndpointImpl implements AtsActionEndpointApi { if (entry.getKey().equals("Title")) { query.andName(entry.getValue().iterator().next(), QueryOption.CONTAINS_MATCH_OPTIONS); } else if (entry.getKey().equals("Priority")) { - query.andAttr(AtsAttributeTypes.PriorityType, entry.getValue()); + query.andAttr(AtsAttributeTypes.Priority, entry.getValue()); } else if (entry.getKey().equals("ColorTeam")) { query.andColorTeam(entry.getValue().iterator().next()); } else if (entry.getKey().equals("Assignee")) { diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsAttributeEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsAttributeEndpointImpl.java index dd2a8803e4c..784488384a5 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsAttributeEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsAttributeEndpointImpl.java @@ -85,7 +85,7 @@ public final class AtsAttributeEndpointImpl implements AtsAttributeEndpointApi { } else if (id.equals(AttributeKey.IPT.name())) { getEnumValues(values, AtsAttributeTypes.IPT.getId()); } else if (id.equals(AttributeKey.Priority.name())) { - getEnumValues(values, AtsAttributeTypes.PriorityType.getId()); + getEnumValues(values, AtsAttributeTypes.Priority.getId()); } else if (Strings.isNumeric(id)) { getEnumValues(values, Long.valueOf(id)); } diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemJsonWriter.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemJsonWriter.java index 0d8ada8d85d..f92fd9db070 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemJsonWriter.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/WorkItemJsonWriter.java @@ -144,7 +144,7 @@ public class WorkItemJsonWriter implements MessageBodyWriter<IAtsWorkItem> { writer.writeEndArray(); } writer.writeStringField("ChangeType", workItemArt.getSoleAttributeAsString(AtsAttributeTypes.ChangeType, "")); - writer.writeStringField("Priority", workItemArt.getSoleAttributeAsString(AtsAttributeTypes.PriorityType, "")); + writer.writeStringField("Priority", workItemArt.getSoleAttributeAsString(AtsAttributeTypes.Priority, "")); writer.writeStringField("State", workItem.getStateMgr().getCurrentStateName()); if (options.contains(WorkItemWriterOptions.DatesAsLong)) { writer.writeStringField("CreatedDate", String.valueOf(workItem.getCreatedDate().getTime())); @@ -183,7 +183,7 @@ public class WorkItemJsonWriter implements MessageBodyWriter<IAtsWorkItem> { writer.writeStringField("TeamName", ActionPage.getTeamStr(atsApi, workItemArt)); writeAssignees(writer, workItemArt, workItem); writeType(writer, workItemArt, workItem, "ChangeType", AtsAttributeTypes.ChangeType); - writeType(writer, workItemArt, workItem, "Priority", AtsAttributeTypes.PriorityType); + writeType(writer, workItemArt, workItem, "Priority", AtsAttributeTypes.Priority); writeState(writer, workItemArt, workItem); if (options.contains(WorkItemWriterOptions.DatesAsLong)) { writer.writeStringField("CreatedDate", String.valueOf(workItem.getCreatedDate().getTime())); diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/operations/ActionOperations.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/operations/ActionOperations.java index bf619a61261..11a902bb91d 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/operations/ActionOperations.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/operations/ActionOperations.java @@ -65,8 +65,8 @@ public class ActionOperations { changes.setSoleAttributeValue(workItem, CoreAttributeTypes.Name, values.iterator().next()); attrTypeId = CoreAttributeTypes.Name; } else if (attrTypeIdOrKey.equals(AttributeKey.Priority.name())) { - changes.setSoleAttributeValue(workItem, AtsAttributeTypes.PriorityType, values.iterator().next()); - attrTypeId = AtsAttributeTypes.PriorityType; + changes.setSoleAttributeValue(workItem, AtsAttributeTypes.Priority, values.iterator().next()); + attrTypeId = AtsAttributeTypes.Priority; } else if (attrTypeIdOrKey.equals(AttributeKey.ColorTeam.name())) { changes.setSoleAttributeValue(workItem, AtsAttributeTypes.ColorTeam, values.iterator().next()); attrTypeId = AtsAttributeTypes.ColorTeam; diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/operations/ConvertWorkDefinitionOperations.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/operations/ConvertWorkDefinitionOperations.java index 9d83c1a3668..48dab444437 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/operations/ConvertWorkDefinitionOperations.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/operations/ConvertWorkDefinitionOperations.java @@ -110,7 +110,7 @@ public class ConvertWorkDefinitionOperations { int count = 0; IAtsChangeSet changes = atsApi.createChangeSet("Update Team Workflow Related Task WorkDef"); Collection<IAtsWorkItem> workItems = atsApi.getQueryService().createQuery(WorkItemType.TeamWorkflow).andExists( - ConvertAtsConfigGuidAttributesOperations.RelatedTaskWorkDefinition).getItems(); + ConvertAtsConfigGuidAttributesOperations.RelatedTaskWorkflowDefinition).getItems(); int size = workItems.size(); for (IAtsWorkItem workItem : workItems) { boolean deleted = atsApi.getStoreService().isDeleted(workItem); @@ -119,7 +119,7 @@ public class ConvertWorkDefinitionOperations { } rd.logf(String.format("TeamWfs TaskRel: Processing WorkItem WorkDef Set %s / %s", count++, size)); updatedCount = setNewWorkDefRefIfNecessary(rd, updatedCount, changes, workItem.getStoreObject(), - ConvertAtsConfigGuidAttributesOperations.RelatedTaskWorkDefinition, + ConvertAtsConfigGuidAttributesOperations.RelatedTaskWorkflowDefinition, AtsAttributeTypes.RelatedTaskWorkDefinitionReference); } changes.executeIfNeeded(); @@ -137,7 +137,7 @@ public class ConvertWorkDefinitionOperations { Map<AttributeTypeToken, AttributeTypeToken> oldAttrTypeToNewTypeMap = new HashMap<>(); oldAttrTypeToNewTypeMap.put(ConvertAtsConfigGuidAttributesOperations.WorkflowDefinition, AtsAttributeTypes.WorkflowDefinitionReference); - oldAttrTypeToNewTypeMap.put(ConvertAtsConfigGuidAttributesOperations.RelatedTaskWorkDefinition, + oldAttrTypeToNewTypeMap.put(ConvertAtsConfigGuidAttributesOperations.RelatedTaskWorkflowDefinition, AtsAttributeTypes.RelatedTaskWorkDefinitionReference); oldAttrTypeToNewTypeMap.put(ConvertAtsConfigGuidAttributesOperations.RelatedPeerWorkflowDefinition, AtsAttributeTypes.RelatedPeerWorkDefinitionReference); @@ -177,7 +177,8 @@ public class ConvertWorkDefinitionOperations { atsApi.getAttributeResolver().getSoleAttributeValue(artifact, newAttrType, ArtifactId.SENTINEL); if (newWorkDefArt.isInvalid()) { - IAtsWorkDefinition workDefinition = atsApi.getWorkDefinitionService().getWorkDefinitionByName(oldWorkDefName); + IAtsWorkDefinition workDefinition = + atsApi.getWorkDefinitionService().getWorkDefinitionByName(oldWorkDefName); if (workDefinition == null || workDefinition.isInvalid()) { rd.error(String.format("null/invalid Work Definition for work def name [%s] and art %s", oldWorkDefName, artifact)); |