summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-03-05 09:30:29 (EST)
committerSven Rottstock2013-03-11 06:39:07 (EDT)
commitc7911ee9d65dfbc799a7e4d3dcc87b573be250a4 (patch)
treeb19770f5f91e22d62e519f5e35f1e2fa9581a710
parent1e4fbeea0897975e6dbb803b89e02192c6391992 (diff)
downloadorg.eclipse.stardust.ui.web-c7911ee9d65dfbc799a7e4d3dcc87b573be250a4.zip
org.eclipse.stardust.ui.web-c7911ee9d65dfbc799a7e4d3dcc87b573be250a4.tar.gz
org.eclipse.stardust.ui.web-c7911ee9d65dfbc799a7e4d3dcc87b573be250a4.tar.bz2
Jira-ID: CRNT-28041
Reverted the changes made for TrafficLight pendingActivityCnt git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@63504 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/legacy/traffic/AggregateActivityColumnItem.java16
-rw-r--r--business-control-center/src/main/java/org/eclipse/stardust/ui/web/bcc/views/TrafficLightViewManagerBean.java13
2 files changed, 3 insertions, 26 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 5e05370..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
@@ -71,8 +71,6 @@ public class AggregateActivityColumnItem implements IColumnItem
private List/* <ActivityInstance> */aInstances = new ArrayList();
private int totalActivityCnt = 0;
-
- private int pendingActivityCnt = 0;
public AggregateActivityColumnItem(String id,String qualifiedId, String name, IRowItem rowItem)
{
@@ -91,16 +89,6 @@ public class AggregateActivityColumnItem implements IColumnItem
{
this.totalActivityCnt = this.totalActivityCnt + 1;
}
-
- public int getPendingActivityCnt()
- {
- return pendingActivityCnt;
- }
-
- public void setPendingActivityCnt(int pendingActivityCnt)
- {
- this.pendingActivityCnt = pendingActivityCnt;
- }
public String getId()
{
@@ -200,10 +188,10 @@ public String getName()
public String getCompletedIcon()
{
String completedIcon = null;
-
+
if ((this.rowItem.getTotalCount().longValue() == this.completed
|| (this.completed > 0 && this.completed == this.totalActivityCnt))
- && this.rowItem.getTotalCount().longValue() != 0 && this.pendingActivityCnt == 0)
+ && 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 e734a29..ec1aa26 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
@@ -274,7 +274,7 @@ public void init()
else if (obj[j] instanceof AggregateActivityColumnItem)
{
aggregateActivityColumnItem = (AggregateActivityColumnItem) obj[j];
-
+
trafficLightDyna.add(new TrafficLightViewDynamicUserObject(aggregateActivityColumnItem.getId(),
aggregateActivityColumnItem.getQualifiedId(), Integer.toString(aggregateActivityColumnItem
.getCompleted()), aggregateActivityColumnItem.getSymbolUrl(), aggregateActivityColumnItem
@@ -479,8 +479,6 @@ public void init()
ActivityInstance aInstance;
IColumnItem columnItem;
Long totalCount;
- //Calcualte the pending activities count for all rows
- int pendingActivityCount = 0;
for (int i = 0; i < rows.size(); i++)
{
@@ -508,10 +506,6 @@ public void init()
columnItem.addCompletedActivity();
columnItem.addActivityInstance(aInstance);
}
- else
- {
- pendingActivityCount+= pendingActivityCount+1;
- }
}
if (value == null && UNDEFINED_ROW_ITEM_ID.equals(categoryValue))
@@ -524,10 +518,6 @@ public void init()
columnItem.addCompletedActivity();
columnItem.addActivityInstance(aInstance);
}
- else
- {
- pendingActivityCount+= pendingActivityCount+1;
- }
}
}
@@ -577,7 +567,6 @@ public void init()
{
AggregateActivityColumnItem aggregateActivity = (AggregateActivityColumnItem) columnItem;
aggregateActivity.addTotalActivityCnt();
- aggregateActivity.setPendingActivityCnt(pendingActivityCount);
}
}