bug: Release Date column causes Stack Overflow

Change-Id: I99ed12c87e5c88240687b9ccafa68002e10831f8

5 files changed, 15 insertions, 17 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AbstractNumericTotalColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AbstractNumericTotalColumn.java
index e72a1a27979..563aea633a2 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AbstractNumericTotalColumn.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AbstractNumericTotalColumn.java
@@ -52,9 +52,6 @@ public abstract class AbstractNumericTotalColumn extends XViewerAtsColumn implem
 
    @Override
    public String getColumnText(Object element, XViewerColumn column, int columnIndex) {
-      if (element instanceof IAtsWorkItem) {
-         return getColumnText(((IAtsWorkItem) element).getStoreObject(), column, columnIndex);
-      }
       if (element instanceof AbstractWorkflowArtifact) {
          try {
             Result result = isPointsNumericValid(element);
@@ -65,6 +62,8 @@ public abstract class AbstractNumericTotalColumn extends XViewerAtsColumn implem
          } catch (OseeCoreException ex) {
             LogUtil.getCellExceptionString(ex);
          }
+      } else if (element instanceof IAtsWorkItem) {
+         return getColumnText(((IAtsWorkItem) element).getStoreObject(), column, columnIndex);
       }
       return "";
    }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AbstractWorkflowVersionDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AbstractWorkflowVersionDateColumn.java
index d51c431bac9..3c3589f9637 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AbstractWorkflowVersionDateColumn.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/AbstractWorkflowVersionDateColumn.java
@@ -47,9 +47,7 @@ public abstract class AbstractWorkflowVersionDateColumn extends XViewerAtsAttrib
    @Override
    public String getColumnText(Object element, XViewerColumn column, int columnIndex) {
       try {
-         if (element instanceof IAtsWorkItem) {
-            return getColumnText(((IAtsWorkItem) element).getStoreObject(), column, columnIndex);
-         } else if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) {
+         if (Artifacts.isOfType(element, AtsArtifactTypes.Action)) {
             Set<String> strs = new HashSet<>();
             for (IAtsTeamWorkflow team : AtsClientService.get().getWorkItemService().getTeams(element)) {
                String str = getColumnText(team, column, columnIndex);
@@ -61,6 +59,8 @@ public abstract class AbstractWorkflowVersionDateColumn extends XViewerAtsAttrib
 
          } else if (element instanceof AbstractWorkflowArtifact) {
             return getDateStr(getAttributeType(), (AbstractWorkflowArtifact) element);
+         } else if (element instanceof IAtsWorkItem) {
+            return getColumnText(((IAtsWorkItem) element).getStoreObject(), column, columnIndex);
          }
       } catch (Exception ex) {
          return LogUtil.getCellExceptionString(ex);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemOwner.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemOwner.java
index 0287e8df7bb..1313c3a0669 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemOwner.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemOwner.java
@@ -70,15 +70,11 @@ public class ActionableItemOwner extends XViewerAtsColumn implements IXViewerVal
 
    public static Set<User> getActionableItemOwners(Object element) throws OseeCoreException {
       Set<User> users = new HashSet<>();
-      if (element instanceof IAtsWorkItem) {
-         return getActionableItemOwners(((IAtsWorkItem) element).getStoreObject());
-      }
       if (element instanceof ActionArtifact) {
          for (TeamWorkFlowArtifact teamArt : ((ActionArtifact) element).getTeams()) {
             users.addAll(getActionableItemOwners(teamArt));
          }
-      }
-      if (element instanceof AbstractWorkflowArtifact) {
+      } else if (element instanceof AbstractWorkflowArtifact) {
          TeamWorkFlowArtifact teamArt = ((AbstractWorkflowArtifact) element).getParentTeamWorkflow();
          if (teamArt != null) {
             for (IAtsActionableItem aia : AtsClientService.get().getWorkItemService().getActionableItemService().getActionableItems(
@@ -87,6 +83,8 @@ public class ActionableItemOwner extends XViewerAtsColumn implements IXViewerVal
                   AtsRelationTypes.ActionableItem_User, User.class));
             }
          }
+      } else if (element instanceof IAtsWorkItem) {
+         return getActionableItemOwners(((IAtsWorkItem) element).getStoreObject());
       }
       return users;
    }
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 1fa1a9e741a..0c1644ad8a3 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
@@ -76,9 +76,7 @@ public class AnnualCostAvoidanceColumn extends XViewerAtsColumn implements IXVie
    }
 
    public static double getWorldViewAnnualCostAvoidance(Object object) throws OseeCoreException {
-      if (object instanceof IAtsWorkItem) {
-         return getWorldViewAnnualCostAvoidance(((IAtsWorkItem) object).getStoreObject());
-      } else if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) {
+      if (Artifacts.isOfType(object, AtsArtifactTypes.Action)) {
          double hours = 0;
          // Add up hours for all children
          for (IAtsTeamWorkflow team : AtsClientService.get().getWorkItemService().getTeams(object)) {
@@ -92,6 +90,8 @@ public class AnnualCostAvoidanceColumn extends XViewerAtsColumn implements IXVie
          double benefit = teamArt.getWorldViewWeeklyBenefit();
          double remainHrs = teamArt.getRemainHoursTotal();
          return benefit * 52 - remainHrs;
+      } else if (object instanceof IAtsWorkItem) {
+         return getWorldViewAnnualCostAvoidance(((IAtsWorkItem) object).getStoreObject());
       }
       return 0;
    }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/BranchStatusColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/BranchStatusColumn.java
index 27c768e4ea3..a84394b9cc0 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/BranchStatusColumn.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/BranchStatusColumn.java
@@ -18,6 +18,7 @@ import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
 import org.eclipse.osee.ats.api.IAtsWorkItem;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
+import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.internal.AtsClientService;
 import org.eclipse.osee.ats.util.xviewer.column.XViewerAtsColumn;
 import org.eclipse.osee.ats.world.WorldXViewerFactory;
@@ -57,11 +58,11 @@ public class BranchStatusColumn extends XViewerAtsColumn implements IAtsXViewerP
       for (Object element : objects) {
          Long key = getKey(element);
          try {
-            if (element instanceof IAtsWorkItem) {
-               populateCachedValues(Arrays.asList(((IAtsWorkItem) element).getStoreObject()), preComputedValueMap);
-            } else if (Artifacts.isOfType(element, AtsArtifactTypes.TeamWorkflow)) {
+            if (Artifacts.isOfType(element, AtsArtifactTypes.TeamWorkflow)) {
                String status = getBranchStatus((IAtsTeamWorkflow) element);
                preComputedValueMap.put(key, status);
+            } else if (!(element instanceof AbstractWorkflowArtifact) && element instanceof IAtsWorkItem) {
+               populateCachedValues(Arrays.asList(((IAtsWorkItem) element).getStoreObject()), preComputedValueMap);
             } else {
                preComputedValueMap.put(key, "");
             }