Jira-ID: CRNT-24044

1)Added totalActivityCnt variable and method to increment the same in AggregateActivityColumnItem.java which will store the total Activity Count for Activity Instance
2)Added code to call the addTotalActivityCnt() from TrafficLightViewManagerBean.java

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@55425 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

2 files changed, 25 insertions, 1 deletions

diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/legacy/traffic/AggregateActivityColumnItem.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/legacy/traffic/AggregateActivityColumnItem.java
index c3199ff..36a6a2c 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/legacy/traffic/AggregateActivityColumnItem.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/legacy/traffic/AggregateActivityColumnItem.java
@@ -69,6 +69,8 @@ public class AggregateActivityColumnItem implements IColumnItem
    private IRowItem rowItem;

 

    private List/* <ActivityInstance> */aInstances = new ArrayList();

+   

+   private int totalActivityCnt = 0;

 

    public AggregateActivityColumnItem(String id,String qualifiedId, String name, IRowItem rowItem)

    {

@@ -82,6 +84,11 @@ public class AggregateActivityColumnItem implements IColumnItem
    {

       this.completed = this.completed + 1;

    }

+   

+   public void addTotalActivityCnt()

+   {

+      this.totalActivityCnt = this.totalActivityCnt + 1;

+   }

 

    public String getId()

    {

@@ -118,6 +125,16 @@ public String getName()
       this.completed = completed;

    }

 

+   public int getTotalActivityCnt()

+   {

+      return totalActivityCnt;

+   }

+

+   public void setTotalActivityCnt(int totalActivityCnt)

+   {

+      this.totalActivityCnt = totalActivityCnt;

+   }

+

    /**

     * The method calculates the color coded status of the underlying table cell. The logic

     * which determines the state is externalized into an implementation of the interface

@@ -172,7 +189,8 @@ public String getName()
    {

       String completedIcon = null;

 

-      if (this.rowItem.getTotalCount().longValue() == this.completed

+      if ((this.rowItem.getTotalCount().longValue() == this.completed

+            || (this.completed > 0 && this.completed == this.totalActivityCnt))

             && this.rowItem.getTotalCount().longValue() != 0)

       {

          completedIcon = TRAFFIC_LIGHT_COMPLETED;

diff --git a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/TrafficLightViewManagerBean.java b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/TrafficLightViewManagerBean.java
index 9ba38e3..e82990b 100644
--- a/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/TrafficLightViewManagerBean.java
+++ b/business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/TrafficLightViewManagerBean.java
@@ -518,6 +518,7 @@ public void init()
                      columnItem.addCompletedActivity();

                      columnItem.addActivityInstance(aInstance);

                   }

+                  

                }

             }

          }

@@ -562,6 +563,11 @@ public void init()
                columnItem.addCompletedActivity();

                columnItem.addActivityInstance(aInstance);

             }

+            if (columnItem != null)

+            {

+               AggregateActivityColumnItem aggregateActivity = (AggregateActivityColumnItem) columnItem;

+               aggregateActivity.addTotalActivityCnt();

+            }

          }

 

          totalRowItem.setActivePIs(totalPIs);