394707: Disable participant do not show when LDAP is not configured
Change-Id: I217ded46beb8d063c8c577f9b7269aab5f022df0
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=394707
Signed-off-by: sdubois <sebastien.dubois@ericsson.com>
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipant.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipant.java
index c06456c..8dc9c3d 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipant.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipant.java
@@ -439,7 +439,7 @@
* @param parentReview
*/
private int reviewerRoleSize(R4EUIReviewBasic aReview, R4EUserRole aRole) {
- List<R4EParticipant> participants = aReview.getParticipants();
+ List<R4EParticipant> participants = aReview.getParticipants(false);
if (participants == null) {
return 0;
}
@@ -448,13 +448,11 @@
int roleCount = 0;
for (R4EParticipant participant : participants) {
//Don't consider disabled participants within the count
- if (participant.isEnabled()) {
- EList<R4EUserRole> roles = participant.getRoles();
- for (R4EUserRole role : roles) {
- if (role.equals(aRole)) {
- roleCount++;
- break;
- }
+ EList<R4EUserRole> roles = participant.getRoles();
+ for (R4EUserRole role : roles) {
+ if (role.equals(aRole)) {
+ roleCount++;
+ break;
}
}
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipantContainer.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipantContainer.java
index 3dc03df..078d17c 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipantContainer.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipantContainer.java
@@ -198,7 +198,7 @@
*/
@Override
public void open() {
- final List<R4EParticipant> participants = ((R4EUIReviewBasic) getParent()).getParticipants();
+ final List<R4EParticipant> participants = ((R4EUIReviewBasic) getParent()).getParticipants(true);
if (null != participants) {
final int participantsSize = participants.size();
for (int i = 0; i < participantsSize; i++) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewBasic.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewBasic.java
index 46fbf42..e6a25cf 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewBasic.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewBasic.java
@@ -485,17 +485,21 @@
/**
* Method getParticipants.
- *
+ * @param aIncludeDisabled - boolean
* @return List<R4EParticipant>
*/
- public List<R4EParticipant> getParticipants() {
+ public List<R4EParticipant> getParticipants(boolean aIncludeDisabled) {
final Object[] users = fReview.getUsersMap().values().toArray();
//Cast list to R4EParticipants
final List<R4EParticipant> participants = new ArrayList<R4EParticipant>();
for (Object user : users) {
- if (((R4EParticipant) user).isEnabled()) {
+ if (aIncludeDisabled) {
participants.add((R4EParticipant) user);
+ } else {
+ if (((R4EParticipant) user).isEnabled()) {
+ participants.add((R4EParticipant) user);
+ }
}
}
return participants;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/ReviewDecisionProperties.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/ReviewDecisionProperties.java
index ac32999..4617afa 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/ReviewDecisionProperties.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/ReviewDecisionProperties.java
@@ -133,7 +133,7 @@
if (REVIEW_DECISION_MEETING_ID.equals(aId)) {
return new ReviewMeetingProperties(getElement());
} else if (REVIEW_DECISION_PARTICIPANTS_ID.equals(aId)) {
- final List<R4EParticipant> participants = ((R4EUIReviewBasic) getElement()).getParticipants();
+ final List<R4EParticipant> participants = ((R4EUIReviewBasic) getElement()).getParticipants(false);
final List<String> decisionParticipantIds = new ArrayList<String>();
for (R4EParticipant participant : participants) {
if (participant.isIsPartOfDecision()) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewTabPropertySection.java
index 603d50b..c4fae70 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewTabPropertySection.java
@@ -1303,7 +1303,7 @@
final R4EUIReviewExtended uiExtendedReview = (R4EUIReviewExtended) fProperties.getElement();
final R4EFormalReview modelFormalReview = (R4EFormalReview) uiReview.getReview();
- final List<R4EParticipant> participants = uiExtendedReview.getParticipants();
+ final List<R4EParticipant> participants = uiExtendedReview.getParticipants(false);
item = null;
final int numParticipants = participants.size();
fDecisionUsersList.removeAll();
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/MailServicesProxy.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/MailServicesProxy.java
index e1bbf7c..5cc285d 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/MailServicesProxy.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/MailServicesProxy.java
@@ -401,7 +401,7 @@
*/
private static String[] createItemsUpdatedDestinations() {
final ArrayList<String> destinations = new ArrayList<String>();
- final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants();
+ final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants(false);
for (R4EParticipant participant : participants) {
if (isEmailValid(participant)) {
//All active participants should receive this email
@@ -418,7 +418,7 @@
*/
private static String[] createProgressDestinations() {
final ArrayList<String> destinations = new ArrayList<String>();
- final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants();
+ final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants(false);
for (R4EParticipant participant : participants) {
if (isEmailValid(participant)) {
if (!(R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL))) {
@@ -443,7 +443,7 @@
*/
private static String[] createQuestionDestinations() {
final ArrayList<String> destinations = new ArrayList<String>();
- final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants();
+ final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants(false);
for (R4EParticipant participant : participants) {
if (isEmailValid(participant)) {
if (!(R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL))) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/UIUtils.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/UIUtils.java
index 52d1f9c..d160c8b 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/UIUtils.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/UIUtils.java
@@ -616,7 +616,7 @@
if (null == R4EUIModelController.getActiveReview()) {
return 0;
}
- final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants();
+ final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants(false);
final int numParticipants = participants.size();
int index = 0;
for (int i = 0; i < numParticipants; i++) {
