diff options
22 files changed, 316 insertions, 365 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 25206da2eb1..53f13185c50 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 @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.api.data; import java.util.HashMap; import java.util.Map; -import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -22,161 +22,161 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; */ public final class AtsAttributeTypes { - public static final Map<String, IAttributeType> nameToTypeMap = new HashMap<>(); + public static final Map<String, AttributeTypeToken> nameToTypeMap = new HashMap<>(); // @formatter:off - public static final IAttributeType Actionable = createType(1152921504606847160L, "Actionable", "True if item can have Action written against or assigned to."); - public static final IAttributeType ActionableItem = createType(1152921504606847200L, "Actionable Item", "Actionable Items that are impacted by this change."); - public static final IAttributeType ActionDetailsFormat = createType(1152921504606847199L, "Action Details Format", "Format of string when push Action Details Copy button on SMA Workflow Editor."); - public static final IAttributeType Active = createType(1152921504606847153L, "Active", "Active ATS configuration object."); - public static final IAttributeType AllowCommitBranch = createType(1152921504606847162L, "Allow Commit Branch"); - public static final IAttributeType AllowCreateBranch = createType(1152921504606847161L, "Allow Create Branch"); - public static final IAttributeType AllowUserActionCreation = createType(1322118789779953012L, "Allow User Action Creation"); - public static final IAttributeType ArtifactReference = createType(1153126013769613561L, "Artifact Reference"); - public static final IAttributeType AtsId = createType(1152921504606847877L, "ATS Id", "ATS Generated Id"); - public static final IAttributeType AtsIdPrefix = createType(1162773128791720837L, "ATS Id Prefix", "ATS Id Prefix"); - public static final IAttributeType AtsIdSequenceName = createType(1163054603768431493L, "ATS Id Sequence Name", "ATS Id Sequence Name"); - public static final IAttributeType AtsConfiguredBranch = createType(72063456936722683L, "ATS Configured Branch", "ATS Configured Branch"); - public static final IAttributeType TaskToChangedArtifactReference = createType(1153126013769613562L, "Task To Changed Artifact Reference"); - public static final IAttributeType BaselineBranchUuid = createType(1152932018686787753L, "Baseline Branch Uuid", "Baseline branch associated with ATS object."); - - public static final IAttributeType Category1 = createType(1152921504606847212L, "Category", "Open field for user to be able to enter text to use for categorizing/sorting."); - public static final IAttributeType Category2 = createType(1152921504606847217L, "Category2", Category1.getDescription()); - public static final IAttributeType Category3 = createType(1152921504606847218L, "Category3", Category1.getDescription()); - - public static final IAttributeType ChangeType = createType(1152921504606847180L, "Change Type", "Type of change."); - - public static final IAttributeType CancelledDate = createType(1152921504606847169L, "Cancelled Date", "Date the workflow was cancelled."); - public static final IAttributeType CancelledBy = createType(1152921504606847170L, "Cancelled By", "UserId of the user who cancelled workflow."); - public static final IAttributeType CancelledReason = createType(1152921504606847171L, "Cancelled Reason", "Explanation of why worklfow was cancelled."); - public static final IAttributeType CancelledFromState = createType(1152921504606847172L, "Cancelled From State", "State workflow was in when cancelled."); - public static final IAttributeType CSCI = createType(72063457007112443L, "CSCI", "CSCI this Team is reponsible for."); - - public static final IAttributeType CreatedDate = createType(1152921504606847173L, "Created Date", "Date the workflow was created."); - public static final IAttributeType CreatedBy = createType(1152921504606847174L, "Created By", "UserId of the user who created the workflow."); - - public static final IAttributeType CompletedDate = createType(1152921504606847166L, "Completed Date", "Date the workflow was completed."); - public static final IAttributeType CompletedBy = createType(1152921504606847167L, "Completed By", "UserId of the user who completed workflow."); - public static final IAttributeType CompletedFromState = createType(1152921504606847168L, "Completed From State", "State workflow was in when completed."); - - public static final IAttributeType CurrentState = createType(1152921504606847192L, "Current State", "Current state of workflow state machine."); - public static final IAttributeType CurrentStateType = createType(1152921504606847147L, "Current State Type", "Type of Current State: InWork, Completed or Cancelled."); - public static final IAttributeType Decision = createType(1152921504606847221L, "Decision", "Option selected during decision review."); - - public static final IAttributeType 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 IAttributeType Default = createType(1152921875139002538L, "Default", "Default"); - public static final IAttributeType Description = createType(1152921504606847196L, "Description", "Detailed explanation."); - public static final IAttributeType DslSheet = createType(1152921504606847197L, "DSL Sheet", "XText DSL Sheet for ATS"); - public static final IAttributeType EstimatedCompletionDate = createType(1152921504606847165L, "Estimated Completion Date", "Date the changes will be completed."); - public static final IAttributeType EstimatedHours = createType(1152921504606847182L, "Estimated Hours", "Hours estimated to implement the changes associated with this Action.\nIncludes estimated hours for workflows, tasks and reviews."); - public static final IAttributeType EstimatedReleaseDate = createType(1152921504606847164L, "Estimated Release Date", "Date the changes will be made available to the users."); - public static final IAttributeType FullName = createType(1152921504606847198L, "Full Name", "Expanded and descriptive name."); - public static final IAttributeType GoalOrderVote = createType(1152921504606847211L, "Goal Order Vote", "Vote for order item belongs to within goal."); - public static final IAttributeType HoursPerWorkDay = createType(1152921504606847187L, "Hours Per Work Day"); - public static final IAttributeType IPT = createType(6025996821081174931L, "IPT", "Integrated Product Team"); - public static final IAttributeType LegacyPcrId = createType(1152921504606847219L, "Legacy PCR Id", "Field to register problem change report id from legacy items imported into ATS."); - public static final IAttributeType Location = createType(1152921504606847223L, "Location", "Enter location of materials to review."); - public static final IAttributeType LocChanged= createType(1152921504606847207L, "LOC Changed", "Total Lines of Code Changed"); - public static final IAttributeType LocReviewed = createType(1152921504606847208L, "LOC Reviewed", "Total Lines of Code Reviewed"); - public static final IAttributeType Log = createType(1152921504606847202L, "Log"); - - public static final IAttributeType MeetingLocation = createType(1152921504606847224L, "Meeting Location", "Location meeting is held."); - public static final IAttributeType MeetingAttendee = createType(1152921504606847225L, "Meeting Attendee", "Attendee of meeting."); - public static final IAttributeType MeetingLength = createType(1152921504606847188L, "Meeting Length", "Length of meeting."); - public static final IAttributeType MeetingDate = createType(5605018543870805270L, "Meeting Date"); - public static final IAttributeType VerificationCodeInspection = createType(3454966334779726518L, "Verification Code Inspection"); - - public static final IAttributeType NeedBy = createType(1152921504606847163L, "Need By", "Hard schedule date that workflow must be completed."); - public static final IAttributeType NextVersion = createType(1152921504606847157L, "Next Version", "True if version artifact is \"Next\" version to be released."); - public static final IAttributeType Numeric1 = createType(1152921504606847184L, "Numeric1", "Open field for user to be able to enter numbers for sorting."); - public static final IAttributeType Numeric2 = createType(1152921504606847185L, "Numeric2", Numeric1.getDescription()); - public static final IAttributeType OperationalImpact = createType(1152921504606847213L, "Operational Impact"); - public static final IAttributeType OperationalImpactDescription = createType(1152921504606847214L, "Operational Impact Description"); - public static final IAttributeType OperationalImpactWorkaround = createType(1152921504606847215L, "Operational Impact Workaround"); - public static final IAttributeType OperationalImpactWorkaroundDescription = createType(1152921504606847216L, "Operational Impact Workaround Description"); - public static final IAttributeType PagesChanged= createType(1152921504606847209L, "Pages Changed", "Total Pages of Changed"); - public static final IAttributeType PagesReviewed = createType(1152921504606847210L, "Pages Reviewed", "Total Pages Reviewed"); - public static final IAttributeType PercentRework = createType(1152921504606847189L, "Percent Rework"); - public static final IAttributeType PercentComplete = createType(1152921504606847183L, "Percent Complete"); - - public static final IAttributeType Points = createType(1152921504606847178L, "Points", "Abstract value that describes risk, complexity, and size of Actions."); - public static final IAttributeType PointsAttributeType = createType(1152921573057888257L, "Points Attribute Type", "Used to store the agile points type name (ats.Points or ats.Points Numeric)."); - public static final IAttributeType PointsNumeric = createType(1728793301637070003L, "Points Numeric", "Abstract value that describes risk, complexity, and size of Actions as float."); - public static final IAttributeType PriorityType = createType(1152921504606847179L, "Priority", "1 = High; 5 = Low"); - public static final IAttributeType Problem = createType(1152921504606847193L, "Problem", "Problem found during analysis."); - public static final IAttributeType ProposedResolution = createType(1152921504606847194L, "Proposed Resolution", "Recommended resolution."); - public static final IAttributeType QuickSearch = createType(72063457009467643L, "ATS Quick Search", "Saved ATS Quick Searches."); - public static final IAttributeType RelatedToState = createType(1152921504606847204L, "Related To State", "State of parent workflow this object is related to."); - public static final IAttributeType Released = createType(1152921504606847155L, "Released", "True if object is in a released state."); - public static final IAttributeType ReleaseDate = createType(1152921504606847175L, "Release Date", "Date the changes were made available to the users."); - public static final IAttributeType Resolution = createType(1152921504606847195L, "Resolution", "Implementation details."); - public static final IAttributeType ReviewBlocks = createType(1152921504606847176L, "Review Blocks", "Review Completion will block it's parent workflow in this manner."); - public static final IAttributeType ReviewDefect = createType(1152921504606847222L, "Review Defect"); - public static final IAttributeType ReviewFormalType = createType(1152921504606847177L, "Review Formal Type"); - public static final IAttributeType Role = createType(1152921504606847226L, "Role"); - public static final IAttributeType RuleDefinition = createType(1152921504606847150L, "Rule Definition"); - public static final IAttributeType SmaNote = createType(1152921504606847205L, "SMA Note", "Notes applicable to ATS object"); - public static final IAttributeType State = createType(1152921504606847191L, "State", "States of workflow state machine."); - public static final IAttributeType StateNotes = createType(1152921504606847203L, "State Notes"); - public static final IAttributeType StartDate = createType(1152921504606847382L, "Start Date"); - public static final IAttributeType Holiday = createType(72064629481881851L, "Holiday"); - public static final IAttributeType UnPlannedPoints = createType(284254492767020802L, "Un-Planned Points"); - public static final IAttributeType PlannedPoints = createType(232851836925913430L, "Planned Points"); - public static final IAttributeType EndDate = createType(1152921504606847383L, "End Date"); - public static final IAttributeType SwEnhancement = createType(1152921504606847227L, "SW Enhancement"); - public static final IAttributeType TeamDefinition = createType(1152921504606847201L, "Team Definition"); - public static final IAttributeType TestToSourceLocator = TokenFactory.createAttributeType(130595201919637916L, + public static final AttributeTypeToken Actionable = createType(1152921504606847160L, "Actionable", "True if item can have Action written against or assigned to."); + public static final AttributeTypeToken ActionableItem = createType(1152921504606847200L, "Actionable Item", "Actionable Items that are impacted by this change."); + public static final AttributeTypeToken ActionDetailsFormat = createType(1152921504606847199L, "Action Details Format", "Format of string when push Action Details Copy button on SMA Workflow Editor."); + public static final AttributeTypeToken Active = createType(1152921504606847153L, "Active", "Active ATS configuration object."); + 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 ArtifactReference = createType(1153126013769613561L, "Artifact Reference"); + public static final AttributeTypeToken AtsId = createType(1152921504606847877L, "ATS 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 AtsConfiguredBranch = createType(72063456936722683L, "ATS Configured Branch", "ATS Configured Branch"); + public static final AttributeTypeToken TaskToChangedArtifactReference = createType(1153126013769613562L, "Task To Changed Artifact Reference"); + public static final AttributeTypeToken BaselineBranchUuid = createType(1152932018686787753L, "Baseline Branch Uuid", "Baseline branch associated with ATS object."); + + 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 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."); + + public static final AttributeTypeToken CancelledDate = createType(1152921504606847169L, "Cancelled Date", "Date the workflow was cancelled."); + public static final AttributeTypeToken CancelledBy = createType(1152921504606847170L, "Cancelled By", "UserId of the user who cancelled workflow."); + public static final AttributeTypeToken CancelledReason = createType(1152921504606847171L, "Cancelled Reason", "Explanation of why worklfow was cancelled."); + public static final AttributeTypeToken CancelledFromState = createType(1152921504606847172L, "Cancelled From State", "State workflow was in when cancelled."); + public static final AttributeTypeToken CSCI = createType(72063457007112443L, "CSCI", "CSCI this Team is reponsible for."); + + public static final AttributeTypeToken CreatedDate = createType(1152921504606847173L, "Created Date", "Date the workflow was created."); + public static final AttributeTypeToken CreatedBy = createType(1152921504606847174L, "Created By", "UserId of the user who created the workflow."); + + public static final AttributeTypeToken CompletedDate = createType(1152921504606847166L, "Completed Date", "Date the workflow was completed."); + public static final AttributeTypeToken CompletedBy = createType(1152921504606847167L, "Completed By", "UserId of the user who completed workflow."); + public static final AttributeTypeToken CompletedFromState = createType(1152921504606847168L, "Completed From State", "State workflow was in when completed."); + + public static final AttributeTypeToken CurrentState = createType(1152921504606847192L, "Current State", "Current state of workflow state machine."); + public static final AttributeTypeToken CurrentStateType = createType(1152921504606847147L, "Current State Type", "Type of Current State: InWork, Completed or Cancelled."); + public static final AttributeTypeToken Decision = createType(1152921504606847221L, "Decision", "Option selected during decision review."); + + 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 EstimatedCompletionDate = createType(1152921504606847165L, "Estimated Completion Date", "Date the changes will be completed."); + public static final AttributeTypeToken EstimatedHours = createType(1152921504606847182L, "Estimated Hours", "Hours estimated to implement the changes associated with this Action.\nIncludes estimated hours for workflows, tasks and reviews."); + public static final AttributeTypeToken EstimatedReleaseDate = createType(1152921504606847164L, "Estimated Release Date", "Date the changes will be made available to the users."); + public static final AttributeTypeToken FullName = createType(1152921504606847198L, "Full Name", "Expanded and descriptive name."); + public static final AttributeTypeToken GoalOrderVote = createType(1152921504606847211L, "Goal Order Vote", "Vote for order item belongs to within goal."); + public static final AttributeTypeToken HoursPerWorkDay = createType(1152921504606847187L, "Hours Per Work Day"); + public static final AttributeTypeToken IPT = createType(6025996821081174931L, "IPT", "Integrated Product Team"); + public static final AttributeTypeToken LegacyPcrId = createType(1152921504606847219L, "Legacy PCR Id", "Field to register problem change report id from legacy items imported into ATS."); + public static final AttributeTypeToken Location = createType(1152921504606847223L, "Location", "Enter location of materials to review."); + public static final AttributeTypeToken LocChanged= createType(1152921504606847207L, "LOC Changed", "Total Lines of Code Changed"); + public static final AttributeTypeToken LocReviewed = createType(1152921504606847208L, "LOC Reviewed", "Total Lines of Code Reviewed"); + public static final AttributeTypeToken Log = createType(1152921504606847202L, "Log"); + + public static final AttributeTypeToken MeetingLocation = createType(1152921504606847224L, "Meeting Location", "Location meeting is held."); + public static final AttributeTypeToken MeetingAttendee = createType(1152921504606847225L, "Meeting Attendee", "Attendee of meeting."); + public static final AttributeTypeToken MeetingLength = createType(1152921504606847188L, "Meeting Length", "Length of meeting."); + public static final AttributeTypeToken MeetingDate = createType(5605018543870805270L, "Meeting Date"); + public static final AttributeTypeToken VerificationCodeInspection = createType(3454966334779726518L, "Verification Code Inspection"); + + public static final AttributeTypeToken NeedBy = createType(1152921504606847163L, "Need By", "Hard schedule date that workflow must be completed."); + public static final AttributeTypeToken NextVersion = createType(1152921504606847157L, "Next Version", "True if version artifact is \"Next\" version to be released."); + public static final AttributeTypeToken Numeric1 = createType(1152921504606847184L, "Numeric1", "Open field for user to be able to enter numbers for sorting."); + public static final AttributeTypeToken Numeric2 = createType(1152921504606847185L, "Numeric2", Numeric1.getDescription()); + public static final AttributeTypeToken OperationalImpact = createType(1152921504606847213L, "Operational Impact"); + public static final AttributeTypeToken OperationalImpactDescription = createType(1152921504606847214L, "Operational Impact Description"); + public static final AttributeTypeToken OperationalImpactWorkaround = createType(1152921504606847215L, "Operational Impact Workaround"); + public static final AttributeTypeToken OperationalImpactWorkaroundDescription = createType(1152921504606847216L, "Operational Impact Workaround Description"); + public static final AttributeTypeToken PagesChanged= createType(1152921504606847209L, "Pages Changed", "Total Pages of Changed"); + public static final AttributeTypeToken PagesReviewed = createType(1152921504606847210L, "Pages Reviewed", "Total Pages Reviewed"); + public static final AttributeTypeToken PercentRework = createType(1152921504606847189L, "Percent Rework"); + public static final AttributeTypeToken PercentComplete = createType(1152921504606847183L, "Percent Complete"); + + 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 PriorityType = createType(1152921504606847179L, "Priority", "1 = High; 5 = Low"); + public static final AttributeTypeToken Problem = createType(1152921504606847193L, "Problem", "Problem found during analysis."); + 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 RelatedToState = createType(1152921504606847204L, "Related To State", "State of parent workflow this object is related to."); + public static final AttributeTypeToken Released = createType(1152921504606847155L, "Released", "True if object is in a released state."); + public static final AttributeTypeToken ReleaseDate = createType(1152921504606847175L, "Release Date", "Date the changes were made available to the users."); + public static final AttributeTypeToken Resolution = createType(1152921504606847195L, "Resolution", "Implementation details."); + public static final AttributeTypeToken ReviewBlocks = createType(1152921504606847176L, "Review Blocks", "Review Completion will block it's parent workflow in this manner."); + public static final AttributeTypeToken ReviewDefect = createType(1152921504606847222L, "Review Defect"); + public static final AttributeTypeToken ReviewFormalType = createType(1152921504606847177L, "Review Formal Type"); + public static final AttributeTypeToken Role = createType(1152921504606847226L, "Role"); + public static final AttributeTypeToken RuleDefinition = createType(1152921504606847150L, "Rule Definition"); + public static final AttributeTypeToken SmaNote = createType(1152921504606847205L, "SMA Note", "Notes applicable to ATS object"); + 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 StartDate = createType(1152921504606847382L, "Start Date"); + public static final AttributeTypeToken Holiday = createType(72064629481881851L, "Holiday"); + public static final AttributeTypeToken UnPlannedPoints = createType(284254492767020802L, "Un-Planned Points"); + public static final AttributeTypeToken PlannedPoints = createType(232851836925913430L, "Planned Points"); + public static final AttributeTypeToken EndDate = createType(1152921504606847383L, "End Date"); + public static final AttributeTypeToken SwEnhancement = createType(1152921504606847227L, "SW Enhancement"); + public static final AttributeTypeToken TeamDefinition = createType(1152921504606847201L, "Team Definition"); + public static final AttributeTypeToken TestToSourceLocator = AttributeTypeToken.valueOf(130595201919637916L, "Test Run to Source Locator"); - public static final IAttributeType Title = createType(CoreAttributeTypes.Name.getId(), CoreAttributeTypes.Name.getName(), "Enter clear and concise title that can be generally understood."); - public static final IAttributeType ValidationRequired = createType(1152921504606847146L, "Validation Required", "If selected, originator will be asked to validate the implementation."); - public static final IAttributeType VersionLocked = createType(1152921504606847156L, "Version Locked", "True if version artifact is locked."); - public static final IAttributeType 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 IAttributeType WorkflowDefinition = createType(1152921504606847149L, "Workflow Definition", "Specific work flow definition id used by this Workflow artifact"); - public static final IAttributeType WorkType = createType(72063456955810043L, "Work Type", "Work Type of this Team."); - public static final IAttributeType TeamWorkflowArtifactType = createType(1152921504606847148L, "Team Workflow Artifact Type", "Specific Artifact Type to use in creation of Team Workflow"); - public static final IAttributeType RelatedTaskWorkDefinition = createType(1152921504606847152L, "Related Task Workflow Definition", "Specific work flow definition id used by Tasks related to this Workflow"); - public static final IAttributeType WorkPackage = createType(1152921504606847206L, "Work Package", "Designated accounting work package for completing workflow."); - public static final IAttributeType RelatedPeerWorkflowDefinition = createType(1152921504606847870L, "Related Peer Workflow Definition", "Specific work flow definition id used by Peer To Peer Reviews for this Team"); - - public static final IAttributeType WorkPackageId = createType(1152921504606847872L, "Work Package ID"); - public static final IAttributeType WorkPackageProgram = createType(1152921504606847873L, "Work Package Program"); - public static final IAttributeType WorkPackageType = createType(72057594037928065L, "Work Package Type"); - public static final IAttributeType ActivityId = createType(1152921504606847874L, "Activity ID"); - public static final IAttributeType UnPlannedWork = createType(2421093774890249189L, "Unplanned Work"); - public static final IAttributeType ActivityName = createType(1152921504606847875L, "Activity Name"); - public static final IAttributeType WorkPackageGuid = createType(1152921504606847876L, "Work Package Guid", "Work Package for this Team Workflow, Review, Task or Goal"); - - public static final IAttributeType ClosureActive = createType(1152921875139002555L, "Closure Active status of Program"); - public static final IAttributeType ClosureState = createType(1152921504606847452L, "Closure Status of Build"); + 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 ValidationRequired = createType(1152921504606847146L, "Validation Required", "If selected, originator will be asked to validate the implementation."); + 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 WorkflowDefinition = createType(1152921504606847149L, "Workflow Definition", "Specific work flow definition id used by this Workflow artifact"); + public static final AttributeTypeToken WorkType = createType(72063456955810043L, "Work Type", "Work Type of this Team."); + 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 RelatedTaskWorkDefinition = createType(1152921504606847152L, "Related Task Workflow Definition", "Specific work flow definition id used by Tasks related to this Workflow"); + public static final AttributeTypeToken WorkPackage = createType(1152921504606847206L, "Work Package", "Designated accounting work package for completing workflow."); + public static final AttributeTypeToken RelatedPeerWorkflowDefinition = createType(1152921504606847870L, "Related Peer Workflow Definition", "Specific work flow definition id used by Peer To Peer Reviews for this Team"); + + public static final AttributeTypeToken WorkPackageId = createType(1152921504606847872L, "Work Package ID"); + public static final AttributeTypeToken WorkPackageProgram = createType(1152921504606847873L, "Work Package Program"); + public static final AttributeTypeToken WorkPackageType = createType(72057594037928065L, "Work Package Type"); + public static final AttributeTypeToken ActivityId = createType(1152921504606847874L, "Activity ID"); + public static final AttributeTypeToken UnPlannedWork = createType(2421093774890249189L, "Unplanned Work"); + public static final AttributeTypeToken ActivityName = createType(1152921504606847875L, "Activity Name"); + public static final AttributeTypeToken WorkPackageGuid = createType(1152921504606847876L, "Work Package Guid", "Work Package for this Team Workflow, Review, Task or Goal"); + + public static final AttributeTypeToken ClosureActive = createType(1152921875139002555L, "Closure Active status of Program"); + public static final AttributeTypeToken ClosureState = createType(1152921504606847452L, "Closure Status of Build"); // Applicability Feature - public static final IAttributeType ApplicabilityWorkflow = createType(1152922022510067882L, "Applicability Workflow"); - public static final IAttributeType ApplicableToProgram = createType(1152921949227188394L, "Applicable To Program"); - public static final IAttributeType DuplicatedPcrId = createType(1152922093378076842L, "Duplicated PCR Id"); - public static final IAttributeType OriginatingPcrId = createType(1152922093379125418L, "Originating PCR Id"); - public static final IAttributeType PcrToolId = createType(1152922093370736810L, "PCR Tool Id"); - public static final IAttributeType ProgramUuid = createType(1152922093377028266L, "Program Uuid"); - public static final IAttributeType Rationale = createType(1152922093379715242L, "Rationale"); + public static final AttributeTypeToken ApplicabilityWorkflow = createType(1152922022510067882L, "Applicability Workflow"); + public static final AttributeTypeToken ApplicableToProgram = createType(1152921949227188394L, "Applicable To Program"); + public static final AttributeTypeToken DuplicatedPcrId = createType(1152922093378076842L, "Duplicated PCR Id"); + public static final AttributeTypeToken OriginatingPcrId = createType(1152922093379125418L, "Originating PCR Id"); + public static final AttributeTypeToken PcrToolId = createType(1152922093370736810L, "PCR Tool Id"); + public static final AttributeTypeToken ProgramUuid = createType(1152922093377028266L, "Program Uuid"); + public static final AttributeTypeToken Rationale = createType(1152922093379715242L, "Rationale"); - public static final IAttributeType ColorTeam = createType(1364016837443371647L, "Color Team"); + public static final AttributeTypeToken ColorTeam = createType(1364016837443371647L, "Color Team"); // Program - public static final IAttributeType Namespace = createType(4676151691645786526L, "Namespace"); + public static final AttributeTypeToken Namespace = createType(4676151691645786526L, "Namespace"); // @formatter:on - private static IAttributeType createType(Long guid, String name) { - IAttributeType type = TokenFactory.createAttributeType(guid, "ats." + name); + private static AttributeTypeToken createType(Long guid, String name) { + AttributeTypeToken type = AttributeTypeToken.valueOf(guid, "ats." + name); nameToTypeMap.put(type.getName(), type); return type; } - private static IAttributeType createType(Long guid, String name, String description) { - IAttributeType type = TokenFactory.createAttributeType(guid, "ats." + name, description); + private static AttributeTypeToken createType(Long guid, String name, String description) { + AttributeTypeToken type = AttributeTypeToken.valueOf(guid, "ats." + name, description); nameToTypeMap.put(type.getName(), type); return type; } - public static IAttributeType getTypeByName(String name) { + public static AttributeTypeToken getTypeByName(String name) { return nameToTypeMap.get(name); } } diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/ConvertOracleToOseeTypes.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/ConvertOracleToOseeTypes.java index 9d0dd6a11cc..9c9e43f5b2e 100644 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/ConvertOracleToOseeTypes.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/util/ConvertOracleToOseeTypes.java @@ -109,7 +109,7 @@ public class ConvertOracleToOseeTypes { } public String getAttrJavaType(String javaFieldName, String attrTypeName) { - return String.format("public static final AttributeTypeId %s = TokenFactory.createAttributeType(UUIDL, \"%s\");\n", + return String.format("public static final AttributeTypeId %s = AttributeTypeToken.valueOf(UUIDL, \"%s\");\n", javaFieldName, attrTypeName); } diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/convert/ConvertBaselineGuidToBaselineUuid.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/convert/ConvertBaselineGuidToBaselineUuid.java index 3e687a4ff03..4953fda6f4e 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/convert/ConvertBaselineGuidToBaselineUuid.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/convert/ConvertBaselineGuidToBaselineUuid.java @@ -35,7 +35,7 @@ public class ConvertBaselineGuidToBaselineUuid extends AbstractConvertGuidToUuid // Leave this attribute definition and conversion for other OSEE sites to convert private static final AttributeTypeToken BaselineBranchGuid = - TokenFactory.createAttributeType(1152921504606847145L, "ats.Baseline Branch Guid"); + AttributeTypeToken.valueOf(1152921504606847145L, "ats.Baseline Branch Guid"); public ConvertBaselineGuidToBaselineUuid(Log logger, JdbcClient jdbcClient, OrcsApi orcsApi, IAtsServer atsServer) { super(logger, jdbcClient, orcsApi, atsServer); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/OpenWorkPackageByIdAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/OpenWorkPackageByIdAction.java index e05fbf08652..9d176d042c8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/OpenWorkPackageByIdAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ev/OpenWorkPackageByIdAction.java @@ -42,7 +42,7 @@ import org.eclipse.osee.framework.ui.swt.ImageManager; public class OpenWorkPackageByIdAction extends Action { public static final AttributeTypeToken FinancialSystemId = - TokenFactory.createAttributeType(72063457009467630L, "Financial System Id"); + AttributeTypeToken.valueOf(72063457009467630L, "Financial System Id"); public OpenWorkPackageByIdAction() { this("Open Work Package by ID(s)"); diff --git a/plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/DemoTypes.java b/plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/DemoTypes.java index 9584e3b7f73..989f039b800 100644 --- a/plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/DemoTypes.java +++ b/plugins/org.eclipse.osee.client.demo/src/org/eclipse/osee/client/demo/DemoTypes.java @@ -23,7 +23,7 @@ public final class DemoTypes { public static final IArtifactType DemoTestRequirement = TokenFactory.createArtifactType(86, "Demo Artifact With Selective Partition"); public static final IArtifactType DemoDslArtifact = TokenFactory.createArtifactType(204526342635554L, "Demo DSL Artifact"); - public static final AttributeTypeToken DemoDslAttribute = TokenFactory.createAttributeType(1153126013769613775L, "AxRbLlj+c2ZHjBeumfgA"); + public static final AttributeTypeToken DemoDslAttribute = AttributeTypeToken.valueOf(1153126013769613775L, "AxRbLlj+c2ZHjBeumfgA"); // @formatter:on private DemoTypes() { diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/DispoConstants.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/DispoConstants.java index 148114947e1..446794edf87 100644 --- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/DispoConstants.java +++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/DispoConstants.java @@ -13,7 +13,7 @@ package org.eclipse.osee.disposition.rest; import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON; import org.eclipse.osee.framework.core.data.ArtifactToken; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -26,28 +26,28 @@ public final class DispoConstants { public static final IArtifactType DispoSet = TokenFactory.createArtifactType(807, "Disposition Set"); public static final IArtifactType DispoItem = TokenFactory.createArtifactType(808, "Dispositionable Item"); - public static final IAttributeType DispoType= TokenFactory.createAttributeType(1152921504606847893L, "dispo.Dispo Config"); - public static final IAttributeType ImportPath= TokenFactory.createAttributeType(1152921504606847881L, "dispo.Import Path"); - public static final IAttributeType ImportState= TokenFactory.createAttributeType(3458764513820541334L, "dispo.Import State"); - public static final IAttributeType OperationSummary= TokenFactory.createAttributeType(1152921504606847895L, "dispo.Operation Summary"); - public static final IAttributeType DispoAnnotationsJson = TokenFactory.createAttributeType(1152921504606847878L, "dispo.Annotations JSON"); - public static final IAttributeType DispoDiscrepanciesJson = TokenFactory.createAttributeType(1152921504606847879L, "dispo.Discrepancies JSON"); - public static final IAttributeType DispoNotesJson = TokenFactory.createAttributeType(1152921504606847880L, "dispo.Notes JSON"); - public static final IAttributeType DispoDateCreated = TokenFactory.createAttributeType(1152921504606847889L, "dispo.Date Created"); - public static final IAttributeType DispoLastUpdated = TokenFactory.createAttributeType(1152921504606847890L, "dispo.Last Updated"); - public static final IAttributeType DispoItemStatus = TokenFactory.createAttributeType(3458764513820541336L, "dispo.Item Status"); - public static final IAttributeType DispoItemTotalPoints = TokenFactory.createAttributeType(3458764513820541443L, "dispo.Total Points"); - public static final IAttributeType DispoItemNeedsRerun = TokenFactory.createAttributeType(3458764513820541444L, "dispo.Needs Rerun"); - public static final IAttributeType DispoItemVersion = TokenFactory.createAttributeType(3458764513820541440L, "dispo.Item Version"); - public static final IAttributeType DispoItemAssignee = TokenFactory.createAttributeType(3458764513820541441L, "dispo.Assignee"); - public static final IAttributeType DispoItemCategory = TokenFactory.createAttributeType(3458764513820541442L, "dispo.Category"); - public static final IAttributeType DispoItemMachine = TokenFactory.createAttributeType(3458764513820541446L, "dispo.Machine"); - public static final IAttributeType DispoItemElapsedTime = TokenFactory.createAttributeType(3458764513820541447L, "dispo.Elapsed Time"); - public static final IAttributeType DispoItemAborted = TokenFactory.createAttributeType(3458764513820541448L, "dispo.Aborted"); - public static final IAttributeType DispoItemItemNotes = TokenFactory.createAttributeType(3458764513820541456L, "dispo.Item Notes"); - public static final IAttributeType DispoItemNeedsReview = TokenFactory.createAttributeType(3458764513820541458L, "dispo.Needs Review"); - public static final IAttributeType DispoItemFileNumber = TokenFactory.createAttributeType(3458764513820541715L, "dispo.File Number"); - public static final IAttributeType DispoItemMethodNumber = TokenFactory.createAttributeType(3458764513820541460L, "dispo.Method Number"); + public static final AttributeTypeToken DispoType= AttributeTypeToken.valueOf(1152921504606847893L, "dispo.Dispo Config"); + public static final AttributeTypeToken ImportPath= AttributeTypeToken.valueOf(1152921504606847881L, "dispo.Import Path"); + public static final AttributeTypeToken ImportState= AttributeTypeToken.valueOf(3458764513820541334L, "dispo.Import State"); + public static final AttributeTypeToken OperationSummary= AttributeTypeToken.valueOf(1152921504606847895L, "dispo.Operation Summary"); + public static final AttributeTypeToken DispoAnnotationsJson = AttributeTypeToken.valueOf(1152921504606847878L, "dispo.Annotations JSON"); + public static final AttributeTypeToken DispoDiscrepanciesJson = AttributeTypeToken.valueOf(1152921504606847879L, "dispo.Discrepancies JSON"); + public static final AttributeTypeToken DispoNotesJson = AttributeTypeToken.valueOf(1152921504606847880L, "dispo.Notes JSON"); + public static final AttributeTypeToken DispoDateCreated = AttributeTypeToken.valueOf(1152921504606847889L, "dispo.Date Created"); + public static final AttributeTypeToken DispoLastUpdated = AttributeTypeToken.valueOf(1152921504606847890L, "dispo.Last Updated"); + public static final AttributeTypeToken DispoItemStatus = AttributeTypeToken.valueOf(3458764513820541336L, "dispo.Item Status"); + public static final AttributeTypeToken DispoItemTotalPoints = AttributeTypeToken.valueOf(3458764513820541443L, "dispo.Total Points"); + public static final AttributeTypeToken DispoItemNeedsRerun = AttributeTypeToken.valueOf(3458764513820541444L, "dispo.Needs Rerun"); + public static final AttributeTypeToken DispoItemVersion = AttributeTypeToken.valueOf(3458764513820541440L, "dispo.Item Version"); + public static final AttributeTypeToken DispoItemAssignee = AttributeTypeToken.valueOf(3458764513820541441L, "dispo.Assignee"); + public static final AttributeTypeToken DispoItemCategory = AttributeTypeToken.valueOf(3458764513820541442L, "dispo.Category"); + public static final AttributeTypeToken DispoItemMachine = AttributeTypeToken.valueOf(3458764513820541446L, "dispo.Machine"); + public static final AttributeTypeToken DispoItemElapsedTime = AttributeTypeToken.valueOf(3458764513820541447L, "dispo.Elapsed Time"); + public static final AttributeTypeToken DispoItemAborted = AttributeTypeToken.valueOf(3458764513820541448L, "dispo.Aborted"); + public static final AttributeTypeToken DispoItemItemNotes = AttributeTypeToken.valueOf(3458764513820541456L, "dispo.Item Notes"); + public static final AttributeTypeToken DispoItemNeedsReview = AttributeTypeToken.valueOf(3458764513820541458L, "dispo.Needs Review"); + public static final AttributeTypeToken DispoItemFileNumber = AttributeTypeToken.valueOf(3458764513820541715L, "dispo.File Number"); + public static final AttributeTypeToken DispoItemMethodNumber = AttributeTypeToken.valueOf(3458764513820541460L, "dispo.Method Number"); public static final ArtifactToken DISPO_ARTIFACT = ArtifactToken.valueOf(4757831, "DispositionTypes", COMMON, CoreArtifactTypes.OseeTypeDefinition); diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/coverage/CoverageUtil.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/coverage/CoverageUtil.java index f1674f06850..7634fb44f9d 100644 --- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/coverage/CoverageUtil.java +++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/importer/coverage/CoverageUtil.java @@ -28,7 +28,7 @@ public class CoverageUtil { public static final IArtifactType CoverageFolder = TokenFactory.createArtifactType(0x000000000000004D, "Coverage Folder"); // Attributes - public static final AttributeTypeToken Item = TokenFactory.createAttributeType(1152921504606847236L, "coverage.Coverage Item"); + public static final AttributeTypeToken Item = AttributeTypeToken.valueOf(1152921504606847236L, "coverage.Coverage Item"); //@formatter:on diff --git a/plugins/org.eclipse.osee.doors.connector.ui/src/org/eclipse/osee/doors/connector/ui/handler/DoorsCreator.java b/plugins/org.eclipse.osee.doors.connector.ui/src/org/eclipse/osee/doors/connector/ui/handler/DoorsCreator.java index bf26cc7be29..63ac958da7b 100644 --- a/plugins/org.eclipse.osee.doors.connector.ui/src/org/eclipse/osee/doors/connector/ui/handler/DoorsCreator.java +++ b/plugins/org.eclipse.osee.doors.connector.ui/src/org/eclipse/osee/doors/connector/ui/handler/DoorsCreator.java @@ -9,6 +9,7 @@ import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING; import java.util.HashSet; import java.util.Set; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -66,19 +67,18 @@ public class DoorsCreator { if (artifact == null) { newArtifact = parentArtifact.addNewChild(PREEXISTING, TokenFactory.createArtifactType(5764607523034243073L, "DoorsRequirement"), reqName); - newArtifact.setSoleAttributeFromString( - TokenFactory.createAttributeType(5764607523034243075L, "Door Req Name"), reqName); - newArtifact.setSoleAttributeFromString( - TokenFactory.createAttributeType(0x0000000000002006, "Door Req URL"), url); + newArtifact.setSoleAttributeFromString(AttributeTypeToken.valueOf(5764607523034243075L, "Door Req Name"), + reqName); + newArtifact.setSoleAttributeFromString(AttributeTypeToken.valueOf(0x0000000000002006, "Door Req URL"), + url); newArtifact.setName(reqName); newArtifact.persist(trans); trans.execute(); } else { - artifact.setSoleAttributeFromString( - TokenFactory.createAttributeType(5764607523034243075L, "Door Req Name"), reqName); - artifact.setSoleAttributeFromString(TokenFactory.createAttributeType(0x0000000000002006, "Door Req URL"), - url); + artifact.setSoleAttributeFromString(AttributeTypeToken.valueOf(5764607523034243075L, "Door Req Name"), + reqName); + artifact.setSoleAttributeFromString(AttributeTypeToken.valueOf(0x0000000000002006, "Door Req URL"), url); artifact.setName(reqName); artifact.persist(trans); diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeUtil.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeUtil.java index b2d4946892a..6ee7c53ee2c 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeUtil.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeUtil.java @@ -10,8 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.dsl.integration.internal; -import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.AttributeTypeId; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; +import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.dsl.oseeDsl.AccessPermissionEnum; @@ -47,7 +48,7 @@ public final class OseeUtil { } public static AttributeTypeId toToken(XAttributeType model) throws OseeCoreException { - return TokenFactory.createAttributeType(checkAndGetUuid(model), Strings.unquote(model.getName())); + return AttributeTypeToken.valueOf(checkAndGetUuid(model), Strings.unquote(model.getName())); } public static IRelationType toToken(XRelationType model) throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IAttributeType.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IAttributeType.java deleted file mode 100644 index 7939a58e230..00000000000 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IAttributeType.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.framework.core.data; - -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.eclipse.osee.framework.jdk.core.type.IdSerializer; - -/** - * @author Ryan D. Brooks - */ -@JsonSerialize(using = IdSerializer.class) -public interface IAttributeType extends AttributeTypeToken { - -}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java index 45831fb3c2e..1c2a2e5b0a5 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java @@ -43,14 +43,6 @@ public final class TokenFactory { return null; } - public static IAttributeType createAttributeType(long guid, String name) { - return new AttributeTypeToken(guid, name); - } - - public static IAttributeType createAttributeType(long guid, String name, String description) { - return new AttributeTypeToken(guid, name, description); - } - public static RelationTypeToken createRelationType(long id, String name) { return RelationTypeToken.create(id, name); } @@ -79,24 +71,6 @@ public final class TokenFactory { } } - private final static class AttributeTypeToken extends NamedIdBase implements IAttributeType { - private final String description; - - public AttributeTypeToken(Long guid, String name) { - this(guid, name, null); - } - - public AttributeTypeToken(Long guid, String name, String description) { - super(guid, name); - this.description = description; - } - - @Override - public String getDescription() { - return description; - } - } - private static class UserToken extends NamedIdBase implements IUserToken { private final String userId; private final boolean active; 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 d71cb44cef7..74820810577 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 @@ -10,8 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.enums; -import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; /** * @author Roberto E. Escobar @@ -19,90 +18,90 @@ import org.eclipse.osee.framework.core.data.TokenFactory; public final class CoreAttributeTypes { // @formatter:off - public static final IAttributeType Afha = TokenFactory.createAttributeType(1152921504606847139L, "AFHA"); - public static final IAttributeType AccessContextId = TokenFactory.createAttributeType(1152921504606847102L, "Access Context Id"); - public static final IAttributeType Active = TokenFactory.createAttributeType(1152921504606847065L, "Active"); - public static final IAttributeType Annotation = TokenFactory.createAttributeType(1152921504606847094L, "Annotation"); - public static final IAttributeType ArtifactReference = TokenFactory.createAttributeType(1153126013769613560L, "Artifact Reference"); - public static final IAttributeType PlainTextContent = TokenFactory.createAttributeType(1152921504606847866L, "Plain Text Content"); - public static final IAttributeType BranchReference = TokenFactory.createAttributeType(1153126013769613563L, "Branch Reference"); - public static final IAttributeType Category = TokenFactory.createAttributeType(1152921504606847121L, "Category"); - public static final IAttributeType City = TokenFactory.createAttributeType(1152921504606847068L, "City"); - public static final IAttributeType CommonNalRequirement = TokenFactory.createAttributeType(1152921504606847105L, "Common NAL Requirement"); - public static final IAttributeType Company = TokenFactory.createAttributeType(1152921504606847066L, "Company"); - public static final IAttributeType CompanyTitle = TokenFactory.createAttributeType(1152921504606847067L, "Company Title"); - public static final IAttributeType Component = TokenFactory.createAttributeType(1152921504606847125L, "Component"); - public static final IAttributeType ContentUrl = TokenFactory.createAttributeType(1152921504606847100L, "Content URL"); - public static final IAttributeType Country = TokenFactory.createAttributeType(1152921504606847072L, "Country"); - public static final IAttributeType CrewInterfaceRequirement = TokenFactory.createAttributeType(1152921504606847106L, "Crew Interface Requirement"); - public static final IAttributeType Csci = TokenFactory.createAttributeType(1152921504606847136L, "CSCI"); - public static final IAttributeType DataRightsClassification = TokenFactory.createAttributeType(1152921504606847317L, "Data Rights Classification"); - public static final IAttributeType DataRightsBasis = TokenFactory.createAttributeType(72057594037928276L, "Data Rights Basis"); - public static final IAttributeType SubjectMatterExpert = TokenFactory.createAttributeType(72057594037928275L, "Subject Matter Expert"); - public static final IAttributeType DefaultMailServer = TokenFactory.createAttributeType(1152921504606847063L, "osee.config.Default Mail Server"); - public static final IAttributeType DefaultGroup = TokenFactory.createAttributeType(1152921504606847086L, "Default Group"); - public static final IAttributeType Description = TokenFactory.createAttributeType(1152921504606847090L, "Description"); - public static final IAttributeType Dictionary = TokenFactory.createAttributeType(1152921504606847083L, "Dictionary"); - public static final IAttributeType Effectivity = TokenFactory.createAttributeType(1152921504606847108L, "Effectivity"); - public static final IAttributeType Email = TokenFactory.createAttributeType(1152921504606847082L, "Email"); - public static final IAttributeType Extension = TokenFactory.createAttributeType(1152921504606847064L, "Extension"); - public static final IAttributeType FavoriteBranch = TokenFactory.createAttributeType(1152921504606847074L, "Favorite Branch"); - public static final IAttributeType FaxPhone = TokenFactory.createAttributeType(1152921504606847081L, "Fax Phone"); - public static final IAttributeType FunctionalCategory = TokenFactory.createAttributeType(1152921504606847871L, "Functional Category"); - public static final IAttributeType FunctionalDAL = TokenFactory.createAttributeType(8007959514939954596L, "Functional Development Assurance Level"); - public static final IAttributeType FunctionalDALRationale = TokenFactory.createAttributeType(926274413268034710L, "Functional Development Assurance Level Rationale"); - public static final IAttributeType GeneralStringData = TokenFactory.createAttributeType(1152921504606847096L, "General String Data"); - public static final IAttributeType GfeCfe = TokenFactory.createAttributeType(1152921504606847144L, "GFE / CFE"); - public static final IAttributeType GraphitiDiagram = TokenFactory.createAttributeType(1152921504606847319L, "Graphiti Diagram"); - public static final IAttributeType Hazard = TokenFactory.createAttributeType(1152921504606847138L, "Hazard"); - public static final IAttributeType HazardSeverity = TokenFactory.createAttributeType(1152921504606847141L, "Hazard Severity"); - public static final IAttributeType HTMLContent = TokenFactory.createAttributeType(1152921504606847869L, "HTML Content"); - public static final IAttributeType ImageContent = TokenFactory.createAttributeType(1152921504606847868L, "Image Content"); - public static final IAttributeType IdValue = TokenFactory.createAttributeType(72057896045641815L, "ID Value"); - public static final IAttributeType ItemDAL = TokenFactory.createAttributeType(2612838829556295211L, "Item Development Assurance Level"); - public static final IAttributeType ItemDALRationale = TokenFactory.createAttributeType(2517743638468399405L, "Item Development Assurance Level Rationale"); - public static final IAttributeType LegacyDAL = TokenFactory.createAttributeType(1152921504606847120L, "Legacy Development Assurance Level"); - public static final IAttributeType LegacyId = TokenFactory.createAttributeType(1152921504606847107L, "Legacy Id"); - public static final IAttributeType MobilePhone = TokenFactory.createAttributeType(1152921504606847080L, "Mobile Phone"); - public static final IAttributeType Name = TokenFactory.createAttributeType(1152921504606847088L, "Name"); - public static final IAttributeType NativeContent = TokenFactory.createAttributeType(1152921504606847097L, "Native Content"); - public static final IAttributeType Notes = TokenFactory.createAttributeType(1152921504606847085L, "Notes"); - public static final IAttributeType PageType = TokenFactory.createAttributeType(1152921504606847091L, "Page Type"); - public static final IAttributeType ParagraphNumber = TokenFactory.createAttributeType(1152921504606847101L, "Paragraph Number"); - public static final IAttributeType Partition = TokenFactory.createAttributeType(1152921504606847111L, "Partition"); - public static final IAttributeType Phone = TokenFactory.createAttributeType(1152921504606847079L, "Phone"); - public static final IAttributeType PublishInline = TokenFactory.createAttributeType(1152921504606847122L, "PublishInline"); - public static final IAttributeType QualificationMethod = TokenFactory.createAttributeType(1152921504606847113L, "Qualification Method"); - public static final IAttributeType RendererOptions = TokenFactory.createAttributeType(904, "Renderer Options"); - public static final IAttributeType RelationOrder = TokenFactory.createAttributeType(1152921504606847089L, "Relation Order"); - public static final IAttributeType Sfha = TokenFactory.createAttributeType(1152921504606847140L, "SFHA"); - public static final IAttributeType SeverityCategory = TokenFactory.createAttributeType(1152921504606847114L, "Severity Category"); - public static final IAttributeType SoftwareControlCategory = TokenFactory.createAttributeType(1958401980089733639L, "Software Control Category"); - public static final IAttributeType SoftwareControlCategoryRationale = TokenFactory.createAttributeType(750929222178534710L, "Software Control Category Rationale"); - public static final IAttributeType SoftwareSafetyImpact = TokenFactory.createAttributeType(8318805403746485981L, "Software Safety Impact"); - public static final IAttributeType State = TokenFactory.createAttributeType(1152921504606847070L, "State"); - public static final IAttributeType StaticId = TokenFactory.createAttributeType(1152921504606847095L, "Static Id"); - public static final IAttributeType Street = TokenFactory.createAttributeType(1152921504606847069L, "Street"); - public static final IAttributeType Subsystem = TokenFactory.createAttributeType(1152921504606847112L, "Subsystem"); - public static final IAttributeType TemplateMatchCriteria = TokenFactory.createAttributeType(1152921504606847087L, "Template Match Criteria"); - public static final IAttributeType TestProcedureStatus = TokenFactory.createAttributeType(1152921504606847075L, "Test Procedure Status"); - public static final IAttributeType TestScriptGuid = TokenFactory.createAttributeType(1152921504606847301L, "Test Script GUID"); - public static final IAttributeType UserId = TokenFactory.createAttributeType(1152921504606847073L, "User Id"); - public static final IAttributeType UriGeneralStringData = TokenFactory.createAttributeType(1152921504606847381L, "Uri General String Data"); - public static final IAttributeType UserSettings = TokenFactory.createAttributeType(1152921504606847076L, "User Settings"); - public static final IAttributeType VerificationEvent = TokenFactory.createAttributeType(1152921504606847124L, "Verification Event"); - public static final IAttributeType VerificationLevel = TokenFactory.createAttributeType(1152921504606847115L, "Verification Level"); - public static final IAttributeType VerificationCriteria = TokenFactory.createAttributeType(1152921504606847117L, "Verification Acceptance Criteria"); - public static final IAttributeType Website = TokenFactory.createAttributeType(1152921504606847084L, "Website"); - public static final IAttributeType WebPreferences = TokenFactory.createAttributeType(1152921504606847386L, "Web Preferences"); - public static final IAttributeType WholeWordContent = TokenFactory.createAttributeType(1152921504606847099L, "Whole Word Content"); - public static final IAttributeType WordOleData = TokenFactory.createAttributeType(1152921504606847092L, "Word Ole Data"); - public static final IAttributeType WordTemplateContent = TokenFactory.createAttributeType(1152921504606847098L, "Word Template Content"); - public static final IAttributeType WorkData = TokenFactory.createAttributeType(1152921504606847126L, "osee.wi.Work Data"); - public static final IAttributeType WorkTransition = TokenFactory.createAttributeType(1152921504606847133L, "osee.wi.Transition"); - public static final IAttributeType XViewerCustomization = TokenFactory.createAttributeType(1152921504606847077L, "XViewer Customization"); - public static final IAttributeType XViewerDefaults = TokenFactory.createAttributeType(1152921504606847078L, "XViewer Defaults"); - public static final IAttributeType Zip = TokenFactory.createAttributeType(1152921504606847071L, "Zip"); + public static final AttributeTypeToken Afha = AttributeTypeToken.valueOf(1152921504606847139L, "AFHA"); + public static final AttributeTypeToken AccessContextId = AttributeTypeToken.valueOf(1152921504606847102L, "Access Context Id"); + public static final AttributeTypeToken Active = AttributeTypeToken.valueOf(1152921504606847065L, "Active"); + public static final AttributeTypeToken Annotation = AttributeTypeToken.valueOf(1152921504606847094L, "Annotation"); + public static final AttributeTypeToken ArtifactReference = AttributeTypeToken.valueOf(1153126013769613560L, "Artifact Reference"); + public static final AttributeTypeToken PlainTextContent = AttributeTypeToken.valueOf(1152921504606847866L, "Plain Text Content"); + public static final AttributeTypeToken BranchReference = AttributeTypeToken.valueOf(1153126013769613563L, "Branch Reference"); + public static final AttributeTypeToken Category = AttributeTypeToken.valueOf(1152921504606847121L, "Category"); + public static final AttributeTypeToken City = AttributeTypeToken.valueOf(1152921504606847068L, "City"); + public static final AttributeTypeToken CommonNalRequirement = AttributeTypeToken.valueOf(1152921504606847105L, "Common NAL Requirement"); + public static final AttributeTypeToken Company = AttributeTypeToken.valueOf(1152921504606847066L, "Company"); + public static final AttributeTypeToken CompanyTitle = AttributeTypeToken.valueOf(1152921504606847067L, "Company Title"); + public static final AttributeTypeToken Component = AttributeTypeToken.valueOf(1152921504606847125L, "Component"); + public static final AttributeTypeToken ContentUrl = AttributeTypeToken.valueOf(1152921504606847100L, "Content URL"); + public static final AttributeTypeToken Country = AttributeTypeToken.valueOf(1152921504606847072L, "Country"); + public static final AttributeTypeToken CrewInterfaceRequirement = AttributeTypeToken.valueOf(1152921504606847106L, "Crew Interface Requirement"); + public static final AttributeTypeToken Csci = AttributeTypeToken.valueOf(1152921504606847136L, "CSCI"); + public static final AttributeTypeToken DataRightsClassification = AttributeTypeToken.valueOf(1152921504606847317L, "Data Rights Classification"); + public static final AttributeTypeToken DataRightsBasis = AttributeTypeToken.valueOf(72057594037928276L, "Data Rights Basis"); + public static final AttributeTypeToken SubjectMatterExpert = AttributeTypeToken.valueOf(72057594037928275L, "Subject Matter Expert"); + public static final AttributeTypeToken DefaultMailServer = AttributeTypeToken.valueOf(1152921504606847063L, "osee.config.Default Mail Server"); + public static final AttributeTypeToken DefaultGroup = AttributeTypeToken.valueOf(1152921504606847086L, "Default Group"); + public static final AttributeTypeToken Description = AttributeTypeToken.valueOf(1152921504606847090L, "Description"); + public static final AttributeTypeToken Dictionary = AttributeTypeToken.valueOf(1152921504606847083L, "Dictionary"); + public static final AttributeTypeToken Effectivity = AttributeTypeToken.valueOf(1152921504606847108L, "Effectivity"); + public static final AttributeTypeToken Email = AttributeTypeToken.valueOf(1152921504606847082L, "Email"); + public static final AttributeTypeToken Extension = AttributeTypeToken.valueOf(1152921504606847064L, "Extension"); + public static final AttributeTypeToken FavoriteBranch = AttributeTypeToken.valueOf(1152921504606847074L, "Favorite Branch"); + public static final AttributeTypeToken FaxPhone = AttributeTypeToken.valueOf(1152921504606847081L, "Fax Phone"); + public static final AttributeTypeToken FunctionalCategory = AttributeTypeToken.valueOf(1152921504606847871L, "Functional Category"); + public static final AttributeTypeToken FunctionalDAL = AttributeTypeToken.valueOf(8007959514939954596L, "Functional Development Assurance Level"); + public static final AttributeTypeToken FunctionalDALRationale = AttributeTypeToken.valueOf(926274413268034710L, "Functional Development Assurance Level Rationale"); + public static final AttributeTypeToken GeneralStringData = AttributeTypeToken.valueOf(1152921504606847096L, "General String Data"); + public static final AttributeTypeToken GfeCfe = AttributeTypeToken.valueOf(1152921504606847144L, "GFE / CFE"); + public static final AttributeTypeToken GraphitiDiagram = AttributeTypeToken.valueOf(1152921504606847319L, "Graphiti Diagram"); + public static final AttributeTypeToken Hazard = AttributeTypeToken.valueOf(1152921504606847138L, "Hazard"); + public static final AttributeTypeToken HazardSeverity = AttributeTypeToken.valueOf(1152921504606847141L, "Hazard Severity"); + public static final AttributeTypeToken HTMLContent = AttributeTypeToken.valueOf(1152921504606847869L, "HTML Content"); + public static final AttributeTypeToken ImageContent = AttributeTypeToken.valueOf(1152921504606847868L, "Image Content"); + public static final AttributeTypeToken IdValue = AttributeTypeToken.valueOf(72057896045641815L, "ID Value"); + public static final AttributeTypeToken ItemDAL = AttributeTypeToken.valueOf(2612838829556295211L, "Item Development Assurance Level"); + public static final AttributeTypeToken ItemDALRationale = AttributeTypeToken.valueOf(2517743638468399405L, "Item Development Assurance Level Rationale"); + public static final AttributeTypeToken LegacyDAL = AttributeTypeToken.valueOf(1152921504606847120L, "Legacy Development Assurance Level"); + public static final AttributeTypeToken LegacyId = AttributeTypeToken.valueOf(1152921504606847107L, "Legacy Id"); + public static final AttributeTypeToken MobilePhone = AttributeTypeToken.valueOf(1152921504606847080L, "Mobile Phone"); + public static final AttributeTypeToken Name = AttributeTypeToken.valueOf(1152921504606847088L, "Name"); + public static final AttributeTypeToken NativeContent = AttributeTypeToken.valueOf(1152921504606847097L, "Native Content"); + public static final AttributeTypeToken Notes = AttributeTypeToken.valueOf(1152921504606847085L, "Notes"); + public static final AttributeTypeToken PageType = AttributeTypeToken.valueOf(1152921504606847091L, "Page Type"); + public static final AttributeTypeToken ParagraphNumber = AttributeTypeToken.valueOf(1152921504606847101L, "Paragraph Number"); + public static final AttributeTypeToken Partition = AttributeTypeToken.valueOf(1152921504606847111L, "Partition"); + public static final AttributeTypeToken Phone = AttributeTypeToken.valueOf(1152921504606847079L, "Phone"); + public static final AttributeTypeToken PublishInline = AttributeTypeToken.valueOf(1152921504606847122L, "PublishInline"); + public static final AttributeTypeToken QualificationMethod = AttributeTypeToken.valueOf(1152921504606847113L, "Qualification Method"); + public static final AttributeTypeToken RendererOptions = AttributeTypeToken.valueOf(904, "Renderer Options"); + public static final AttributeTypeToken RelationOrder = AttributeTypeToken.valueOf(1152921504606847089L, "Relation Order"); + public static final AttributeTypeToken Sfha = AttributeTypeToken.valueOf(1152921504606847140L, "SFHA"); + public static final AttributeTypeToken SeverityCategory = AttributeTypeToken.valueOf(1152921504606847114L, "Severity Category"); + public static final AttributeTypeToken SoftwareControlCategory = AttributeTypeToken.valueOf(1958401980089733639L, "Software Control Category"); + public static final AttributeTypeToken SoftwareControlCategoryRationale = AttributeTypeToken.valueOf(750929222178534710L, "Software Control Category Rationale"); + public static final AttributeTypeToken SoftwareSafetyImpact = AttributeTypeToken.valueOf(8318805403746485981L, "Software Safety Impact"); + public static final AttributeTypeToken State = AttributeTypeToken.valueOf(1152921504606847070L, "State"); + public static final AttributeTypeToken StaticId = AttributeTypeToken.valueOf(1152921504606847095L, "Static Id"); + public static final AttributeTypeToken Street = AttributeTypeToken.valueOf(1152921504606847069L, "Street"); + public static final AttributeTypeToken Subsystem = AttributeTypeToken.valueOf(1152921504606847112L, "Subsystem"); + public static final AttributeTypeToken TemplateMatchCriteria = AttributeTypeToken.valueOf(1152921504606847087L, "Template Match Criteria"); + public static final AttributeTypeToken TestProcedureStatus = AttributeTypeToken.valueOf(1152921504606847075L, "Test Procedure Status"); + public static final AttributeTypeToken TestScriptGuid = AttributeTypeToken.valueOf(1152921504606847301L, "Test Script GUID"); + public static final AttributeTypeToken UserId = AttributeTypeToken.valueOf(1152921504606847073L, "User Id"); + public static final AttributeTypeToken UriGeneralStringData = AttributeTypeToken.valueOf(1152921504606847381L, "Uri General String Data"); + public static final AttributeTypeToken UserSettings = AttributeTypeToken.valueOf(1152921504606847076L, "User Settings"); + public static final AttributeTypeToken VerificationEvent = AttributeTypeToken.valueOf(1152921504606847124L, "Verification Event"); + public static final AttributeTypeToken VerificationLevel = AttributeTypeToken.valueOf(1152921504606847115L, "Verification Level"); + public static final AttributeTypeToken VerificationCriteria = AttributeTypeToken.valueOf(1152921504606847117L, "Verification Acceptance Criteria"); + public static final AttributeTypeToken Website = AttributeTypeToken.valueOf(1152921504606847084L, "Website"); + public static final AttributeTypeToken WebPreferences = AttributeTypeToken.valueOf(1152921504606847386L, "Web Preferences"); + public static final AttributeTypeToken WholeWordContent = AttributeTypeToken.valueOf(1152921504606847099L, "Whole Word Content"); + public static final AttributeTypeToken WordOleData = AttributeTypeToken.valueOf(1152921504606847092L, "Word Ole Data"); + public static final AttributeTypeToken WordTemplateContent = AttributeTypeToken.valueOf(1152921504606847098L, "Word Template Content"); + public static final AttributeTypeToken WorkData = AttributeTypeToken.valueOf(1152921504606847126L, "osee.wi.Work Data"); + public static final AttributeTypeToken WorkTransition = AttributeTypeToken.valueOf(1152921504606847133L, "osee.wi.Transition"); + public static final AttributeTypeToken XViewerCustomization = AttributeTypeToken.valueOf(1152921504606847077L, "XViewer Customization"); + public static final AttributeTypeToken XViewerDefaults = AttributeTypeToken.valueOf(1152921504606847078L, "XViewer Defaults"); + public static final AttributeTypeToken Zip = AttributeTypeToken.valueOf(1152921504606847071L, "Zip"); // @formatter:on diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeExistsSearch.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeExistsSearch.java index 6a1b2c1785f..6dc27b37022 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeExistsSearch.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeExistsSearch.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.skynet.core.artifact.search; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.framework.core.data.AttributeTypeId; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.jdk.core.util.Conditions; /** @@ -49,7 +49,7 @@ public class AttributeExistsSearch implements ISearchPrimitive { ArrayList<AttributeTypeId> attributeTypes = new ArrayList<>(); for (String attributeTypeId : storageString.split(",")) { - attributeTypes.add(TokenFactory.createAttributeType(Long.valueOf(attributeTypeId), "SearchAttrType")); + attributeTypes.add(AttributeTypeToken.valueOf(Long.valueOf(attributeTypeId), "SearchAttrType")); } return new AttributeExistsSearch(attributeTypes); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeNotExistsSearch.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeNotExistsSearch.java index c7072aaa0ad..5cb14c9f56a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeNotExistsSearch.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeNotExistsSearch.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.skynet.core.artifact.search; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.framework.core.data.AttributeTypeId; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.jdk.core.util.Conditions; /** @@ -48,7 +48,7 @@ public class AttributeNotExistsSearch implements ISearchPrimitive { ArrayList<AttributeTypeId> attributeTypes = new ArrayList<>(); for (String attributeTypeId : storageString.split(",")) { - attributeTypes.add(TokenFactory.createAttributeType(Long.valueOf(attributeTypeId), "SearchAttrType")); + attributeTypes.add(AttributeTypeToken.valueOf(Long.valueOf(attributeTypeId), "SearchAttrType")); } return new AttributeNotExistsSearch(attributeTypes); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java index 8ae3e7f15c6..0422cc77a4e 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeValueSearch.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.skynet.core.artifact.search; import org.eclipse.osee.framework.core.data.AttributeTypeId; -import org.eclipse.osee.framework.core.data.TokenFactory; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.core.enums.QueryOption; import org.eclipse.osee.framework.jdk.core.util.Conditions; @@ -41,7 +41,7 @@ public class AttributeValueSearch implements ISearchPrimitive { throw new IllegalStateException("Value for " + AttributeValueSearch.class.getSimpleName() + " not parsable"); } - AttributeTypeId type = TokenFactory.createAttributeType(Long.valueOf(values[0]), "SearchAttrType"); + AttributeTypeId type = AttributeTypeToken.valueOf(Long.valueOf(values[0]), "SearchAttrType"); return new AttributeValueSearch(type, values[1]); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ConvertOseeTypesToLong.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ConvertOseeTypesToLong.java index e75c0041456..3880e2ca019 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ConvertOseeTypesToLong.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ConvertOseeTypesToLong.java @@ -73,7 +73,7 @@ public class ConvertOseeTypesToLong { // results.log("Converting java file " + file); String text = Lib.fileToString(file); - for (String createTypePrefix : Arrays.asList("createType\\(", "TokenFactory.createAttributeType\\(", + for (String createTypePrefix : Arrays.asList("createType\\(", "AttributeTypeToken.valueOf\\(", "TokenFactory.createArtifactType\\(", "RelationTypeSide.create\\(RelationSide.SIDE_A, ")) { Pattern javaTypePattern = Pattern.compile(createTypePrefix + "(.*)L,"); Matcher matcher = javaTypePattern.matcher(text); diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java index b55ea9626eb..72e7da05dfc 100644 --- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java +++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/OAuthTypes.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.account.admin.internal.oauth; import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON; import org.eclipse.osee.framework.core.data.ArtifactToken; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -29,16 +29,16 @@ public final class OAuthTypes { // @formatter:off public static final IArtifactType OAUTH_CLIENT = TokenFactory.createArtifactType(756912961500447526L, "OAuth Client"); - public static final IAttributeType OAUTH_CLIENT_WEBSITE_URI = TokenFactory.createAttributeType(7824657901879283800L, "Website URL"); - public static final IAttributeType OAUTH_CLIENT_LOGO_URI = TokenFactory.createAttributeType(7843963586445815729L, "Logo URL"); + public static final AttributeTypeToken OAUTH_CLIENT_WEBSITE_URI = AttributeTypeToken.valueOf(7824657901879283800L, "Website URL"); + public static final AttributeTypeToken OAUTH_CLIENT_LOGO_URI = AttributeTypeToken.valueOf(7843963586445815729L, "Logo URL"); - public static final IAttributeType OAUTH_CLIENT_IS_CONFIDENTIAL = TokenFactory.createAttributeType(537327028164749105L, "Is Confidential"); - public static final IAttributeType OAUTH_CLIENT_PROPERTIES = TokenFactory.createAttributeType(5633616462036881674L, "Properties"); + public static final AttributeTypeToken OAUTH_CLIENT_IS_CONFIDENTIAL = AttributeTypeToken.valueOf(537327028164749105L, "Is Confidential"); + public static final AttributeTypeToken OAUTH_CLIENT_PROPERTIES = AttributeTypeToken.valueOf(5633616462036881674L, "Properties"); - public static final IAttributeType OAUTH_CLIENT_AUTHORIZED_GRANT_TYPE = TokenFactory.createAttributeType(1935002343589638144L, "Authorized Grant Type"); - public static final IAttributeType OAUTH_CLIENT_AUTHORIZED_REDIRECT_URI = TokenFactory.createAttributeType(5424134645937614632L, "Authorized Redirect URI"); - public static final IAttributeType OAUTH_CLIENT_AUTHORIZED_SCOPE = TokenFactory.createAttributeType(3555983643778551674L, "Authorized Scope"); - public static final IAttributeType OAUTH_CLIENT_AUTHORIZED_AUDIENCE = TokenFactory.createAttributeType(7160371155049131554L, "Authorized Audience"); + public static final AttributeTypeToken OAUTH_CLIENT_AUTHORIZED_GRANT_TYPE = AttributeTypeToken.valueOf(1935002343589638144L, "Authorized Grant Type"); + public static final AttributeTypeToken OAUTH_CLIENT_AUTHORIZED_REDIRECT_URI = AttributeTypeToken.valueOf(5424134645937614632L, "Authorized Redirect URI"); + public static final AttributeTypeToken OAUTH_CLIENT_AUTHORIZED_SCOPE = AttributeTypeToken.valueOf(3555983643778551674L, "Authorized Scope"); + public static final AttributeTypeToken OAUTH_CLIENT_AUTHORIZED_AUDIENCE = AttributeTypeToken.valueOf(7160371155049131554L, "Authorized Audience"); public static final ArtifactToken OAUTH_TYPES = ArtifactToken.valueOf(7067755, "OAuthTypes", COMMON, CoreArtifactTypes.OseeTypeDefinition); diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java index 0764d119857..c95397d0fb6 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java @@ -86,11 +86,11 @@ public class OrcsTypesTest { private static final IArtifactType OTHER_ARTIFACT = TokenFactory.createArtifactType(32, "Other Artifact"); private static final IArtifactType LAST_ARTIFACT = TokenFactory.createArtifactType(33, "Last Artifact"); - private static final AttributeTypeId NAME = TokenFactory.createAttributeType(1152921504606847088L, "Name"); - private static final AttributeTypeId ANNOTATION = TokenFactory.createAttributeType(1152921504606847094L, "Annotation"); - private static final AttributeTypeId WORDML = TokenFactory.createAttributeType(1152921504606847098L, "WordML"); - private static final AttributeTypeId FIELD_1 = TokenFactory.createAttributeType(1152921504606847104L, "Field 1"); - private static final AttributeTypeId FIELD_2 = TokenFactory.createAttributeType(1152921504606847105L, "Field 2"); + private static final AttributeTypeId NAME = AttributeTypeToken.valueOf(1152921504606847088L, "Name"); + private static final AttributeTypeId ANNOTATION = AttributeTypeToken.valueOf(1152921504606847094L, "Annotation"); + private static final AttributeTypeId WORDML = AttributeTypeToken.valueOf(1152921504606847098L, "WordML"); + private static final AttributeTypeId FIELD_1 = AttributeTypeToken.valueOf(1152921504606847104L, "Field 1"); + private static final AttributeTypeId FIELD_2 = AttributeTypeToken.valueOf(1152921504606847105L, "Field 2"); private static final IRelationType REQUIREMENT_REL = TokenFactory.createRelationType(2305843009213694295L, "Requirement Relation"); private static final IRelationType ANOTHER_REL = TokenFactory.createRelationType(2305843009213694296L, "Another Relation"); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java index de53766b995..18e449947df 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java @@ -173,7 +173,7 @@ public class OrcsTypesIndexer { AttributeTypeToken token = index.getTokenByDslType(dslType); if (token == null) { long id = Long.valueOf(dslType.getId()); - token = TokenFactory.createAttributeType(id, dslType.getName()); + token = AttributeTypeToken.valueOf(id, dslType.getName()); index.put(token, dslType); } return token; diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java index 1f7d233c290..37f4c542361 100644 --- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java +++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java @@ -15,10 +15,10 @@ import java.util.List; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.ArtifactToken; import org.eclipse.osee.framework.core.data.AttributeTypeId; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.RelationTypeSide; -import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.data.TransactionId; import org.eclipse.osee.framework.core.enums.QueryOption; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -31,8 +31,7 @@ import org.eclipse.osee.orcs.rest.model.search.artifact.SearchResult; */ public interface QueryBuilder { - public static AttributeTypeId ANY_ATTRIBUTE_TYPE = - TokenFactory.createAttributeType(Long.MIN_VALUE, "Any Attribute Type"); + public static AttributeTypeId ANY_ATTRIBUTE_TYPE = AttributeTypeToken.valueOf(Long.MIN_VALUE, "Any Attribute Type"); QueryBuilder includeDeleted(); diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java index 013a9c22b5f..f7e1ea40456 100644 --- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java +++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ArtifactQueryBuilder.java @@ -29,7 +29,7 @@ import org.eclipse.osee.orcs.data.ArtifactReadable; public interface ArtifactQueryBuilder<T> { public static AttributeTypeToken ANY_ATTRIBUTE_TYPE = - TokenFactory.createAttributeType(Long.MIN_VALUE, "Any Attribute Type"); + AttributeTypeToken.valueOf(Long.MIN_VALUE, "Any Attribute Type"); T includeDeletedArtifacts(); diff --git a/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java b/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java index f19d4429a1c..052d5f1bc12 100644 --- a/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java +++ b/plugins/org.eclipse.osee.ote.define/src/org/eclipse/osee/ote/define/AUTOGEN/OteAttributeTypes.java @@ -10,40 +10,40 @@ *******************************************************************************/ package org.eclipse.osee.ote.define.AUTOGEN; -import org.eclipse.osee.framework.core.data.IAttributeType; +import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.core.data.TokenFactory; public final class OteAttributeTypes { // @formatter:off - public static final IAttributeType BUILD_ID = TokenFactory.createAttributeType(1152921504606847306L, "Build Id"); - public static final IAttributeType CHECKSUM = TokenFactory.createAttributeType(1152921504606847307L, "Checksum"); - public static final IAttributeType ELAPSED_DATE = TokenFactory.createAttributeType(1152921504606847296L, "Elapsed Date"); - public static final IAttributeType END_DATE = TokenFactory.createAttributeType(1152921504606847295L, "End Date"); - public static final IAttributeType EXTENSION = TokenFactory.createAttributeType(1152921504606847064L, "Extension"); - public static final IAttributeType FAILED = TokenFactory.createAttributeType(1152921504606847298L, "Failed"); - public static final IAttributeType IS_BATCH_MODE_ALLOWED = TokenFactory.createAttributeType(1152921504606847303L, "Is Batch Mode Allowed"); - public static final IAttributeType LAST_AUTHOR = TokenFactory.createAttributeType(1152921504606847285L, "Last Author"); - public static final IAttributeType LAST_DATE_UPLOADED = TokenFactory.createAttributeType(1152921504606847304L, "Last Date Uploaded"); - public static final IAttributeType LAST_MODIFIED_DATE = TokenFactory.createAttributeType(1152921504606847286L, "Last Modified Date"); - public static final IAttributeType MODIFIED_FLAG = TokenFactory.createAttributeType(1152921504606847284L, "Modified Flag"); - public static final IAttributeType OSEE_SERVER_JAR_VERSION = TokenFactory.createAttributeType(1152921504606847292L, "OSEE Server Jar Version"); - public static final IAttributeType OSEE_SERVER_TITLE = TokenFactory.createAttributeType(1152921504606847291L, "OSEE Server Title"); - public static final IAttributeType OSEE_VERSION = TokenFactory.createAttributeType(1152921504606847290L, "OSEE Version"); - public static final IAttributeType OS_ARCHITECTURE = TokenFactory.createAttributeType(1152921504606847287L, "OS Architecture"); - public static final IAttributeType OS_NAME = TokenFactory.createAttributeType(1152921504606847288L, "OS Name"); - public static final IAttributeType OS_VERSION = TokenFactory.createAttributeType(1152921504606847289L, "OS Version"); - public static final IAttributeType OUTFILE_URL = TokenFactory.createAttributeType(1152921504606847281L, "Outfile URL"); - public static final IAttributeType PASSED = TokenFactory.createAttributeType(1152921504606847297L, "Passed"); - public static final IAttributeType PROCESSOR_ID = TokenFactory.createAttributeType(1152921504606847293L, "Processor ID"); - public static final IAttributeType QUALIFICATION_LEVEL = TokenFactory.createAttributeType(1152921504606847305L, "Qualification Level"); - public static final IAttributeType RAN_IN_BATCH_MODE = TokenFactory.createAttributeType(1152921504606847302L, "Ran In Batch Mode"); - public static final IAttributeType REVISION = TokenFactory.createAttributeType(1152921504606847283L, "Revision"); - public static final IAttributeType SCRIPT_ABORTED = TokenFactory.createAttributeType(1152921504606847300L, "Script Aborted"); - public static final IAttributeType START_DATE = TokenFactory.createAttributeType(1152921504606847294L, "Start Date"); - public static final IAttributeType TEST_SCRIPT_URL = TokenFactory.createAttributeType(1152921504606847282L, "Test Script URL"); - public static final IAttributeType TOTAL_TEST_POINTS = TokenFactory.createAttributeType(1152921504606847299L, "Total Test Points"); - public static final IAttributeType TestDisposition = TokenFactory.createAttributeType(1152921504606847308L, "Disposition"); + public static final AttributeTypeToken BUILD_ID = AttributeTypeToken.valueOf(1152921504606847306L, "Build Id"); + public static final AttributeTypeToken CHECKSUM = AttributeTypeToken.valueOf(1152921504606847307L, "Checksum"); + public static final AttributeTypeToken ELAPSED_DATE = AttributeTypeToken.valueOf(1152921504606847296L, "Elapsed Date"); + public static final AttributeTypeToken END_DATE = AttributeTypeToken.valueOf(1152921504606847295L, "End Date"); + public static final AttributeTypeToken EXTENSION = AttributeTypeToken.valueOf(1152921504606847064L, "Extension"); + public static final AttributeTypeToken FAILED = AttributeTypeToken.valueOf(1152921504606847298L, "Failed"); + public static final AttributeTypeToken IS_BATCH_MODE_ALLOWED = AttributeTypeToken.valueOf(1152921504606847303L, "Is Batch Mode Allowed"); + public static final AttributeTypeToken LAST_AUTHOR = AttributeTypeToken.valueOf(1152921504606847285L, "Last Author"); + public static final AttributeTypeToken LAST_DATE_UPLOADED = AttributeTypeToken.valueOf(1152921504606847304L, "Last Date Uploaded"); + public static final AttributeTypeToken LAST_MODIFIED_DATE = AttributeTypeToken.valueOf(1152921504606847286L, "Last Modified Date"); + public static final AttributeTypeToken MODIFIED_FLAG = AttributeTypeToken.valueOf(1152921504606847284L, "Modified Flag"); + public static final AttributeTypeToken OSEE_SERVER_JAR_VERSION = AttributeTypeToken.valueOf(1152921504606847292L, "OSEE Server Jar Version"); + public static final AttributeTypeToken OSEE_SERVER_TITLE = AttributeTypeToken.valueOf(1152921504606847291L, "OSEE Server Title"); + public static final AttributeTypeToken OSEE_VERSION = AttributeTypeToken.valueOf(1152921504606847290L, "OSEE Version"); + public static final AttributeTypeToken OS_ARCHITECTURE = AttributeTypeToken.valueOf(1152921504606847287L, "OS Architecture"); + public static final AttributeTypeToken OS_NAME = AttributeTypeToken.valueOf(1152921504606847288L, "OS Name"); + public static final AttributeTypeToken OS_VERSION = AttributeTypeToken.valueOf(1152921504606847289L, "OS Version"); + public static final AttributeTypeToken OUTFILE_URL = AttributeTypeToken.valueOf(1152921504606847281L, "Outfile URL"); + public static final AttributeTypeToken PASSED = AttributeTypeToken.valueOf(1152921504606847297L, "Passed"); + public static final AttributeTypeToken PROCESSOR_ID = AttributeTypeToken.valueOf(1152921504606847293L, "Processor ID"); + public static final AttributeTypeToken QUALIFICATION_LEVEL = AttributeTypeToken.valueOf(1152921504606847305L, "Qualification Level"); + public static final AttributeTypeToken RAN_IN_BATCH_MODE = AttributeTypeToken.valueOf(1152921504606847302L, "Ran In Batch Mode"); + public static final AttributeTypeToken REVISION = AttributeTypeToken.valueOf(1152921504606847283L, "Revision"); + public static final AttributeTypeToken SCRIPT_ABORTED = AttributeTypeToken.valueOf(1152921504606847300L, "Script Aborted"); + public static final AttributeTypeToken START_DATE = AttributeTypeToken.valueOf(1152921504606847294L, "Start Date"); + public static final AttributeTypeToken TEST_SCRIPT_URL = AttributeTypeToken.valueOf(1152921504606847282L, "Test Script URL"); + public static final AttributeTypeToken TOTAL_TEST_POINTS = AttributeTypeToken.valueOf(1152921504606847299L, "Total Test Points"); + public static final AttributeTypeToken TestDisposition = AttributeTypeToken.valueOf(1152921504606847308L, "Disposition"); // @formatter:on private OteAttributeTypes() { |