summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-02-25 06:02:28 (EST)
committerSven Rottstock2013-03-11 06:37:45 (EDT)
commit7f7a7f3ea60e3ad0a8cd8f4e49b0e5088a66398d (patch)
treea1956c886e72beadc02db26e47373559e1314791
parentf9858118e41ad5c02947418881e9d5b2ff58ba18 (diff)
downloadorg.eclipse.stardust.ui.web-7f7a7f3ea60e3ad0a8cd8f4e49b0e5088a66398d.zip
org.eclipse.stardust.ui.web-7f7a7f3ea60e3ad0a8cd8f4e49b0e5088a66398d.tar.gz
org.eclipse.stardust.ui.web-7f7a7f3ea60e3ad0a8cd8f4e49b0e5088a66398d.tar.bz2
Jira-ID: CRNT-27829
Removed the check to compare currentUserId with participantInfo id in ModelHelper.getParticipantLabel() git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@63224 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/ModelHelper.java25
1 files changed, 4 insertions, 21 deletions
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/ModelHelper.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/ModelHelper.java
index 7c7c7f6..f8e69ee 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/ModelHelper.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/ModelHelper.java
@@ -23,8 +23,6 @@ import org.eclipse.stardust.engine.api.model.Role;
import org.eclipse.stardust.engine.api.model.RoleInfo;
import org.eclipse.stardust.engine.api.runtime.Department;
import org.eclipse.stardust.engine.api.runtime.DepartmentInfo;
-import org.eclipse.stardust.engine.api.runtime.User;
-import org.eclipse.stardust.ui.web.viewscommon.beans.SessionContext;
import org.eclipse.stardust.ui.web.viewscommon.utils.I18nUtils;
import org.eclipse.stardust.ui.web.viewscommon.utils.ModelUtils;
import org.eclipse.stardust.ui.web.viewscommon.utils.ParticipantUtils;
@@ -50,7 +48,6 @@ public class ModelHelper
public static ParticipantLabel getParticipantLabel(ParticipantInfo participantInfo)
{
ParticipantLabel participantlabel = new ParticipantLabel();
- User loggedInUser = SessionContext.findSessionContext().getUser();
if (participantInfo instanceof ModelParticipantInfo)
{
ModelParticipantInfo modelParticipantInfo = (ModelParticipantInfo) participantInfo;
@@ -80,28 +77,14 @@ public class ModelHelper
}
else
{
- if (participantInfo.getId().equals(loggedInUser.getId()))
- {
- participantlabel.setParticipantName(I18nUtils.getParticipantName(loggedInUser));
- }
- else
- {
- participantlabel.setParticipantName(I18nUtils.getParticipantName(ParticipantUtils
- .getParticipant(participantInfo)));
- }
+ participantlabel.setParticipantName(I18nUtils.getParticipantName(ParticipantUtils
+ .getParticipant(participantInfo)));
}
}
else if (participantInfo instanceof DynamicParticipantInfo)
{
- if (participantInfo.getId().equals(loggedInUser.getId()))
- {
- participantlabel.setParticipantName(I18nUtils.getParticipantName(loggedInUser));
- }
- else
- {
- participantlabel.setParticipantName(I18nUtils.getParticipantName(ParticipantUtils
- .getParticipant(participantInfo)));
- }
+ participantlabel.setParticipantName(I18nUtils.getParticipantName(ParticipantUtils
+ .getParticipant(participantInfo)));
}
return participantlabel;