summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-03-04 02:06:19 (EST)
committerSven Rottstock2013-03-11 06:38:36 (EDT)
commit970deb932792eb7feca4c83cafef978345f738dd (patch)
treee0bcc8c0a6f2709d104dd35b068bea4910b5cf3d
parent53901fc6629dbda1dae7e9254c662baf09a6dc8f (diff)
downloadorg.eclipse.stardust.ui.web-970deb932792eb7feca4c83cafef978345f738dd.zip
org.eclipse.stardust.ui.web-970deb932792eb7feca4c83cafef978345f738dd.tar.gz
org.eclipse.stardust.ui.web-970deb932792eb7feca4c83cafef978345f738dd.tar.bz2
Jira-ID: CRNT-28091
Removed the negative value check added for totalCount which as added for handling LONG.MIN_VALUE returned fro worklist query. This will be handled as part of this bug ticket. Made changes to set totatCountThreshold value to 0 when no congifuration is found for threshold. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@63425 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/MyProcessesModel.java2
-rw-r--r--process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/OverviewBean.java6
-rw-r--r--process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/WorklistsTreeUserObject.java2
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ParticipantWorklistCacheManager.java4
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ProcessWorklistCacheManager.java2
5 files changed, 8 insertions, 8 deletions
diff --git a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/MyProcessesModel.java b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/MyProcessesModel.java
index 93b0249..0ca73aa 100644
--- a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/MyProcessesModel.java
+++ b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/MyProcessesModel.java
@@ -62,7 +62,7 @@ public class MyProcessesModel
{
Long totalCount = ProcessWorklistCacheManager.getInstance().getWorklistCount(processDefinition);
Long totalCountThreshold = ProcessWorklistCacheManager.getInstance().getWorklistCountThreshold(processDefinition);
- if (totalCount < Long.MAX_VALUE && totalCount > -1)
+ if (totalCount < Long.MAX_VALUE)
return totalCount.toString();
else
return MessagesViewsCommonBean.getInstance().getParamString("common.notification.worklistCountThreshold",
diff --git a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/OverviewBean.java b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/OverviewBean.java
index 30968e7..fd2b98e 100644
--- a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/OverviewBean.java
+++ b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/OverviewBean.java
@@ -242,7 +242,7 @@ public class OverviewBean extends AbstractLaunchPanel implements InitializingBea
{
Long totalCount = SpecialWorklistCacheManager.getInstance().getWorklistCount(SpecialWorklistCacheManager.ALL_ACTVITIES);
Long totalCountThreshold = SpecialWorklistCacheManager.getInstance().getWorklistCountThreshold(SpecialWorklistCacheManager.ALL_ACTVITIES);
- if(totalCount < Long.MAX_VALUE && totalCount > -1)
+ if (totalCount < Long.MAX_VALUE)
return totalCount.toString();
else
return MessagesViewsCommonBean.getInstance().getParamString("common.notification.worklistCountThreshold",
@@ -253,7 +253,7 @@ public class OverviewBean extends AbstractLaunchPanel implements InitializingBea
{
Long totalCount = SpecialWorklistCacheManager.getInstance().getWorklistCount(SpecialWorklistCacheManager.CRITICAL_ACTVITIES);
Long totalCountThreshold = SpecialWorklistCacheManager.getInstance().getWorklistCountThreshold(SpecialWorklistCacheManager.CRITICAL_ACTVITIES);
- if(totalCount < Long.MAX_VALUE && totalCount > -1)
+ if (totalCount < Long.MAX_VALUE)
return totalCount.toString();
else
return MessagesViewsCommonBean.getInstance().getParamString("common.notification.worklistCountThreshold",
@@ -306,7 +306,7 @@ public class OverviewBean extends AbstractLaunchPanel implements InitializingBea
SessionContext.findSessionContext().getUser());
Long totalCountThreshold = ParticipantWorklistCacheManager.getInstance().getWorklistCountThreshold(
SessionContext.findSessionContext().getUser());
- if(totalCount < Long.MAX_VALUE && totalCount > -1)
+ if (totalCount < Long.MAX_VALUE)
return totalCount.toString();
else
return MessagesViewsCommonBean.getInstance().getParamString("common.notification.worklistCountThreshold",
diff --git a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/WorklistsTreeUserObject.java b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/WorklistsTreeUserObject.java
index bbe3fb4..5378830 100644
--- a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/WorklistsTreeUserObject.java
+++ b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/launchpad/WorklistsTreeUserObject.java
@@ -107,7 +107,7 @@ public class WorklistsTreeUserObject extends IceUserObject
Long totalCount = ParticipantWorklistCacheManager.getInstance().getWorklistCount(participantInfo);
Long totalCountThreshold = ParticipantWorklistCacheManager.getInstance().getWorklistCountThreshold(
participantInfo);
- if (totalCount < Long.MAX_VALUE && totalCount > -1)
+ if (totalCount < Long.MAX_VALUE)
return totalCount.toString();
else
return MessagesViewsCommonBean.getInstance().getParamString("common.notification.worklistCountThreshold",
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ParticipantWorklistCacheManager.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ParticipantWorklistCacheManager.java
index 6648e82..df762b8 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ParticipantWorklistCacheManager.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ParticipantWorklistCacheManager.java
@@ -111,8 +111,8 @@ public class ParticipantWorklistCacheManager implements InitializingBean, Serial
{
return cacheEntry.getTotalCountThreshold();
}
-
- return Long.MAX_VALUE;
+
+ return 0;
}
/**
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ProcessWorklistCacheManager.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ProcessWorklistCacheManager.java
index c3b2ce0..38b964a 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ProcessWorklistCacheManager.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/utils/ProcessWorklistCacheManager.java
@@ -124,7 +124,7 @@ public class ProcessWorklistCacheManager implements InitializingBean
return processWorklistCacheEntry.getTotalCountThreshold();
}
- return Long.MAX_VALUE;
+ return 0;
}
/**