Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2017-07-06 12:50:07 -0400
committerdonald.g.dunne2017-07-25 14:12:24 -0400
commitdd8360b04137e33f12416e44596bf9ec78a9489c (patch)
tree0471a751fe232c13971ce2934d6d20d09c2d52a1
parentfbbfc5a22f7edc0ecb3fdd8bcdfa3cadc291d37f (diff)
downloadorg.eclipse.osee-dd8360b04137e33f12416e44596bf9ec78a9489c.tar.gz
org.eclipse.osee-dd8360b04137e33f12416e44596bf9ec78a9489c.tar.xz
org.eclipse.osee-dd8360b04137e33f12416e44596bf9ec78a9489c.zip
feature[ats_TW1161]: Remove ActionableItem from code base
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/ai/IAtsActionableItemService.java2
-rw-r--r--plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java1
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AtsArtifactChecks.java22
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/ai/ActionableItemManager.java21
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java31
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AbstractReview.java8
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AtsReviewServiceImpl.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java24
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/TeamWorkflow.java10
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertAtsConfigGuidAttributesOperation.java4
-rw-r--r--plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsAttributeXWidgetProvider.java2
13 files changed, 59 insertions, 76 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/ai/IAtsActionableItemService.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/ai/IAtsActionableItemService.java
index 2ef8e56f0a..1bdb890534 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/ai/IAtsActionableItemService.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/ai/IAtsActionableItemService.java
@@ -27,7 +27,7 @@ public interface IAtsActionableItemService {
String getActionableItemsStr(IAtsObject atsObject) throws OseeCoreException;
- Collection<String> getActionableItemGuids(IAtsObject atsObject) throws OseeCoreException;
+ Collection<String> getActionableItemIds(IAtsObject atsObject) throws OseeCoreException;
void addActionableItem(IAtsObject atsObject, IAtsActionableItem aia, IAtsChangeSet changes) throws OseeCoreException;
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java
index 270600cd75..4f0fa4b47b 100644
--- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java
@@ -24,7 +24,6 @@ public final class AtsAttributeTypes {
public static final Map<String, AttributeTypeToken> nameToTypeMap = new HashMap<>();
// @formatter:off
public static final AttributeTypeToken Actionable = createType(1152921504606847160L, "Actionable", "True if item can have Action written against or assigned to.");
- public static final AttributeTypeToken ActionableItem = createType(1152921504606847200L, "Actionable Item", "Actionable Items that are impacted by this change.");
public static final AttributeTypeToken ActionableItemReference = createType(6780739363553225476L, "Actionable Item Reference", "Actionable Items that are impacted by this change.");
public static final AttributeTypeToken ActionDetailsFormat = createType(1152921504606847199L, "Action Details Format", "Format of string when push Action Details Copy button on SMA Workflow Editor.");
public static final AttributeTypeToken Active = createType(1152921504606847153L, "Active", "Active ATS configuration object.");
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java
index 51e9a48564..c8faba7661 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java
@@ -123,7 +123,7 @@ public class PeerToPeerReviewManagerTest extends PeerToPeerReviewManager {
peerArt.isDirty());
Assert.assertEquals(PeerToPeerReviewState.Prepare.getName(), peerArt.getCurrentStateName());
Assert.assertEquals("Joe Smith", peerArt.getStateMgr().getAssigneesStr());
- Assert.assertEquals(AtsClientService.get().getArtifact(AtsTestUtil.getTestAi()).getGuid(),
- peerArt.getSoleAttributeValue(AtsAttributeTypes.ActionableItem));
+ Assert.assertEquals(AtsTestUtil.getTestAi().getIdString(),
+ peerArt.getSoleAttributeValueAsString(AtsAttributeTypes.ActionableItemReference, ""));
}
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AtsArtifactChecks.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AtsArtifactChecks.java
index 610eee929d..c247819a41 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AtsArtifactChecks.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/AtsArtifactChecks.java
@@ -157,15 +157,15 @@ public class AtsArtifactChecks extends ArtifactCheck {
}
private IStatus checkActionableItems(boolean isAtsAdmin, Collection<Artifact> artifacts) throws OseeCoreException {
- Set<String> aiaGuids = getActionableItemGuidsWithRecurse(new HashSet<String>(), artifacts);
- if (!aiaGuids.isEmpty()) {
+ Set<String> aiIds = getActionableItemIdsWithRecurse(new HashSet<String>(), artifacts);
+ if (!aiIds.isEmpty()) {
List<Artifact> teamWfsRelatedToAis =
ArtifactQuery.getArtifactListFromTypeAndAttribute(AtsArtifactTypes.TeamWorkflow,
- AtsAttributeTypes.ActionableItem, aiaGuids, AtsClientService.get().getAtsBranch(), 10);
+ AtsAttributeTypes.ActionableItemReference, aiIds, AtsClientService.get().getAtsBranch(), 10);
if (!teamWfsRelatedToAis.isEmpty()) {
return createStatus(String.format(
"Actionable Items (or children AIs) [%s] selected to delete have related Team Workflows; Delete or re-assign Team Workflows first.",
- aiaGuids));
+ aiIds));
}
if (!isAtsAdmin) {
return createStatus("Deletion of Actionable Items is only permitted by ATS Admin.");
@@ -174,20 +174,20 @@ public class AtsArtifactChecks extends ArtifactCheck {
return Status.OK_STATUS;
}
- private Set<String> getActionableItemGuidsWithRecurse(HashSet<String> aiaGuids, Collection<Artifact> artifacts) {
+ private Set<String> getActionableItemIdsWithRecurse(HashSet<String> aiIds, Collection<Artifact> artifacts) {
for (Artifact art : artifacts) {
if (art.isOfType(AtsArtifactTypes.ActionableItem)) {
- IAtsActionableItem aia = AtsClientService.get().getCache().getAtsObject(art.getId());
- if (aia != null) {
- aiaGuids.add(AtsUtilCore.getGuid(aia));
+ IAtsActionableItem ai = AtsClientService.get().getCache().getAtsObject(art.getId());
+ if (ai != null) {
+ aiIds.add(ai.getIdString());
Collection<Artifact> childArts = art.getChildren();
- if (!aia.getChildrenActionableItems().isEmpty()) {
- getActionableItemGuidsWithRecurse(aiaGuids, childArts);
+ if (!ai.getChildrenActionableItems().isEmpty()) {
+ getActionableItemIdsWithRecurse(aiIds, childArts);
}
}
}
}
- return aiaGuids;
+ return aiIds;
}
private IStatus checkTeamDefinitions(boolean isAtsAdmin, Collection<Artifact> artifacts) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/ai/ActionableItemManager.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/ai/ActionableItemManager.java
index 88ba56fb36..ac40e8aaf6 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/ai/ActionableItemManager.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/ai/ActionableItemManager.java
@@ -25,7 +25,6 @@ import org.eclipse.osee.ats.api.util.IAtsStoreService;
import org.eclipse.osee.ats.api.workdef.IAttributeResolver;
import org.eclipse.osee.ats.core.config.ActionableItems;
import org.eclipse.osee.ats.core.util.AtsObjects;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
import org.eclipse.osee.framework.core.util.Result;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -49,11 +48,11 @@ public class ActionableItemManager implements IAtsActionableItemService {
public Set<IAtsActionableItem> getActionableItems(IAtsObject atsObject) throws OseeCoreException {
Set<IAtsActionableItem> ais = new HashSet<>();
if (!atsStoreService.isDeleted(atsObject)) {
- for (String guid : getActionableItemGuids(atsObject)) {
- IAtsActionableItem aia = services.getConfigItem(guid);
+ for (String id : getActionableItemIds(atsObject)) {
+ IAtsActionableItem aia = services.getConfigItem(id);
if (aia == null) {
OseeLog.logf(ActionableItemManager.class, Level.SEVERE,
- "Actionable Item Guid [%s] from [%s] doesn't match item in AtsConfigCache", guid,
+ "Actionable Item Guid [%s] from [%s] doesn't match item in AtsConfigCache", id,
atsObject.toStringWithId());
} else {
ais.add(aia);
@@ -69,22 +68,20 @@ public class ActionableItemManager implements IAtsActionableItemService {
}
@Override
- public Collection<String> getActionableItemGuids(IAtsObject atsObject) throws OseeCoreException {
- return attrResolver.getAttributesToStringList(atsObject, AtsAttributeTypes.ActionableItem);
+ public Collection<String> getActionableItemIds(IAtsObject atsObject) throws OseeCoreException {
+ return attrResolver.getAttributesToStringList(atsObject, AtsAttributeTypes.ActionableItemReference);
}
@Override
public void addActionableItem(IAtsObject atsObject, IAtsActionableItem aia, IAtsChangeSet changes) throws OseeCoreException {
- String guid = AtsUtilCore.getGuid(aia);
- if (!getActionableItemGuids(atsObject).contains(guid)) {
- changes.addAttribute(atsObject, AtsAttributeTypes.ActionableItem, guid);
+ if (!getActionableItemIds(atsObject).contains(atsObject.getId())) {
+ changes.addAttribute(atsObject, AtsAttributeTypes.ActionableItemReference, aia.getStoreObject());
}
}
@Override
public void removeActionableItem(IAtsObject atsObject, IAtsActionableItem aia, IAtsChangeSet changes) throws OseeCoreException {
- String guid = AtsUtilCore.getGuid(aia);
- changes.deleteAttribute(atsObject, AtsAttributeTypes.ActionableItem, guid);
+ changes.deleteAttribute(atsObject, AtsAttributeTypes.ActionableItemReference, aia.getIdString());
}
@Override
@@ -110,7 +107,7 @@ public class ActionableItemManager implements IAtsActionableItemService {
@Override
public boolean hasActionableItems(IAtsObject atsObject) {
- return attrResolver.getAttributeCount(atsObject, AtsAttributeTypes.ActionableItem) > 0;
+ return attrResolver.getAttributeCount(atsObject, AtsAttributeTypes.ActionableItemReference) > 0;
}
@Override
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java
index 00b91b0d07..a5cde45c2a 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java
@@ -40,7 +40,6 @@ import org.eclipse.osee.ats.api.workflow.IAtsTask;
import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
import org.eclipse.osee.ats.api.workflow.WorkItemType;
import org.eclipse.osee.ats.core.util.AtsObjects;
-import org.eclipse.osee.ats.core.util.AtsUtilCore;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.AttributeTypeId;
@@ -48,7 +47,6 @@ import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.RelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.QueryOption;
-import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
import org.eclipse.osee.framework.jdk.core.type.ResultSets;
@@ -716,31 +714,6 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery {
return this;
}
- private List<String> getGuidsFromUuids(Collection<Long> uuids) {
- new LinkedList<>();
- List<String> guids = new LinkedList<>();
- for (Long uuid : uuids) {
- guids.add(getGuidFromUuid(uuid));
- }
- return guids;
- }
-
- private String getGuidFromUuid(Long uuid) {
- String guid = AtsUtilCore.getGuid(uuid);
- if (!Strings.isValid(guid)) {
- guid = AtsUtilCore.getGuid(uuid);
- if (!Strings.isValid(guid)) {
- ArtifactId artifact = services.getArtifact(uuid);
- if (artifact != null) {
- guid = artifact.getGuid();
- } else {
- throw new OseeArgumentException("No artifact found with uuid %d", uuid);
- }
- }
- }
- return guid;
- }
-
private void getBaseSearchCriteria(Collection<IArtifactType> artTypes, boolean withUuids, Set<IArtifactType> allArtTypes) {
createQueryBuilder();
@@ -804,8 +777,8 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery {
private void addAiCriteria() {
if (isActionableItemSpecified()) {
- List<String> guids = getGuidsFromUuids(aiUuids);
- queryAnd(AtsAttributeTypes.ActionableItem, guids);
+ List<String> ids = AtsObjects.toUuidStringsFromLong(aiUuids);
+ queryAnd(AtsAttributeTypes.ActionableItemReference, ids);
}
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AbstractReview.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AbstractReview.java
index ea15fba8ef..133d39448c 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AbstractReview.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AbstractReview.java
@@ -34,10 +34,10 @@ public abstract class AbstractReview extends WorkItem implements IAtsAbstractRev
@Override
public Set<IAtsActionableItem> getActionableItems() throws OseeCoreException {
Set<IAtsActionableItem> ais = new HashSet<>();
- for (Object aiGuidObj : services.getAttributeResolver().getAttributeValues(artifact,
- AtsAttributeTypes.ActionableItem)) {
- String aiGuid = (String) aiGuidObj;
- ArtifactId aiArt = services.getArtifactByGuid(aiGuid);
+ for (Object aiObject : services.getAttributeResolver().getAttributeValues(artifact,
+ AtsAttributeTypes.ActionableItemReference)) {
+ String aiId = (String) aiObject;
+ ArtifactId aiArt = services.getConfigItem(Long.valueOf(aiId));
IAtsActionableItem ai = services.getConfigItemFactory().getActionableItem(aiArt);
ais.add(ai);
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AtsReviewServiceImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AtsReviewServiceImpl.java
index f26dc8daa8..9b1031d95f 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AtsReviewServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AtsReviewServiceImpl.java
@@ -245,7 +245,7 @@ public class AtsReviewServiceImpl implements IAtsReviewService {
@Override
public boolean isStandAloneReview(IAtsAbstractReview review) {
- return services.getAttributeResolver().getAttributeCount(review, AtsAttributeTypes.ActionableItem) > 0;
+ return services.getAttributeResolver().getAttributeCount(review, AtsAttributeTypes.ActionableItemReference) > 0;
}
@Override
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
index 4580f4eeb9..39ca663b90 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/util/AtsCoreServiceImpl.java
@@ -74,6 +74,7 @@ import org.eclipse.osee.framework.jdk.core.type.ItemDoesNotExist;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
+import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.jdbc.JdbcService;
@@ -225,12 +226,23 @@ public abstract class AtsCoreServiceImpl implements IAtsServices {
@SuppressWarnings("unchecked")
@Override
- public <T> T getConfigItem(String guid) {
- T atsObject = getCache().getAtsObjectByGuid(guid);
- if (atsObject == null) {
- ArtifactId artifact = getArtifactByGuid(guid);
- if (artifact != null && artifact instanceof IAtsConfigObject) {
- atsObject = (T) getConfigItemFactory().getConfigObject(artifact);
+ public <T> T getConfigItem(String id) {
+ T atsObject = null;
+ if (GUID.isValid(id)) {
+ atsObject = getCache().getAtsObjectByGuid(id);
+ if (atsObject == null) {
+ ArtifactId artifact = getArtifactByGuid(id);
+ if (artifact != null && artifact instanceof IAtsConfigObject) {
+ atsObject = (T) getConfigItemFactory().getConfigObject(artifact);
+ }
+ }
+ } else if (Strings.isNumeric(id)) {
+ atsObject = getCache().getAtsObject(Long.valueOf(id));
+ if (atsObject == null) {
+ ArtifactId artifact = getArtifact(Long.valueOf(id));
+ if (artifact != null && artifact instanceof IAtsConfigObject) {
+ atsObject = (T) getConfigItemFactory().getConfigObject(artifact);
+ }
}
}
return atsObject;
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/TeamWorkflow.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/TeamWorkflow.java
index 391635425f..d657398c85 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/TeamWorkflow.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/TeamWorkflow.java
@@ -34,12 +34,12 @@ public class TeamWorkflow extends WorkItem implements IAtsTeamWorkflow {
@Override
public Set<IAtsActionableItem> getActionableItems() throws OseeCoreException {
Set<IAtsActionableItem> ais = new HashSet<>();
- for (Object aiGuidObj : services.getAttributeResolver().getAttributeValues(artifact,
- AtsAttributeTypes.ActionableItem)) {
- String aiGuid = (String) aiGuidObj;
- IAtsActionableItem ai = services.getConfigItem(aiGuid);
+ for (Object aiObj : services.getAttributeResolver().getAttributeValues(artifact,
+ AtsAttributeTypes.ActionableItemReference)) {
+ String aiId = (String) aiObj;
+ IAtsActionableItem ai = services.getConfigItem(aiId);
if (ai == null) {
- ArtifactId aiArt = services.getArtifactByGuid(aiGuid);
+ ArtifactId aiArt = services.getArtifact(Long.valueOf(aiId));
ai = services.getConfigItemFactory().getActionableItem(aiArt);
}
ais.add(ai);
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertAtsConfigGuidAttributesOperation.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertAtsConfigGuidAttributesOperation.java
index c41bfd1c15..f9931798d5 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertAtsConfigGuidAttributesOperation.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/ConvertAtsConfigGuidAttributesOperation.java
@@ -38,6 +38,8 @@ public class ConvertAtsConfigGuidAttributesOperation {
private final IAtsServices services;
private final AttributeTypeToken TeamDefinition =
AtsAttributeTypes.createType(1152921504606847201L, "Team Definition");
+ private final AttributeTypeToken ActionableItem = AtsAttributeTypes.createType(1152921504606847200L,
+ "Actionable Item", "Actionable Items that are impacted by this change.");
public ConvertAtsConfigGuidAttributesOperation(IAtsServices services) {
this.services = services;
@@ -101,7 +103,7 @@ public class ConvertAtsConfigGuidAttributesOperation {
}
List<Long> neededAiRefIds = new LinkedList<>();
- for (IAttribute<?> attr : services.getAttributeResolver().getAttributes(art, AtsAttributeTypes.ActionableItem)) {
+ for (IAttribute<?> attr : services.getAttributeResolver().getAttributes(art, ActionableItem)) {
String aiArtGuid = (String) attr.getValue();
IAtsActionableItem ai = services.getConfigItem(aiArtGuid);
neededAiRefIds.add(ai.getId());
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java
index e07b290723..e9217042c3 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/ActionPage.java
@@ -157,8 +157,8 @@ public class ActionPage {
StringBuilder sb = new StringBuilder();
ArtifactReadable teamWf = getParentTeamWf(action);
if (teamWf != null) {
- for (AttributeReadable<Object> aiGuid : teamWf.getAttributes(AtsAttributeTypes.ActionableItem)) {
- sb.append(atsServer.getArtifactByGuid(aiGuid.toString()).getName());
+ for (AttributeReadable<Object> aiId : teamWf.getAttributes(AtsAttributeTypes.ActionableItemReference)) {
+ sb.append(atsServer.getArtifact(Long.valueOf((String) aiId.getValue())));
sb.append(", ");
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsAttributeXWidgetProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsAttributeXWidgetProvider.java
index c6bdbad409..06a4dc4123 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsAttributeXWidgetProvider.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/AtsAttributeXWidgetProvider.java
@@ -34,7 +34,7 @@ public class AtsAttributeXWidgetProvider extends DefaultAttributeXWidgetProvider
XFLAT_ATTRIBUTE_TYPES.add(CoreAttributeTypes.WorkTransition);
XFLAT_ATTRIBUTE_TYPES.add(CoreAttributeTypes.WorkData);
XFLAT_ATTRIBUTE_TYPES.add(AtsAttributeTypes.State);
- XFLAT_ATTRIBUTE_TYPES.add(AtsAttributeTypes.ActionableItem);
+ XFLAT_ATTRIBUTE_TYPES.add(AtsAttributeTypes.ActionableItemReference);
}
@Override

Back to the top