Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2021-01-21 01:17:07 +0000
committerDonald Dunne2021-01-21 20:07:15 +0000
commitc50805d3d4b9efcefa7a2f1ac00af641603a4aee (patch)
tree756350eab6fe450ccacfeb635b79d98ab1f05bf5
parent61b95493b01912af1e9288eeaf68dda636ee5fc7 (diff)
downloadorg.eclipse.osee-c50805d3d4b9efcefa7a2f1ac00af641603a4aee.tar.gz
org.eclipse.osee-c50805d3d4b9efcefa7a2f1ac00af641603a4aee.tar.xz
org.eclipse.osee-c50805d3d4b9efcefa7a2f1ac00af641603a4aee.zip
bug[TW18640]: Decision Reviews show numeric values instead of Yes-No
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AtsWorkItemServiceImpl.java2
-rw-r--r--plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/AtsWorkItemServiceClientImpl.java16
-rw-r--r--plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/IAtsWorkItemServiceIde.java2
3 files changed, 9 insertions, 11 deletions
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AtsWorkItemServiceImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AtsWorkItemServiceImpl.java
index 95dfd2f9df6..28269218c6d 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AtsWorkItemServiceImpl.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AtsWorkItemServiceImpl.java
@@ -82,7 +82,7 @@ public class AtsWorkItemServiceImpl implements IAtsWorkItemService {
private final ITeamWorkflowProvidersLazy teamWorkflowProvidersLazy;
protected final AtsApi atsApi;
private static final String CANCEL_HYPERLINK_URL_CONFIG_KEY = "CancelHyperlinkUrl";
- private static Set<IAtsWorkItemHook> workflowHooks = new HashSet<>();
+ protected static Set<IAtsWorkItemHook> workflowHooks = new HashSet<>();
private static Set<IAtsTransitionHook> transitionHooks = new HashSet<>();
@Override
diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/AtsWorkItemServiceClientImpl.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/AtsWorkItemServiceClientImpl.java
index d985b57f090..f36c3f339cb 100644
--- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/AtsWorkItemServiceClientImpl.java
+++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/AtsWorkItemServiceClientImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.osee.ats.api.util.AtsTopicEvent;
import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition;
import org.eclipse.osee.ats.api.workdef.StateType;
import org.eclipse.osee.ats.api.workflow.ITeamWorkflowProvidersLazy;
+import org.eclipse.osee.ats.api.workflow.hooks.IAtsWorkItemHook;
import org.eclipse.osee.ats.api.workflow.transition.ITransitionHelper;
import org.eclipse.osee.ats.api.workflow.transition.TransitionData;
import org.eclipse.osee.ats.api.workflow.transition.TransitionResults;
@@ -41,20 +42,19 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
*/
public class AtsWorkItemServiceClientImpl extends AtsWorkItemServiceImpl implements IAtsWorkItemServiceIde {
- private static Set<IAtsWorkItemHookIde> workflowHooksIde = new HashSet<>();
-
- @Override
- public void addWorkItemHookIde(IAtsWorkItemHookIde hook) {
- workflowHooksIde.add(hook);
- }
-
public AtsWorkItemServiceClientImpl(AtsApi atsApi, ITeamWorkflowProvidersLazy teamWorkflowProvidersLazy) {
super(atsApi, teamWorkflowProvidersLazy);
}
@Override
public Set<IAtsWorkItemHookIde> getWorkItemHooksIde() {
- return workflowHooksIde;
+ Set<IAtsWorkItemHookIde> hooks = new HashSet<>();
+ for (IAtsWorkItemHook hook : workflowHooks) {
+ if (hook instanceof IAtsWorkItemHookIde) {
+ hooks.add((IAtsWorkItemHookIde) hook);
+ }
+ }
+ return hooks;
}
@Override
diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/IAtsWorkItemServiceIde.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/IAtsWorkItemServiceIde.java
index 032cbcbd133..81c0786a9d6 100644
--- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/IAtsWorkItemServiceIde.java
+++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/workflow/IAtsWorkItemServiceIde.java
@@ -21,6 +21,4 @@ public interface IAtsWorkItemServiceIde extends IAtsWorkItemService {
public Set<IAtsWorkItemHookIde> getWorkItemHooksIde();
- void addWorkItemHookIde(IAtsWorkItemHookIde hook);
-
}

Back to the top