diff options
| author | jmisinco | 2013-09-26 22:22:28 +0000 |
|---|---|---|
| committer | Roberto E. Escobar | 2013-10-12 01:16:41 +0000 |
| commit | 3553e04b163167f7ad6a6d753e5cb58ca805ce95 (patch) | |
| tree | f0460b231fc22d87b632d85bb3401f0f73ff055c /plugins/org.eclipse.osee.ats/src | |
| parent | 8947a09c304cf45ca4beba0af5a15e220f118770 (diff) | |
| download | org.eclipse.osee-3553e04b163167f7ad6a6d753e5cb58ca805ce95.tar.gz org.eclipse.osee-3553e04b163167f7ad6a6d753e5cb58ca805ce95.tar.xz org.eclipse.osee-3553e04b163167f7ad6a6d753e5cb58ca805ce95.zip | |
feature[ats_8G0FW]: Remove HRIDs as an ID
Change-Id: I9cfa206f250840760f9a13691e2a48b34321eed2
Diffstat (limited to 'plugins/org.eclipse.osee.ats/src')
50 files changed, 263 insertions, 226 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/PortPairsOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/PortPairsOperation.java index 10c4d2d4ff7..d4aba663d4f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/PortPairsOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/PortPairsOperation.java @@ -95,11 +95,6 @@ public final class PortPairsOperation extends AbstractOperation { AtsAttributeTypes.LegacyPcrId, workflowId, CoreBranches.COMMON); } - private TeamWorkFlowArtifact getWorkflowFromHRID(String HRID) throws OseeCoreException { - - return (TeamWorkFlowArtifact) ArtifactQuery.getArtifactFromId(HRID, CoreBranches.COMMON); - } - private void doPortWork(TeamWorkFlowArtifact sourceWorkflow, TeamWorkFlowArtifact destinationWorkflow) throws OseeCoreException { if (destinationWorkflow.getWorkingBranchForceCacheUpdate() == null) { AtsBranchManagerCore.createWorkingBranch_Create(destinationWorkflow, true); @@ -132,7 +127,7 @@ public final class PortPairsOperation extends AbstractOperation { } Collection<Branch> branches = - BranchManager.getBranchesByName(String.format("Porting [%s] branch", sourceWorkflow.getHumanReadableId())); + BranchManager.getBranchesByName(String.format("Porting [%s] branch", sourceWorkflow.getAtsId())); if (branches.isEmpty()) { TransactionRecord transRecord = AtsBranchManagerCore.getEarliestTransactionId(sourceWorkflow); @@ -140,7 +135,7 @@ public final class PortPairsOperation extends AbstractOperation { return null; } else { return BranchManager.createWorkingBranchFromTx(transRecord, - String.format("Porting [%s] branch", sourceWorkflow.getHumanReadableId()), null); + String.format("Porting [%s] branch", sourceWorkflow.getAtsId()), null); } } else { return branches.iterator().next(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenChangeReportByIdAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenChangeReportByIdAction.java index 5810130a78b..8df0b6f1f0d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenChangeReportByIdAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenChangeReportByIdAction.java @@ -14,8 +14,8 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsEditor; -import org.eclipse.osee.ats.world.search.MultipleHridSearchData; -import org.eclipse.osee.ats.world.search.MultipleHridSearchOperation; +import org.eclipse.osee.ats.world.search.MultipleIdSearchData; +import org.eclipse.osee.ats.world.search.MultipleIdSearchOperation; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -47,11 +47,11 @@ public class OpenChangeReportByIdAction extends Action { @Override public void run() { - MultipleHridSearchData data = new MultipleHridSearchData(getText(), AtsEditor.ChangeReport); + MultipleIdSearchData data = new MultipleIdSearchData(getText(), AtsEditor.ChangeReport); if (Strings.isValid(overrideId)) { data.setEnteredIds(overrideId); } - MultipleHridSearchOperation srchOperation = new MultipleHridSearchOperation(data); + MultipleIdSearchOperation srchOperation = new MultipleIdSearchOperation(data); if (pend) { try { Operations.executeWorkAndCheckStatus(srchOperation); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenInAtsWorldAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenInAtsWorldAction.java index 58199c2fbb1..2833b361373 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenInAtsWorldAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenInAtsWorldAction.java @@ -13,13 +13,13 @@ package org.eclipse.osee.ats.actions; import java.util.Arrays; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.ats.AtsImage; +import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.WorldEditorSimpleProvider; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; -import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.swt.ImageManager; /** @@ -38,18 +38,18 @@ public class OpenInAtsWorldAction extends AbstractAtsAction { @Override public void runWithException() throws OseeCoreException { if (sma.isTeamWorkflow()) { - Artifact actionArt = ((TeamWorkFlowArtifact) sma).getParentActionArtifact(); + ActionArtifact actionArt = ((TeamWorkFlowArtifact) sma).getParentActionArtifact(); if (actionArt != null) { - WorldEditor.open(new WorldEditorSimpleProvider("Action " + actionArt.getHumanReadableId(), + WorldEditor.open(new WorldEditorSimpleProvider("Action " + actionArt.getAtsId(), Arrays.asList(actionArt))); } else { - WorldEditor.open(new WorldEditorSimpleProvider(sma.getArtifactTypeName() + " " + sma.getHumanReadableId(), + WorldEditor.open(new WorldEditorSimpleProvider(sma.getArtifactTypeName() + " " + sma.getAtsId(), Arrays.asList(sma))); throw new OseeStateException("No Parent Action; Opening Team Workflow"); } return; } else { - WorldEditor.open(new WorldEditorSimpleProvider(sma.getArtifactTypeName() + ": " + sma.getHumanReadableId(), + WorldEditor.open(new WorldEditorSimpleProvider(sma.getArtifactTypeName() + ": " + sma.getAtsId(), Arrays.asList(sma))); return; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenWorkflowByIdAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenWorkflowByIdAction.java index 903d35fb764..2425e9acf68 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenWorkflowByIdAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenWorkflowByIdAction.java @@ -15,8 +15,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsEditor; -import org.eclipse.osee.ats.world.search.MultipleHridSearchData; -import org.eclipse.osee.ats.world.search.MultipleHridSearchOperation; +import org.eclipse.osee.ats.world.search.MultipleIdSearchData; +import org.eclipse.osee.ats.world.search.MultipleIdSearchOperation; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -47,11 +47,11 @@ public class OpenWorkflowByIdAction extends Action { @Override public void run() { - MultipleHridSearchData data = new MultipleHridSearchData(getText(), AtsEditor.WorkflowEditor); + MultipleIdSearchData data = new MultipleIdSearchData(getText(), AtsEditor.WorkflowEditor); if (Strings.isValid(overrideId)) { data.setEnteredIds(overrideId); } - MultipleHridSearchOperation operation = new MultipleHridSearchOperation(data); + MultipleIdSearchOperation operation = new MultipleIdSearchOperation(data); if (pend) { try { Operations.executeWorkAndCheckStatus(operation); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenWorldByIdAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenWorldByIdAction.java index af34e30956c..574c3e75fd6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenWorldByIdAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenWorldByIdAction.java @@ -15,8 +15,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsEditor; -import org.eclipse.osee.ats.world.search.MultipleHridSearchData; -import org.eclipse.osee.ats.world.search.MultipleHridSearchOperation; +import org.eclipse.osee.ats.world.search.MultipleIdSearchData; +import org.eclipse.osee.ats.world.search.MultipleIdSearchOperation; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -43,11 +43,11 @@ public class OpenWorldByIdAction extends Action { @Override public void run() { - MultipleHridSearchData data = new MultipleHridSearchData(getText(), AtsEditor.WorldEditor); + MultipleIdSearchData data = new MultipleIdSearchData(getText(), AtsEditor.WorldEditor); if (Strings.isValid(overrideId)) { data.setEnteredIds(overrideId); } - MultipleHridSearchOperation operation = new MultipleHridSearchOperation(data); + MultipleIdSearchOperation operation = new MultipleIdSearchOperation(data); if (pend) { try { Operations.executeWorkAndCheckStatus(operation); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java index b73430f7df9..91dcb7f151f 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/ArtifactSelectWizardPage.java @@ -22,6 +22,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.osee.ats.api.IAtsObject; +import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsObjectLabelProvider; import org.eclipse.osee.ats.util.AtsUtil; @@ -165,15 +166,21 @@ public class ArtifactSelectWizardPage extends WizardPage { if (arg0 instanceof Artifact) { Artifact art = (Artifact) arg0; if (showArtData) { - return String.format("%s - (%s %s %s)", art.getName(), art.getArtId(), art.getHumanReadableId(), - art.getGuid()); + return String.format("%s - (%s %s)", art.getName(), art.getArtId(), art.getGuid()); } else { return art.getName(); } + } else if (arg0 instanceof IAtsWorkItem) { + IAtsWorkItem workItem = (IAtsWorkItem) arg0; + if (showArtData) { + return String.format("%s - (%s %s)", workItem.getName(), workItem.getAtsId(), workItem.getGuid()); + } else { + return workItem.getName(); + } } else if (arg0 instanceof IAtsObject) { IAtsObject art = (IAtsObject) arg0; if (showArtData) { - return String.format("%s - (%s %s)", art.getName(), art.getHumanReadableId(), art.getGuid()); + return String.format("%s - (%s)", art.getName(), art.getGuid()); } else { return art.getName(); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AnnualCostAvoidanceColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AnnualCostAvoidanceColumn.java index bdea4c25226..884239cd631 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AnnualCostAvoidanceColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AnnualCostAvoidanceColumn.java @@ -126,10 +126,10 @@ public class AnnualCostAvoidanceColumn extends XViewerAtsColumn implements IXVie return new Result("Weekly Benefit Hours not set."); } } catch (NumberFormatException ex) { - OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "HRID " + artifact.getHumanReadableId(), ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "ID " + artifact.getAtsId(), ex); return new Result("Weekly Benefit value is invalid double \"" + value + "\""); } catch (Exception ex) { - OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "HRID " + artifact.getHumanReadableId(), ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "ID " + artifact.getAtsId(), ex); return new Result("Exception calculating cost avoidance. See log for details."); } return Result.TrueResult; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AssigneeColumnUI.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AssigneeColumnUI.java index 4a06e99072f..55dbc61040a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AssigneeColumnUI.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AssigneeColumnUI.java @@ -113,11 +113,11 @@ public class AssigneeColumnUI extends XViewerAtsColumn implements IXViewerValueC for (AbstractWorkflowArtifact awa : awas) { if (awa.isCompleted()) { AWorkbench.popup("ERROR", - "Can't assign completed " + awa.getArtifactTypeName() + " (" + awa.getHumanReadableId() + ")"); + "Can't assign completed " + awa.getArtifactTypeName() + " (" + awa.getAtsId() + ")"); return false; } else if (awa.isCancelled()) { AWorkbench.popup("ERROR", - "Can't assign cancelled " + awa.getArtifactTypeName() + " (" + awa.getHumanReadableId() + ")"); + "Can't assign cancelled " + awa.getArtifactTypeName() + " (" + awa.getAtsId() + ")"); return false; } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AtsIdColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AtsIdColumn.java new file mode 100644 index 00000000000..7ec91e026a3 --- /dev/null +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AtsIdColumn.java @@ -0,0 +1,65 @@ +/******************************************************************************* + * 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.ats.column; + +import org.eclipse.nebula.widgets.xviewer.XViewerCells; +import org.eclipse.nebula.widgets.xviewer.XViewerColumn; +import org.eclipse.nebula.widgets.xviewer.XViewerValueColumn; +import org.eclipse.osee.ats.api.IAtsObject; +import org.eclipse.osee.ats.api.IAtsWorkItem; +import org.eclipse.swt.SWT; + +/** + * @author Donald G. Dunne + */ +public class AtsIdColumn extends XViewerValueColumn { + + public static AtsIdColumn instance = new AtsIdColumn(); + + public static AtsIdColumn getInstance() { + return instance; + } + + public AtsIdColumn() { + this(false); + } + + public AtsIdColumn(boolean show) { + super("ats.id", "ATS ID", 75, SWT.LEFT, show, SortDataType.String, false, "ATS ID"); + } + + /** + * XViewer uses copies of column definitions so originals that are registered are not corrupted. Classes extending + * XViewerValueColumn MUST extend this constructor so the correct sub-class is created + */ + @Override + public AtsIdColumn copy() { + AtsIdColumn newXCol = new AtsIdColumn(isShow()); + super.copy(this, newXCol); + return newXCol; + } + + @Override + public String getColumnText(Object element, XViewerColumn column, int columnIndex) { + String result = ""; + try { + if (element instanceof IAtsWorkItem) { + result = ((IAtsWorkItem) element).getAtsId(); + } else if (element instanceof IAtsObject) { + result = ((IAtsObject) element).getGuid(); + } + } catch (Exception ex) { + result = XViewerCells.getCellExceptionString(ex); + } + return result; + } + +} diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CancelledDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CancelledDateColumn.java index 85a6bb37d20..bcf353f6463 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CancelledDateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CancelledDateColumn.java @@ -77,7 +77,7 @@ public class CancelledDateColumn extends XViewerAtsColumn implements IXViewerVal if (((AbstractWorkflowArtifact) object).isCancelled()) { Date date = ((AbstractWorkflowArtifact) object).internalGetCancelledDate(); if (date == null) { - OseeLog.log(Activator.class, Level.SEVERE, "Cancelled with no date => " + awa.getHumanReadableId()); + OseeLog.log(Activator.class, Level.SEVERE, "Cancelled with no date => " + awa.getAtsId()); } return date; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedDateColumn.java index c7f7ba7fda8..f32d1ddec21 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedDateColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/CompletedDateColumn.java @@ -77,7 +77,7 @@ public class CompletedDateColumn extends XViewerAtsColumn implements IXViewerVal if (((AbstractWorkflowArtifact) object).isCompleted()) { Date date = ((AbstractWorkflowArtifact) object).getCompletedDate(); if (date == null) { - OseeLog.log(Activator.class, Level.SEVERE, "Completed with no date => " + awa.getHumanReadableId()); + OseeLog.log(Activator.class, Level.SEVERE, "Completed with no date => " + awa.getAtsId()); } return date; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ParentHridColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ParentAtsIdColumn.java index 795eb086af2..c381fc1b5f1 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ParentHridColumn.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ParentAtsIdColumn.java @@ -26,17 +26,17 @@ import org.eclipse.swt.SWT; /** * @author Donald G. Dunne */ -public class ParentHridColumn extends XViewerAtsColumn implements IXViewerValueColumn { +public class ParentAtsIdColumn extends XViewerAtsColumn implements IXViewerValueColumn { - public static ParentHridColumn instance = new ParentHridColumn(); + public static ParentAtsIdColumn instance = new ParentAtsIdColumn(); - public static ParentHridColumn getInstance() { + public static ParentAtsIdColumn getInstance() { return instance; } - private ParentHridColumn() { - super(WorldXViewerFactory.COLUMN_NAMESPACE + ".parenthrid", "Parent HRID", 75, SWT.LEFT, false, - SortDataType.String, false, "Human Readable ID of Parent Action or Team Workflow"); + private ParentAtsIdColumn() { + super(WorldXViewerFactory.COLUMN_NAMESPACE + ".parentatsid", "Parent ATS ID", 75, SWT.LEFT, false, + SortDataType.String, false, "ATS ID of Parent Action or Team Workflow"); } /** @@ -44,8 +44,8 @@ public class ParentHridColumn extends XViewerAtsColumn implements IXViewerValueC * XViewerValueColumn MUST extend this constructor so the correct sub-class is created */ @Override - public ParentHridColumn copy() { - ParentHridColumn newXCol = new ParentHridColumn(); + public ParentAtsIdColumn copy() { + ParentAtsIdColumn newXCol = new ParentAtsIdColumn(); super.copy(this, newXCol); return newXCol; } @@ -56,10 +56,10 @@ public class ParentHridColumn extends XViewerAtsColumn implements IXViewerValueC if (Artifacts.isOfType(element, AtsArtifactTypes.TeamWorkflow)) { ActionArtifact parentAction = ((TeamWorkFlowArtifact) element).getParentActionArtifact(); if (parentAction != null) { - return parentAction.getHumanReadableId(); + return parentAction.getAtsId(); } } else if (element instanceof AbstractWorkflowArtifact && ((AbstractWorkflowArtifact) element).getParentAWA() != null) { - return ((AbstractWorkflowArtifact) element).getParentAWA().getHumanReadableId(); + return ((AbstractWorkflowArtifact) element).getParentAWA().getAtsId(); } } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMADetailsSection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMADetailsSection.java index d1ea188bb60..f8fd4538ccc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMADetailsSection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMADetailsSection.java @@ -15,6 +15,7 @@ import java.util.Map; import java.util.logging.Level; import org.eclipse.osee.ats.access.AtsBranchAccessManager; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.internal.Activator; @@ -25,7 +26,6 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.services.CmAccessControl; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Widgets; @@ -113,14 +113,14 @@ public class SMADetailsSection extends SectionPart { private void addSMADetails(AbstractWorkflowArtifact workflow, Map<String, String> details) throws OseeCoreException { details.put("Workflow Definition", workflow.getWorkDefinition().getName()); - Artifact parentAction = workflow.getParentActionArtifact(); + ActionArtifact parentAction = workflow.getParentActionArtifact(); if (parentAction == null) { details.put("Action Id", "No Parent Action"); } else { - details.put("Action Id", parentAction.getHumanReadableId()); + details.put("Action Id", parentAction.getAtsId()); } if (!(workflow.isOfType(AtsArtifactTypes.TeamWorkflow)) && workflow.getParentTeamWorkflow() != null) { - details.put("Parent Team Workflow Id", workflow.getParentTeamWorkflow().getHumanReadableId()); + details.put("Parent Team Workflow Id", workflow.getParentTeamWorkflow().getAtsId()); } if (workflow.isOfType(AtsArtifactTypes.TeamWorkflow)) { details.put("Working Branch Access Context Id", getAccessContextId((TeamWorkFlowArtifact) workflow)); @@ -151,7 +151,10 @@ public class SMADetailsSection extends SectionPart { } } else { try { - ids = accessControl.getContextId(AtsClientService.get().getUserAdmin().getOseeUser(AtsClientService.get().getUserAdmin().getCurrentUser()), workingBranch); + ids = + accessControl.getContextId( + AtsClientService.get().getUserAdmin().getOseeUser( + AtsClientService.get().getUserAdmin().getCurrentUser()), workingBranch); message = ids.toString(); } catch (Exception ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java index 87c3f6e17d9..7e048458e44 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java @@ -318,7 +318,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IWorldEditor, I @Override public String toString() { - return "SMAEditor - " + awa.getHumanReadableId() + " - " + awa.getArtifactTypeName() + " named \"" + awa.getName() + "\""; + return "SMAEditor - " + awa.getAtsId() + " - " + awa.getArtifactTypeName() + " named \"" + awa.getName() + "\""; } @Override @@ -385,7 +385,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IWorldEditor, I new ToolItem(toolBar, SWT.SEPARATOR); Text artifactInfoLabel = new Text(toolBar.getParent(), SWT.END); artifactInfoLabel.setEditable(false); - artifactInfoLabel.setText("Type: \"" + awa.getArtifactTypeName() + "\" HRID: " + awa.getHumanReadableId()); + artifactInfoLabel.setText("Type: \"" + awa.getArtifactTypeName() + "\" ATS: " + awa.getAtsId()); artifactInfoLabel.setToolTipText("The human readable id and database id for this artifact"); return toolBar; diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java index 858ccdb3e7e..0548018c6be 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java @@ -101,7 +101,7 @@ public class SMAPrint extends Action { resultData.addRaw(AHTML.addRowMultiColumnTable(new String[] { // AHTML.getLabelValueStr(AHTML.LABEL_FONT, "Workflow: ", sma.getArtifactTypeName()), - AHTML.getLabelValueStr(AHTML.LABEL_FONT, "HRID: ", sma.getHumanReadableId()), + AHTML.getLabelValueStr(AHTML.LABEL_FONT, "ID: ", sma.getAtsId()), (pcrId == null ? "" : AHTML.getLabelValueStr(AHTML.LABEL_FONT, "Id: ", pcrId))})); resultData.addRaw(AHTML.endMultiColumnTable()); for (NoteItem note : sma.getNotes().getNoteItems()) { @@ -148,7 +148,7 @@ public class SMAPrint extends Action { PercentCompleteTotalUtil.getPercentCompleteTotal(art) + "", HoursSpentUtil.getHoursSpentTotal(art) + "", art.getSoleAttributeValue(AtsAttributeTypes.Resolution, ""), - art.getHumanReadableId()})); + art.getAtsId()})); } rd.addRaw(AHTML.endBorderTable()); } catch (Exception ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java index 72a8f704648..f73755610d0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java @@ -15,6 +15,7 @@ import java.util.logging.Level; import org.eclipse.osee.ats.AtsOpenOption; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact; +import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; @@ -122,7 +123,7 @@ public class SMARelationsHyperlinkComposite extends Composite { this, String.format("\"%s\" - %s", art.getName().length() < 60 ? art.getName() : art.getName().substring(0, 60), - art.getHumanReadableId()), SWT.NONE); + AtsUtilCore.getAtsId(art)), SWT.NONE); link.addHyperlinkListener(new IHyperlinkListener() { @Override diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java index f054441aba5..4c2588b1e7a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java @@ -622,7 +622,7 @@ public class SMAWorkFlowTab extends FormPage implements IWorldViewerEventHandler OseeLog.log(Activator.class, Level.SEVERE, ex); } FormsUtil.createLabelText(toolkit, topLineComp, awa.getArtifactSuperTypeName() + " Id: ", - awa.getHumanReadableId()); + awa.getAtsId()); try { String pcrId = TeamWorkFlowManager.getPcrId(awa); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java index 3f99b293019..7205b024bec 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/widget/ReviewInfoXWidget.java @@ -234,7 +234,7 @@ public class ReviewInfoXWidget extends XLabelValueBase { html.append(AHTML.addRowMultiColumnTable(new String[] { art.getArtifactTypeName(), art.getName(), - art.getHumanReadableId()})); + art.getAtsId()})); } html.append(AHTML.endBorderTable()); } catch (Exception ex) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportManager.java index 0b4740adb6a..67097dbde49 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/export/AtsExportManager.java @@ -133,19 +133,19 @@ public class AtsExportManager extends Action { StringBuffer singleSb = new StringBuffer(); for (Artifact artifact : artifacts) { if (artifact instanceof AbstractWorkflowArtifact) { - SMAPrint smaPrint = new SMAPrint(((AbstractWorkflowArtifact) artifact)); + AbstractWorkflowArtifact awa = (AbstractWorkflowArtifact) artifact; + SMAPrint smaPrint = new SMAPrint(awa); smaPrint.setIncludeTaskList(includeTaskList); String html = XResultDataUI.getReport(smaPrint.getResultData(), "").getManipulatedHtml(); if (multipleFile) { try { if (asHtmlToFile) { File file = - new File( - exportWizard.getFileLocation() + "\\" + artifact.getHumanReadableId() + ".html"); + new File(exportWizard.getFileLocation() + "\\" + awa.getAtsId() + ".html"); Lib.writeStringToFile(html, file); } if (asHtmlToResultEditor) { - ResultsEditor.open("Output", "Export " + artifact.getHumanReadableId(), html); + ResultsEditor.open("Output", "Export " + awa.getAtsId(), html); } } catch (IOException ex) { throw new OseeCoreException("Error writing to html file", ex); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java index c5e82ac8441..cfb54bf8108 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/goal/GoalXViewerFactory.java @@ -22,6 +22,7 @@ import org.eclipse.osee.ats.column.ChangeTypeColumn; import org.eclipse.osee.ats.column.CreatedDateColumn; import org.eclipse.osee.ats.column.GoalOrderColumn; import org.eclipse.osee.ats.column.GoalOrderVoteColumn; +import org.eclipse.osee.ats.column.AtsIdColumn; import org.eclipse.osee.ats.column.NotesColumn; import org.eclipse.osee.ats.column.PriorityColumn; import org.eclipse.osee.ats.column.StateColumn; @@ -36,7 +37,6 @@ import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.ats.world.WorldXViewerSorter; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory; -import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.HridColumn; /** * @author Donald G. Dunne @@ -48,7 +48,7 @@ public class GoalXViewerFactory extends SkynetXViewerFactory { public static final List<? extends XViewerColumn> GoalViewerVisibleColumns = Arrays.asList( GoalOrderColumn.getInstance(), GoalOrderVoteColumn.getInstance(), TitleColumn.getInstance(), TypeColumn.getInstance(), StateColumn.getInstance(), PriorityColumn.getInstance(), - ChangeTypeColumn.getInstance(), AssigneeColumnUI.getInstance(), new HridColumn(true), + ChangeTypeColumn.getInstance(), AssigneeColumnUI.getInstance(), new AtsIdColumn(true), CreatedDateColumn.getInstance(), TargetedVersionColumn.getInstance(), NotesColumn.getInstance()); public static Integer[] widths = new Integer[] { GoalOrderColumn.getInstance().getWidth(), diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java index 0a1ef1e7b0d..6f71d6ee840 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java @@ -101,8 +101,8 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { private boolean fixAssignees = true; private boolean fixAttributeValues = true; - private final Set<String> hrids = new HashSet<String>(); - private final Map<String, String> legacyPcrIdToParentHrid = new HashMap<String, String>(50000); + private final Set<String> atsIds = new HashSet<String>(); + private final Map<String, String> legacyPcrIdToParentId = new HashMap<String, String>(50000); private final CountingMap<String> testNameToTimeSpentMap = new CountingMap<String>(); private HashCollection<String, String> testNameToResultsMap = null; private String emailOnComplete = null; @@ -190,8 +190,8 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { try { testNameToResultsMap = new HashCollection<String, String>(); - hrids.clear(); - legacyPcrIdToParentHrid.clear(); + atsIds.clear(); + legacyPcrIdToParentId.clear(); // int artSetNum = 1; for (Collection<Integer> artIdList : artIdLists) { @@ -204,7 +204,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { logTestTimeSpent(date, "ArtifactQuery.getArtifactListFromIds", testNameToTimeSpentMap); // elapsedTime.end(); - // NOTE: Use DoesNotWorkItemAts to process list of HRIDs + // NOTE: Use DoesNotWorkItemAts to process list of IDs // remove all deleted/purged artifacts first List<Artifact> artifacts = new ArrayList<Artifact>(allArtifacts.size()); @@ -457,7 +457,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { // If != null, this stateName has already been found if (Strings.isValid(storedStateStr)) { String errorStr = - "Error: " + artifact.getArtifactTypeName() + " - " + artifact.getHumanReadableId() + " duplicate state: " + stateName; + "Error: " + artifact.getArtifactTypeName() + " - " + awa.getAtsId() + " duplicate state: " + stateName; // delete if state attr is same as current state if (currentStateName.equals(stateName)) { errorStr += @@ -596,28 +596,23 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (artifact.isDeleted()) { continue; } - // Check that HRIDs not duplicated on Common branch - if (hrids.contains(artifact.getHumanReadableId())) { - testNameToResultsMap.put("testArtifactIds", - "Error: Duplicate HRIDs: " + XResultDataUI.getHyperlink(artifact)); - } // Check that duplicate Legacy PCR IDs team arts do not exist with different parent actions if (artifact.isOfType(AtsArtifactTypes.TeamWorkflow)) { TeamWorkFlowArtifact teamWf = (TeamWorkFlowArtifact) artifact; String legacyPcrId = artifact.getSoleAttributeValueAsString(AtsAttributeTypes.LegacyPcrId, null); if (legacyPcrId != null) { - String parentActionHrid = teamWf.getParentActionArtifact().getHumanReadableId(); - String storedParentActionHrid = legacyPcrIdToParentHrid.get(legacyPcrId); - if (storedParentActionHrid != null) { - if (!storedParentActionHrid.equals(parentActionHrid)) { + String parentActionId = teamWf.getParentActionArtifact().getAtsId(); + String storedParentActionId = legacyPcrIdToParentId.get(legacyPcrId); + if (storedParentActionId != null) { + if (!storedParentActionId.equals(parentActionId)) { String errorStr = String.format( - "Error: Duplicate Legacy PCR Ids in Different Actions: teamWf %s parentActionHrid[%s] != storedActionHrid [%s] ", - teamWf.toStringWithId(), parentActionHrid, storedParentActionHrid); + "Error: Duplicate Legacy PCR Ids in Different Actions: teamWf %s parentActionId[%s] != storedActionId [%s] ", + teamWf.toStringWithId(), parentActionId, storedParentActionId); testNameToResultsMap.put("testArtifactIds", errorStr); } } else { - legacyPcrIdToParentHrid.put(legacyPcrId, parentActionHrid); + legacyPcrIdToParentId.put(legacyPcrId, parentActionId); } } } @@ -796,19 +791,18 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (branch.getArchiveState().isArchived()) { testNameToResultsMap.put("validateBranchGuid", String.format( "Error: [%s][%s][%s] has Parent Branch Id attribute set to Archived Branch [%s] named [%s]", - name.getName(), name.getHumanReadableId(), name, parentBranchGuid, branch)); + name.getName(), name.getGuid(), name, parentBranchGuid, branch)); } else if (!branch.getBranchType().isBaselineBranch()) { testNameToResultsMap.put( "validateBranchGuid", String.format( "Error: [%s][%s][%s] has Parent Branch Id attribute [%s][%s] that is a [%s] branch; should be a BASLINE branch", - name.getName(), name.getHumanReadableId(), name, branch.getBranchType().name(), parentBranchGuid, - branch)); + name.getName(), name.getGuid(), name, branch.getBranchType().name(), parentBranchGuid, branch)); } } catch (BranchDoesNotExist ex) { testNameToResultsMap.put("validateBranchGuid", String.format( "Error: [%s][%s][%s] has Parent Branch Id attribute [%s] that references a non-existant", name.getName(), - name.getHumanReadableId(), name, parentBranchGuid)); + name.getGuid(), name, parentBranchGuid)); } catch (Exception ex) { testNameToResultsMap.put("validateBranchGuid", "Error: " + name.getName() + " [" + name.toStringWithId() + "] exception: " + ex.getLocalizedMessage()); @@ -1233,7 +1227,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction { if (assignees.contains(oseeSystemUser)) { testNameToResultsMap.put( "testStateMachineAssignees", - "Error: " + art.getHumanReadableId() + " is assigned to OseeSystem; invalid assignment - MANUAL FIX REQUIRED"); + "Error: " + awa.getAtsId() + " is assigned to OseeSystem; invalid assignment - MANUAL FIX REQUIRED"); } if (!awa.isCompleted() && !awa.isCancelled() && assignees.isEmpty()) { testNameToResultsMap.put( diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java index 5d4af187ec7..cf241320776 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/AtsOseeCmService.java @@ -22,6 +22,7 @@ import org.eclipse.osee.ats.actions.wizard.NewActionJob; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; +import org.eclipse.osee.ats.core.client.search.AtsArtifactQuery; import org.eclipse.osee.ats.core.client.task.AbstractTaskableArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; @@ -43,7 +44,6 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService; import org.eclipse.osee.framework.ui.skynet.cm.OseeCmEditor; @@ -76,9 +76,9 @@ public class AtsOseeCmService implements IOseeCmService { } @Override - public void openArtifactsById(String name, List<String> guidOrHrids, OseeCmEditor oseeCmEditor) { + public void openArtifactsByGuid(String name, List<String> guidOrAtsIds, OseeCmEditor oseeCmEditor) { try { - List<Artifact> artifacts = ArtifactQuery.getArtifactListFromIds(guidOrHrids, AtsUtil.getAtsBranch()); + List<Artifact> artifacts = AtsArtifactQuery.getArtifactListFromIds(guidOrAtsIds); openArtifacts(name, artifacts, oseeCmEditor); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Error opening ATS artifacts by Id", ex); @@ -129,7 +129,7 @@ public class AtsOseeCmService implements IOseeCmService { @Override public Artifact createWorkTask(String name, String parentPcrGuid) { try { - Artifact artifact = ArtifactQuery.getArtifactFromId(parentPcrGuid, AtsUtil.getAtsBranch()); + Artifact artifact = AtsArtifactQuery.getArtifactFromId(parentPcrGuid); if (artifact instanceof AbstractTaskableArtifact) { return ((AbstractTaskableArtifact) artifact).createNewTask(name, new Date(), AtsClientService.get().getUserAdmin().getCurrentUser()); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java index 081139f2e2a..b28241db8ce 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; +import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.framework.core.data.IOseeBranch; @@ -129,7 +130,7 @@ public class ArtifactImpactToActionSearchItem extends XNavigateItemAction { monitor.subTask(str); int y = 1; rd.addRaw(AHTML.beginMultiColumnTable(95, 1)); - rd.addRaw(AHTML.addHeaderRowMultiColumnTable(new String[] {"Type", "Status", "HRID", "Title"})); + rd.addRaw(AHTML.addHeaderRowMultiColumnTable(new String[] {"Type", "Status", "ID", "Title"})); // Check for changes on working branches boolean workingBranchesFound = false; @@ -165,11 +166,12 @@ public class ArtifactImpactToActionSearchItem extends XNavigateItemAction { Artifact assocArt = ArtifactQuery.getArtifactFromId(transactionId.getCommit(), BranchManager.getCommonBranch()); if (assocArt.isOfType(AtsArtifactTypes.TeamWorkflow)) { + TeamWorkFlowArtifact twf = (TeamWorkFlowArtifact) assocArt; rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { assocArt.getArtifactTypeName(), "Committed", - assocArt.getHumanReadableId(), - assocArt.getName()})); + twf.getAtsId(), + twf.getName()})); committedChanges = true; } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java index 21c768ae5c1..8faf2525e8b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java @@ -62,8 +62,8 @@ import org.eclipse.osee.ats.world.search.ArtifactTypeSearchItem; import org.eclipse.osee.ats.world.search.ArtifactTypeWithInheritenceSearchItem; import org.eclipse.osee.ats.world.search.GoalSearchItem; import org.eclipse.osee.ats.world.search.GroupWorldSearchItem; -import org.eclipse.osee.ats.world.search.MultipleHridSearchData; -import org.eclipse.osee.ats.world.search.MultipleHridSearchOperation; +import org.eclipse.osee.ats.world.search.MultipleIdSearchData; +import org.eclipse.osee.ats.world.search.MultipleIdSearchOperation; import org.eclipse.osee.ats.world.search.MyFavoritesGoalsSearchItem; import org.eclipse.osee.ats.world.search.MyFavoritesSearchItem; import org.eclipse.osee.ats.world.search.MyGoalWorkflowItem; @@ -166,11 +166,11 @@ public final class AtsNavigateViewItems implements XNavigateViewItems, IXNavigat // Search Items items.add(new XNavigateItemOperation(item, FrameworkImage.BRANCH_CHANGE, "Open Change Report(s) by ID(s)", - new MultipleHridSearchOperationFactory("Open Change Report(s) by ID(s)", AtsEditor.ChangeReport))); + new MultipleIdSearchOperationFactory("Open Change Report(s) by ID(s)", AtsEditor.ChangeReport))); items.add(new XNavigateItemOperation(item, AtsImage.OPEN_BY_ID, "Search by ID(s) - Open World Editor", - new MultipleHridSearchOperationFactory("Search by ID(s) - Open World Editor", AtsEditor.WorldEditor))); + new MultipleIdSearchOperationFactory("Search by ID(s) - Open World Editor", AtsEditor.WorldEditor))); items.add(new XNavigateItemOperation(item, AtsImage.WORKFLOW_CONFIG, "Search by ID(s) - Open Workflow Editor", - new MultipleHridSearchOperationFactory("Search by ID(s) - Open Workflow Editor", AtsEditor.WorkflowEditor))); + new MultipleIdSearchOperationFactory("Search by ID(s) - Open Workflow Editor", AtsEditor.WorkflowEditor))); items.add(new XNavigateItemOperation(item, AtsImage.GLOBE, "Quick Search", new AtsQuickSearchOperationFactory())); @@ -344,19 +344,19 @@ public final class AtsNavigateViewItems implements XNavigateViewItems, IXNavigat items.addAll(nameToNavItem.values()); } - private static final class MultipleHridSearchOperationFactory implements IOperationFactory { + private static final class MultipleIdSearchOperationFactory implements IOperationFactory { private final AtsEditor atsEditor; private final String operationName; - public MultipleHridSearchOperationFactory(String operationName, AtsEditor atsEditor) { + public MultipleIdSearchOperationFactory(String operationName, AtsEditor atsEditor) { this.operationName = operationName; this.atsEditor = atsEditor; } @Override public IOperation createOperation() { - return new MultipleHridSearchOperation(new MultipleHridSearchData(operationName, atsEditor)); + return new MultipleIdSearchOperation(new MultipleIdSearchData(operationName, atsEditor)); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java index c0dd1a7c22c..609f725cb06 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/CreateActionArtifactChangeReportJob.java @@ -105,7 +105,7 @@ public class CreateActionArtifactChangeReportJob extends Job { int x = 1; rd.addRaw(AHTML.beginMultiColumnTable(95)); rd.addRaw(AHTML.addHeaderRowMultiColumnTable(new String[] { - "HRID", + "ID", "Bulld", "UI", attributeType.getName(), @@ -141,7 +141,7 @@ public class CreateActionArtifactChangeReportJob extends Job { } for (String attrStr : attrStrs) { rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { - teamArt.getHumanReadableId(), + teamArt.getAtsId(), buildId, modArt.getName(), attrStr, @@ -156,7 +156,7 @@ public class CreateActionArtifactChangeReportJob extends Job { } for (String attrStr : attrStrs) { rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { - teamArt.getHumanReadableId(), + teamArt.getAtsId(), buildId, artChg.getName(), attrStr, @@ -172,7 +172,7 @@ public class CreateActionArtifactChangeReportJob extends Job { } for (String attrStr : attrStrs) { rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { - teamArt.getHumanReadableId(), + teamArt.getAtsId(), buildId, artChg.getName(), attrStr, diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/ExtendedStatusReportJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/ExtendedStatusReportJob.java index 0672807ae3d..01cdc1da3d8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/ExtendedStatusReportJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/report/ExtendedStatusReportJob.java @@ -142,7 +142,7 @@ public class ExtendedStatusReportJob extends Job { for (Columns col : Columns.values()) { // System.out.println("col *" + col + "*"); if (col == Columns.ActionId) { - values.add(sma.getParentActionArtifact().getHumanReadableId()); + values.add(sma.getParentActionArtifact().getAtsId()); } else if (col == Columns.TeamId) { handleTeamIdColumn(sma, values); } else if (col == Columns.TaskId) { @@ -186,7 +186,7 @@ public class ExtendedStatusReportJob extends Job { private static void handleTaskIdColumn(AbstractWorkflowArtifact awa, List<String> values) { if (awa.isOfType(AtsArtifactTypes.Task)) { - values.add(((TaskArtifact) awa).getHumanReadableId()); + values.add(((TaskArtifact) awa).getAtsId()); } else { values.add("."); } @@ -194,7 +194,7 @@ public class ExtendedStatusReportJob extends Job { private static void handleTeamIdColumn(AbstractWorkflowArtifact sma, List<String> values) { if (sma.isTeamWorkflow()) { - values.add(sma.getHumanReadableId()); + values.add(sma.getAtsId()); } else { values.add("."); } @@ -202,7 +202,7 @@ public class ExtendedStatusReportJob extends Job { private static void handleOriginatorColumn(AbstractWorkflowArtifact sma, List<String> values) throws OseeCoreException { if (sma.getCreatedBy() == null) { - OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Can't retrieve orig for " + sma.getHumanReadableId()); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Can't retrieve orig for " + sma.getAtsId()); values.add("."); } else { values.add(sma.getCreatedBy().getName()); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/EmailActionsBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/EmailActionsBlam.java index 45e9926a484..999ecbb5d7d 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/EmailActionsBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/EmailActionsBlam.java @@ -170,12 +170,12 @@ public class EmailActionsBlam extends AbstractBlam { try { String legacyPcrId = sma.getSoleAttributeValue(AtsAttributeTypes.LegacyPcrId, ""); if (!legacyPcrId.equals("")) { - return "HRID: " + sma.getHumanReadableId() + " / LegacyId: " + legacyPcrId; + return "ID: " + sma.getAtsId() + " / LegacyId: " + legacyPcrId; } } catch (Exception ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); } - return "HRID: " + sma.getHumanReadableId(); + return "ID: " + sma.getAtsId(); } @Override diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateWorkingBranchFromTxBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateWorkingBranchFromTxBlam.java index 27728cb0b45..22eb6239c6c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateWorkingBranchFromTxBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/CreateWorkingBranchFromTxBlam.java @@ -16,15 +16,14 @@ import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; +import org.eclipse.osee.ats.core.client.search.AtsArtifactQuery; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.internal.Activator; -import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; @@ -35,11 +34,11 @@ import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; */ public class CreateWorkingBranchFromTxBlam extends AbstractBlam { - private static final String HRID_TX_WIDGET_NAME = "USAGE: Team Workflow HRID, TransactionId (pair on each line)"; + private static final String ATS_ID_TX_WIDGET_NAME = "USAGE: Team Workflow ATS ID, TransactionId (pair on each line)"; private static final int PAIR_SIZE = 2; private static final String description = - "'Copy and paste' or 'type' in Team Workflow HRID,Transaction Id from which to create working branch"; + "'Copy and paste' or 'type' in Team Workflow ATS ID,Transaction Id from which to create working branch"; public CreateWorkingBranchFromTxBlam() { super(null, description, BlamUiSource.FILE); @@ -47,15 +46,15 @@ public class CreateWorkingBranchFromTxBlam extends AbstractBlam { @Override public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception { - String input = variableMap.getString(HRID_TX_WIDGET_NAME); - ArrayList<String> hridTxs = new ArrayList<String>(Arrays.asList(input.split("\\r?\\n"))); - for (String hridTx : hridTxs) { - String[] pairs = hridTx.split("[,\\s]+"); + String input = variableMap.getString(ATS_ID_TX_WIDGET_NAME); + ArrayList<String> idTxs = new ArrayList<String>(Arrays.asList(input.split("\\r?\\n"))); + for (String idTx : idTxs) { + String[] pairs = idTx.split("[,\\s]+"); if (pairs.length == PAIR_SIZE) { - String hridNumber = pairs[0]; + String idNumber = pairs[0]; TransactionRecord parentTransactionId = TransactionManager.getTransactionId(Integer.valueOf(pairs[1])); try { - Artifact art = ArtifactQuery.getArtifactFromId(hridNumber, AtsUtil.getAtsBranch()); + Artifact art = AtsArtifactQuery.getArtifactFromId(idNumber); if (art.isOfType(AtsArtifactTypes.TeamWorkflow)) { TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) art; if (AtsBranchManagerCore.isCommittedBranchExists(teamArt)) { @@ -64,14 +63,14 @@ public class CreateWorkingBranchFromTxBlam extends AbstractBlam { } AtsBranchManagerCore.createWorkingBranch(teamArt, parentTransactionId, true); } else { - AWorkbench.popup("ERROR", "Must enter a Team Workflow HRID"); + AWorkbench.popup("ERROR", "Must enter a Team Workflow ID"); return; } } catch (Exception ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } else { - log(String.format("Skipping Input [%s] - Not in usage format <Team Workflow HRID, TransactionId> \n", + log(String.format("Skipping Input [%s] - Not in usage format <Team Workflow ID, TransactionId> \n", Arrays.toString(pairs))); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java index 12e35310075..22f23fafbce 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java @@ -161,11 +161,11 @@ public class DuplicateWorkflowBlam extends AbstractBlam { dupArt.setName(title); } dupArt.addRelation(AtsRelationTypes.ActionToWorkflow_Action, teamArt.getParentActionArtifact()); - dupArt.getLog().addLog(LogType.Note, null, "Workflow duplicated from " + teamArt.getHumanReadableId()); + dupArt.getLog().addLog(LogType.Note, null, "Workflow duplicated from " + teamArt.getAtsId()); if (duplicateTasks) { for (TaskArtifact taskArt : teamArt.getTaskArtifacts()) { TaskArtifact dupTaskArt = (TaskArtifact) taskArt.duplicate(AtsUtil.getAtsBranch()); - dupTaskArt.getLog().addLog(LogType.Note, null, "Task duplicated from " + taskArt.getHumanReadableId()); + dupTaskArt.getLog().addLog(LogType.Note, null, "Task duplicated from " + taskArt.getAtsId()); dupArt.addRelation(AtsRelationTypes.TeamWfToTask_Task, dupTaskArt); dupArt.persist(transaction); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java index a16303ce32b..23059e77985 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ExportChangeReportOperation.java @@ -91,12 +91,12 @@ public final class ExportChangeReportOperation extends AbstractOperation { } }; - for (Artifact workflow : workflows) { + for (TeamWorkFlowArtifact workflow : workflows) { Set<Integer> artIds = new HashSet<Integer>(); Collection<Change> changes = computeChanges(workflow, monitor, artIds); if (!changes.isEmpty() && changes.size() < 4000) { String id = - workflow.getSoleAttributeValueAsString(AtsAttributeTypes.LegacyPcrId, workflow.getHumanReadableId()); + workflow.getSoleAttributeValueAsString(AtsAttributeTypes.LegacyPcrId, workflow.getAtsId()); String prefix = "/" + id; if (writeChangeReports) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java index 2d867f22b37..af8a1d1007c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/GenerateReviewParticipationReport.java @@ -18,6 +18,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.ats.AtsImage; import org.eclipse.osee.ats.api.user.IAtsUser; +import org.eclipse.osee.ats.column.AtsIdColumn; import org.eclipse.osee.ats.column.LegacyPcrIdColumn; import org.eclipse.osee.ats.column.RelatedToStateColumn; import org.eclipse.osee.ats.column.StateColumn; @@ -44,7 +45,6 @@ import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewer import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactNameColumn; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactTypeColumn; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.GuidColumn; -import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.HridColumn; import org.eclipse.osee.framework.ui.swt.Displays; /** @@ -135,7 +135,7 @@ public class GenerateReviewParticipationReport extends XNavigateItemAction { public ReviewParticipationXViewerFactory(IAtsUser user) { super(MASS_XVIEWER_CUSTOMIZE_NAMESPACE); registerColumns(ArtifactTypeColumn.getInstance()); - registerColumns(new HridColumn()); + registerColumns(new AtsIdColumn()); registerColumns(LegacyPcrIdColumn.getInstance()); registerColumns(StateColumn.getInstance()); registerColumns(new XViewerSmaCompletedDateColumn("Completed")); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java index d06984b36a7..e94c6ee891c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java @@ -79,7 +79,7 @@ public class ReviewNavigateViewItems implements XNavigateViewItems, IXNavigateCo OseeLog.log(Activator.class, Level.SEVERE, ex); } items.add(new SearchNavigateItem(item, new ReviewSearchWorkflowSearchItem())); - items.add(new XNavigateItemAction(item, new OpenWorkflowByIdAction("Open Review by HRID"), AtsImage.REVIEW)); + items.add(new XNavigateItemAction(item, new OpenWorkflowByIdAction("Open Review by ID"), AtsImage.REVIEW)); items.add(new SearchNavigateItem(item, new ShowOpenWorkflowsByArtifactType( "Show Open " + AtsArtifactTypes.DecisionReview.getName() + "s", AtsArtifactTypes.DecisionReview, false, false, AtsImage.DECISION_REVIEW))); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsQuickSearchOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsQuickSearchOperation.java index d1b6a4cdbe8..f73d75f9634 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsQuickSearchOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/search/AtsQuickSearchOperation.java @@ -14,6 +14,7 @@ import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED import java.util.HashSet; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.osee.ats.core.client.search.AtsArtifactQuery; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsUtil; @@ -23,7 +24,6 @@ import org.eclipse.osee.ats.world.WorldEditorOperationProvider; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.AbstractOperation; -import org.eclipse.osee.framework.jdk.core.util.HumanReadableId; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; @@ -54,15 +54,13 @@ class AtsQuickSearchOperation extends AbstractOperation implements IWorldEditorC return; } for (String str : data.getSearchStr().split(", ")) { - if (HumanReadableId.isValid(str)) { - try { - Artifact art = ArtifactQuery.getArtifactFromId(str, AtsUtil.getAtsBranch()); - if (art != null) { - allArtifacts.add(art); - } - } catch (ArtifactDoesNotExist ex) { - // do nothing + try { + Artifact art = AtsArtifactQuery.getArtifactFromId(str); + if (art != null) { + allArtifacts.add(art); } + } catch (ArtifactDoesNotExist ex) { + // do nothing } } for (Artifact art : ArtifactQuery.getArtifactListFromAttributeKeywords(AtsUtil.getAtsBranch(), diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitOperation.java index 398820908cf..a4b04a14812 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchCommitOperation.java @@ -62,7 +62,7 @@ public class AtsBranchCommitOperation extends AbstractOperation { AtsBranchManagerCore.branchesInCommit.add(workflowWorkingBranch); if (workflowWorkingBranch == null) { throw new OseeStateException("Commit Branch Failed: Can not locate branch for workflow [%s]", - teamArt.getHumanReadableId()); + teamArt.getAtsId()); } // Confirm that all blocking reviews are completed diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java index fc0c019a0b7..fd6d0f30011 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsDeleteManager.java @@ -23,6 +23,7 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.artifact.AbstractAtsArtifact; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; @@ -60,7 +61,7 @@ public class AtsDeleteManager { if (art instanceof AbstractAtsArtifact) { delArts.add(art); if (selectedArts.size() < 30) { - artBuilder.append(String.format("Name: %s Type: %s\n", art.getHumanReadableId(), + artBuilder.append(String.format("Name: %s Type: %s\n", ((AbstractAtsArtifact) art).getName(), art.getArtifactTypeName())); } } @@ -139,7 +140,7 @@ public class AtsDeleteManager { allDeleteArts.add(deleteArt); final Set<Artifact> relatedArts = new HashSet<Artifact>(30); delBuilder.append(String.format("\n<b>Selected</b>:[%s][%s][%s]", deleteArt.getArtifactTypeName(), - deleteArt.getHumanReadableId(), deleteArt.getName()) + "\n"); + AtsUtilCore.getAtsId(deleteArt), deleteArt.getName()) + "\n"); if (deleteArt.isOfType(AtsArtifactTypes.Action)) { for (TeamWorkFlowArtifact art : ActionManager.getTeams(deleteArt)) { art.atsDelete(relatedArts, ignoredArts); @@ -150,7 +151,7 @@ public class AtsDeleteManager { for (Artifact loopArt : relatedArts) { if (!loopArt.equals(deleteArt)) { delBuilder.append(String.format(AHTML.addSpace(4) + "<b>Related</b>:[%s][%s][%s]", - loopArt.getArtifactTypeName(), loopArt.getHumanReadableId(), loopArt.getName()) + "\n"); + loopArt.getArtifactTypeName(), AtsUtilCore.getAtsId(loopArt), loopArt.getName()) + "\n"); } } } @@ -161,7 +162,7 @@ public class AtsDeleteManager { if (actionArt != null && !allDeleteArts.contains(actionArt) && allDeleteArts.containsAll(ActionManager.getTeams(actionArt))) { relatedArts.add(actionArt); delBuilder.append(String.format(AHTML.addSpace(4) + "<b>Related</b>:[%s][%s][%s]", - actionArt.getArtifactTypeName(), actionArt.getHumanReadableId(), actionArt.getName()) + "\n"); + actionArt.getArtifactTypeName(), AtsUtilCore.getAtsId(actionArt), actionArt.getName()) + "\n"); } } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java index bea9b0cf4e2..44f8b391370 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java @@ -25,7 +25,9 @@ import org.eclipse.osee.ats.actions.ModifyActionableItemAction; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.artifact.TeamWorkflowLabelProvider; +import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.action.ActionManager; +import org.eclipse.osee.ats.core.client.search.AtsArtifactQuery; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.client.workflow.StateManager; @@ -167,10 +169,10 @@ public final class AtsUtil { new ModifyActionableItemAction(teamArt).run(); } - public static void openArtifact(String guidOrHrid, Integer branchId, OseeCmEditor view) { + public static void openArtifact(String guid, Integer branchId, OseeCmEditor view) { try { Branch branch = BranchManager.getBranch(branchId); - Artifact artifact = ArtifactQuery.getArtifactFromId(guidOrHrid, branch); + Artifact artifact = ArtifactQuery.getArtifactFromId(guid, branch); openATSAction(artifact, AtsOpenOption.OpenOneOrPopupSelect); } catch (Exception ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); @@ -183,7 +185,7 @@ public final class AtsUtil { public static void openArtifact(String guid, OseeCmEditor editor) { Artifact artifact = null; try { - artifact = ArtifactQuery.getArtifactFromId(guid, getAtsBranch()); + artifact = AtsArtifactQuery.getArtifactFromId(guid); } catch (Exception ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); return; @@ -222,13 +224,14 @@ public final class AtsUtil { public static void openATSAction(final Artifact art, final AtsOpenOption atsOpenOption) { try { if (art.isOfType(AtsArtifactTypes.Action)) { + ActionArtifact action = (ActionArtifact) art; Collection<TeamWorkFlowArtifact> teams = ActionManager.getTeams(art); if (atsOpenOption == AtsOpenOption.OpenAll) { for (TeamWorkFlowArtifact team : teams) { SMAEditor.editArtifact(team); } } else if (atsOpenOption == AtsOpenOption.AtsWorld) { - WorldEditor.open(new WorldEditorSimpleProvider("Action " + art.getHumanReadableId(), Arrays.asList(art))); + WorldEditor.open(new WorldEditorSimpleProvider("Action " + action.getAtsId(), Arrays.asList(art))); } else if (atsOpenOption == AtsOpenOption.OpenOneOrPopupSelect) { if (teams.size() == 1) { SMAEditor.editArtifact(teams.iterator().next()); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java index ad1b335bc73..5be8b0ef0d4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java @@ -14,6 +14,7 @@ import java.rmi.activation.Activator; import java.util.Arrays; import java.util.List; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osee.ats.core.client.search.AtsArtifactQuery; import org.eclipse.osee.ats.health.ValidateAtsDatabase; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.XResultData; @@ -22,7 +23,6 @@ import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; @@ -48,7 +48,7 @@ public class DoesNotWorkItemAts extends XNavigateItemAction { return; } - List<String> hrids = + List<String> ids = Arrays.asList("ZW43T", "LQ4GH", "F090B", "1BN39", "FF7LC", "JXJ7G", "SP4TF", "37SWW", "Y3TRT", "UF9Z8", "XQ0GL", "H9MKB", "SML1L", "J27TH", "S192U", "UZSGK", "RMLXB", "KPY74", "2BQZM", "2LXD8", "SH9P9", "D25LM", "KS57V", "R4Z07", "VHKFM", "7SK10", "AKF8Y", "W37FQ", "AR47S", "8S42M", "V588M", "59TJZ", "NPFH7", "DVT59", @@ -64,11 +64,10 @@ public class DoesNotWorkItemAts extends XNavigateItemAction { "UTN8A", "QP3RQ", "8QPCY", "BZ0LK", "5RT4C", "LYFPD", "88KQV", "ACGJV", "U0M9B"); try { - List<Artifact> artifacts = ArtifactQuery.getArtifactListFromIds(hrids, AtsUtil.getAtsBranchToken()); + List<Artifact> artifacts = AtsArtifactQuery.getArtifactListFromIds(ids); - if (hrids.size() != artifacts.size()) { - System.err.println(String.format("Hrid size %d doesn't match artifact size %d", hrids.size(), - artifacts.size())); + if (ids.size() != artifacts.size()) { + System.err.println(String.format("Id size %d doesn't match artifact size %d", ids.size(), artifacts.size())); } HashCollection<String, String> testNameToResultsMap = null; testNameToResultsMap = new HashCollection<String, String>(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java index c0b74224d5e..a1f99e99cec 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Overview.java @@ -33,7 +33,6 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationLink; -import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultBrowserHyperCmd; /** @@ -129,7 +128,7 @@ public class Overview { this.html.append(AHTML.multiColumnTable(new String[] { AHTML.getLabelStr(labelFont, "State: ") + awa.getStateMgr().getCurrentStateName(), AHTML.getLabelStr(labelFont, "Type: ") + awa.getArtifactTypeName(), - AHTML.getLabelStr(labelFont, "Id: ") + awa.getHumanReadableId()})); + AHTML.getLabelStr(labelFont, "Id: ") + awa.getAtsId()})); addTable(getLabelValue("Originator", awa.getCreatedBy().getName()), getLabelValue("Creation Date", DateUtil.getMMDDYYHHMM(awa.getCreatedDate()))); if (awa.isTeamWorkflow()) { @@ -245,19 +244,6 @@ public class Overview { return getOpenHyperlinkHtml(art.getName(), art); } - public static String getOpenHyperlinkHtml(String name, String hrid) { - return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openAction, hrid), name); - } - - public static String getOpenArtEditHyperlinkHtml(String name, String hrid) { - return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openArtifactEditor, hrid), - name); - } - - public static String getOpenHyperlinkHtml(String name, String guidOrHrid, int branchId) { - return XResultDataUI.getHyperlink(name, guidOrHrid, branchId); - } - public static String getOpenHyperlinkHtml(String name, Artifact art) { return AHTML.getHyperlink( XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openAction, art.getGuid()), name); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PromptChangeUtil.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PromptChangeUtil.java index 45dafb430b6..fcc1b6d68f6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PromptChangeUtil.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PromptChangeUtil.java @@ -66,7 +66,7 @@ public final class PromptChangeUtil { return ArtifactPromptChange.promptChangeAttribute(attributeType, java.util.Collections.singleton(sma), persist); } catch (Exception ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, - "Can't save " + attributeType.getUnqualifiedName() + " date to artifact " + sma.getHumanReadableId(), ex); + "Can't save " + attributeType.getUnqualifiedName() + " date to artifact " + sma.getAtsId(), ex); } return false; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ArtifactValidationRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ArtifactValidationRule.java index 49ee0372bfd..66a121f8899 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ArtifactValidationRule.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ArtifactValidationRule.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.validation.IOseeValidator; @@ -28,7 +29,7 @@ public class ArtifactValidationRule extends AbstractValidationRule { private String getStatusMessage(Artifact itemChecked, IStatus status) throws OseeCoreException { String link = XResultDataUI.getHyperlink(String.format("%s:[%s]", itemChecked.getArtifactTypeName(), itemChecked.getName()), - itemChecked.getHumanReadableId(), itemChecked.getFullBranch().getId()); + AtsUtilCore.getAtsId(itemChecked), itemChecked.getFullBranch().getId()); return String.format("%s: %s", link, status.getMessage()); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java index 3ad7f5f09ce..61120fbd0f3 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/validate/ValidationReportOperation.java @@ -19,6 +19,7 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; +import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.internal.Activator; import org.eclipse.osee.ats.util.AtsBranchManager; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -134,7 +135,8 @@ public class ValidationReportOperation extends AbstractOperation { } public static String getRequirementHyperlink(Artifact art) throws OseeCoreException { - String linkName = String.format("%s(%s)", art.getName(), art.getHumanReadableId()); - return XResultDataUI.getHyperlink(linkName, art.getHumanReadableId(), art.getFullBranch().getId()); + String atsId = AtsUtilCore.getAtsId(art); + String linkName = String.format("%s(%s)", art.getName(), atsId); + return XResultDataUI.getHyperlink(linkName, atsId, art.getFullBranch().getId()); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/ReleaseVersionItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/ReleaseVersionItem.java index d060f3c9607..272c5ac3849 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/ReleaseVersionItem.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/ReleaseVersionItem.java @@ -83,7 +83,7 @@ public class ReleaseVersionItem extends XNavigateItemAction { verArt)) { if (!team.isCancelled() && !team.isCompleted()) { errorStr = - "All Team Workflows must be either Completed or " + "Cancelled before releasing a version.\n\n" + team.getHumanReadableId() + " - is in the\"" + team.getStateMgr().getCurrentStateName() + "\" state."; + "All Team Workflows must be either Completed or " + "Cancelled before releasing a version.\n\n" + team.getAtsId() + " - is in the\"" + team.getStateMgr().getCurrentStateName() + "\" state."; } } if (errorStr != null) { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionReportJob.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionReportJob.java index b98014851f9..f260b5b963c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionReportJob.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/version/VersionReportJob.java @@ -149,7 +149,7 @@ public class VersionReportJob extends Job { public static String getTeamWorkflowReport(Collection<TeamWorkFlowArtifact> teamArts, Integer backgroundColor, IProgressMonitor monitor) throws OseeCoreException { StringBuilder sb = new StringBuilder(); sb.append(AHTML.beginMultiColumnTable(100, 1, backgroundColor)); - sb.append(AHTML.addHeaderRowMultiColumnTable(new String[] {"Type", "Team", "Priority", "Change", "Title", "HRID"})); + sb.append(AHTML.addHeaderRowMultiColumnTable(new String[] {"Type", "Team", "Priority", "Change", "Title", "ID"})); int x = 1; Set<IAtsTeamDefinition> teamDefs = new HashSet<IAtsTeamDefinition>(); for (TeamWorkFlowArtifact team : teamArts) { @@ -169,11 +169,11 @@ public class VersionReportJob extends Job { PriorityUtil.getPriorityStr(team), ChangeTypeUtil.getChangeTypeStr(team), team.getName(), - team.getHumanReadableId()}, null, (x % 2 == 0 ? null : "#cccccc"))); + team.getAtsId()}, null, (x % 2 == 0 ? null : "#cccccc"))); for (TaskArtifact taskArt : team.getTaskArtifacts()) { sb.append(AHTML.addRowMultiColumnTable( - new String[] {"Task", "", "", "", taskArt.getName(), taskArt.getHumanReadableId()}, null, + new String[] {"Task", "", "", "", taskArt.getName(), taskArt.getAtsId()}, null, (x % 2 == 0 ? null : "#cccccc"))); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java index a0560c6c594..072c8e750a8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/walker/ActionWalkerView.java @@ -157,7 +157,7 @@ public class ActionWalkerView extends GenericViewPart implements IPartListener, if (parentArtifact.isOfType(AtsArtifactTypes.TeamWorkflow)) { artifact = ((TeamWorkFlowArtifact) parentArtifact).getParentActionArtifact(); } else { - OseeLog.log(Activator.class, Level.SEVERE, "Unknown parent " + art.getHumanReadableId()); + OseeLog.log(Activator.class, Level.SEVERE, "Unknown parent " + AtsUtilCore.getAtsId(art)); } } } @@ -182,7 +182,7 @@ public class ActionWalkerView extends GenericViewPart implements IPartListener, private void setTooltips() { try { if (!GoalManager.isGoalArtifact(activeAwa) && !PeerToPeerReviewManager.isStandAlongReview(activeAwa)) { - ActionArtifact actionArt = (ActionArtifact) activeAwa.getParentActionArtifact(); + ActionArtifact actionArt = activeAwa.getParentActionArtifact(); if (actionArt != null) { for (TeamWorkFlowArtifact teamArt : actionArt.getTeams()) { GraphItem item = viewer.findGraphItem(teamArt); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java index 31b0f05fcd6..9cec7e467a4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/config/ImportAIsAndTeamDefinitionsToDb.java @@ -15,7 +15,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import org.eclipse.emf.common.util.EList; -import org.eclipse.osee.ats.api.IAtsConfigObject; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; @@ -40,7 +39,6 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.jdk.core.util.GUID; -import org.eclipse.osee.framework.jdk.core.util.HumanReadableId; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; @@ -114,7 +112,7 @@ public class ImportAIsAndTeamDefinitionsToDb { } newTeam = ArtifactTypeManager.addArtifact(AtsArtifactTypes.TeamDefinition, AtsUtil.getAtsBranch(), dslTeamName, - guid, HumanReadableId.generate()); + guid); } if (parentArtifact != null && !parentArtifact.equals(newTeam)) { parentArtifact.addChild(newTeam); @@ -176,8 +174,6 @@ public class ImportAIsAndTeamDefinitionsToDb { private void importVersionDefinitions(EList<VersionDef> versionDefs, Artifact teamDef) throws OseeCoreException { - IAtsConfigObject configObject = AtsClientService.get().getConfigObject(teamDef); - Map<String, Artifact> nameToVerArt = new HashMap<String, Artifact>(); for (VersionDef dslVersionDef : versionDefs) { String dslVerName = Strings.unquote(dslVersionDef.getName()); @@ -189,12 +185,9 @@ public class ImportAIsAndTeamDefinitionsToDb { dslVersionDef); } Artifact newVer = - ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), dslVerName, guid, - HumanReadableId.generate()); - - Artifact teamDefArt = AtsClientService.get().getConfigArtifact(configObject); + ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtil.getAtsBranch(), dslVerName, guid); - teamDefArt.addRelation(AtsRelationTypes.TeamDefinitionToVersion_Version, newVer); + teamDef.addRelation(AtsRelationTypes.TeamDefinitionToVersion_Version, newVer); nameToVerArt.put(newVer.getName(), newVer); newVersions.put(newVer.getName(), newVer); newVer.setSoleAttributeValue(AtsAttributeTypes.AllowCommitBranch, @@ -238,8 +231,7 @@ public class ImportAIsAndTeamDefinitionsToDb { guid, dslAIDef); } newAi = - ArtifactTypeManager.addArtifact(AtsArtifactTypes.ActionableItem, AtsUtil.getAtsBranch(), dslAIName, - guid, HumanReadableId.generate()); + ArtifactTypeManager.addArtifact(AtsArtifactTypes.ActionableItem, AtsUtil.getAtsBranch(), dslAIName, guid); } if (parentArtifact != null && !parentArtifact.equals(newAi)) { parentArtifact.addChild(newAi); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java index adbf9600f39..68d04240a46 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java @@ -74,7 +74,7 @@ public class WorldLabelProvider extends XViewerLabelProvider { @Override public String getColumnText(Object element, XViewerColumn xCol, int columnIndex) { try { - // NOTE: HRID, Type, Title are handled by XViewerValueColumn values + // NOTE: ID, Type, Title are handled by XViewerValueColumn values if (!AtsUtil.isAtsArtifact(element)) { return ""; } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java index 19170e0fd6a..f14949c803b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java @@ -46,6 +46,7 @@ import org.eclipse.osee.ats.column.HoursSpentStateReviewColumn; import org.eclipse.osee.ats.column.HoursSpentStateTasksColumn; import org.eclipse.osee.ats.column.HoursSpentStateTotalColumn; import org.eclipse.osee.ats.column.HoursSpentTotalColumn; +import org.eclipse.osee.ats.column.AtsIdColumn; import org.eclipse.osee.ats.column.ImplementorColumnUI; import org.eclipse.osee.ats.column.LastStatusedColumn; import org.eclipse.osee.ats.column.LegacyPcrIdColumn; @@ -63,7 +64,7 @@ import org.eclipse.osee.ats.column.OriginatingWorkFlowColumn; import org.eclipse.osee.ats.column.OriginatorColumn; import org.eclipse.osee.ats.column.PagesChangedColumn; import org.eclipse.osee.ats.column.PagesReviewedColumn; -import org.eclipse.osee.ats.column.ParentHridColumn; +import org.eclipse.osee.ats.column.ParentAtsIdColumn; import org.eclipse.osee.ats.column.ParentIdColumn; import org.eclipse.osee.ats.column.ParentStateColumn; import org.eclipse.osee.ats.column.ParentTopTeamColumnUI; @@ -116,7 +117,6 @@ import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.SkynetXViewerFactory; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactTypeColumn; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.GuidColumn; -import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.HridColumn; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.LastModifiedByColumn; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.LastModifiedDateColumn; @@ -139,7 +139,7 @@ public class WorldXViewerFactory extends SkynetXViewerFactory { TitleColumn.getInstance(), ActionableItemsColumnUI.getInstance(), UserCommunityColumn.getInstance(), - HridColumn.getInstance(), + AtsIdColumn.getInstance(), CreatedDateColumn.getInstance(), TargetedVersionColumn.getInstance(), TeamColumn.getInstance(), @@ -215,7 +215,7 @@ public class WorldXViewerFactory extends SkynetXViewerFactory { ArtifactTypeColumn.getInstance(), OriginatingWorkFlowColumn.getInstance(), ParentIdColumn.getInstance(), - ParentHridColumn.getInstance(), + ParentAtsIdColumn.getInstance(), DaysInCurrentStateColumn.getInstance(), ParentStateColumn.getInstance(), ParentWorkDefColumn.getInstance(), @@ -228,7 +228,8 @@ public class WorldXViewerFactory extends SkynetXViewerFactory { PagesReviewedColumn.getInstance(), new GuidColumn(false), ParentTopTeamColumnUI.getInstance(), - ActionableItemOwner.getInstance()}; + ActionableItemOwner.getInstance(), + AtsIdColumn.getInstance()}; private final static String NAMESPACE = "org.eclipse.osee.ats.WorldXViewer"; public WorldXViewerFactory() { diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchData.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchData.java index c35dd565350..69af1fa46a6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchData.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchData.java @@ -16,14 +16,12 @@ import org.eclipse.osee.ats.util.AtsEditor; import org.eclipse.osee.ats.world.IWorldEditorConsumer; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.framework.core.model.Branch; -import org.eclipse.osee.framework.jdk.core.util.GUID; -import org.eclipse.osee.framework.jdk.core.util.HumanReadableId; import org.eclipse.osee.framework.jdk.core.util.Strings; /** * @author Donald G. Dunne */ -public class MultipleHridSearchData implements IWorldEditorConsumer { +public class MultipleIdSearchData implements IWorldEditorConsumer { private String enteredIds = ""; private List<String> ids = new ArrayList<String>(); private boolean includeArtIds; @@ -32,7 +30,7 @@ public class MultipleHridSearchData implements IWorldEditorConsumer { private WorldEditor worldEditor; private AtsEditor atsEditor; - public MultipleHridSearchData(String name, AtsEditor atsEditor) { + public MultipleIdSearchData(String name, AtsEditor atsEditor) { this.name = name; this.atsEditor = atsEditor; } @@ -56,23 +54,13 @@ public class MultipleHridSearchData implements IWorldEditorConsumer { if (!str.equals("")) { ids.add(str); } - // allow for lower case hrids + // allow for lower case ats ids if (str.length() == 5 && !ids.contains(str.toUpperCase())) { ids.add(str.toUpperCase()); } } } - public List<String> getValidGuidsAndHrids() { - List<String> results = new ArrayList<String>(); - for (String id : getIds()) { - if (GUID.isValid(id) || HumanReadableId.isValid(id)) { - results.add(id); - } - } - return results; - } - public List<String> getIds() { if (ids.isEmpty()) { extractIds(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchOperation.java index 1be53627df7..0dcc508ccef 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchOperation.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchOperation.java @@ -25,6 +25,7 @@ import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.artifact.SmaWorkflowLabelProvider; import org.eclipse.osee.ats.core.client.action.ActionManager; import org.eclipse.osee.ats.core.client.branch.AtsBranchManagerCore; +import org.eclipse.osee.ats.core.client.search.AtsArtifactQuery; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.internal.Activator; @@ -58,13 +59,13 @@ import org.eclipse.ui.dialogs.ListDialog; /** * @author Donald G. Dunne */ -public class MultipleHridSearchOperation extends AbstractOperation implements IWorldEditorConsumer { +public class MultipleIdSearchOperation extends AbstractOperation implements IWorldEditorConsumer { private final Set<Artifact> resultAtsArts = new HashSet<Artifact>(); private final Set<Artifact> resultNonAtsArts = new HashSet<Artifact>(); private final Set<Artifact> artifacts = new HashSet<Artifact>(); - private final MultipleHridSearchData data; + private final MultipleIdSearchData data; - public MultipleHridSearchOperation(MultipleHridSearchData data) { + public MultipleIdSearchOperation(MultipleIdSearchData data) { super(data.getName(), Activator.PLUGIN_ID); this.data = data; } @@ -72,7 +73,7 @@ public class MultipleHridSearchOperation extends AbstractOperation implements IW @Override protected void doWork(IProgressMonitor monitor) throws Exception { if (!data.hasValidInput()) { - MultipleHridSearchUi ui = new MultipleHridSearchUi(data); + MultipleIdSearchUi ui = new MultipleIdSearchUi(data); if (!ui.getInput()) { return; } @@ -83,7 +84,7 @@ public class MultipleHridSearchOperation extends AbstractOperation implements IW } searchAndSplitResults(); if (resultAtsArts.isEmpty() && resultNonAtsArts.isEmpty()) { - AWorkbench.popup("Invalid HRID/Guid/Legacy PCR Id(s): " + Collections.toString(", ", data.getIds())); + AWorkbench.popup("Invalid ID/Guid/Legacy PCR Id(s): " + Collections.toString(", ", data.getIds())); return; } if (resultNonAtsArts.size() > 0) { @@ -213,10 +214,10 @@ public class MultipleHridSearchOperation extends AbstractOperation implements IW } } - // This does hrid/guid search - List<String> validGuidsAndHrids = data.getValidGuidsAndHrids(); - if (!validGuidsAndHrids.isEmpty()) { - for (Artifact art : ArtifactQuery.getArtifactListFromIds(validGuidsAndHrids, AtsUtil.getAtsBranch())) { + // This does id/guid search + List<String> validGuidsAndIds = data.getIds(); + if (!validGuidsAndIds.isEmpty()) { + for (Artifact art : AtsArtifactQuery.getArtifactListFromIds(validGuidsAndIds)) { artifacts.add(art); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchUi.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchUi.java index f7e81937d4c..a44fa93cc9c 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchUi.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleIdSearchUi.java @@ -25,11 +25,11 @@ import org.eclipse.osee.framework.ui.swt.Displays; /** * @author Donald G. Dunne */ -public class MultipleHridSearchUi { +public class MultipleIdSearchUi { - private final MultipleHridSearchData data; + private final MultipleIdSearchData data; - public MultipleHridSearchUi(MultipleHridSearchData data) { + public MultipleIdSearchUi(MultipleIdSearchData data) { this.data = data; } @@ -51,13 +51,12 @@ public class MultipleHridSearchUi { EntryDialog ed = null; if (AtsUtilCore.isAtsAdmin()) { ed = - new EntryCheckDialog(data.getName(), "Enter Legacy ID, Guid or HRID (comma separated)", "Include ArtIds"); + new EntryCheckDialog(data.getName(), "Enter Legacy ID, Guid or ID (comma separated)", "Include ArtIds"); } else { ed = new EntryDialog(Displays.getActiveShell(), data.getName(), null, - "Enter Legacy ID, Guid or HRID (comma separated)", MessageDialog.QUESTION, new String[] { - "OK", - "Cancel"}, 0); + "Enter Legacy ID, Guid or ID (comma separated)", MessageDialog.QUESTION, + new String[] {"OK", "Cancel"}, 0); } int response = ed.open(); if (response == 0) { |