463022: [api] add support for storing usernames on RepositoryPerson

Change-Id: Id565b10626461759e0322bcbbbd37e628e27eafb
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=463022
Signed-off-by: chris.poon <chris.poon@tasktop.com>

4 files changed, 6 insertions, 8 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java
index 30d2cc70f..b1aef49f3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java
@@ -77,7 +77,7 @@ public class AttachmentTableLabelProvider extends ColumnLabelProvider {
 	 * @return author image
 	 */
 	protected Image getAuthorImage(IRepositoryPerson person, TaskRepository repository) {
-		if (repository != null && person != null && person.getPersonId().equals(repository.getUserName())) {
+		if (repository != null && person != null && person.matchesUsername(repository.getUserName())) {
 			return imageManager.getImage(CommonImages.PERSON_ME);
 		} else {
 			return imageManager.getImage(CommonImages.PERSON);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CommentGroupStrategy.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CommentGroupStrategy.java
index cc5742169..92284ea25 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CommentGroupStrategy.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CommentGroupStrategy.java
@@ -154,7 +154,7 @@ public class CommentGroupStrategy {
 			// check if last comment was by current user
 			ITaskComment lastComment = current.get(current.size() - 1);
 			IRepositoryPerson lastPerson = lastComment.getAuthor();
-			if (lastPerson != null && lastPerson.getPersonId().equals(currentPersonId)) {
+			if (lastPerson != null && lastPerson.matchesUsername(currentPersonId)) {
 				// bug 238038 comment #58, if the latest comment is generated automatically, look back one comment
 				IRepositoryPerson person = comment.getAuthor();
 				if (person != null && person.getPersonId().equals(currentPersonId) && lastComment.getText() != null
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java
index b82184e96..1a47c7bb4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java
@@ -419,8 +419,7 @@ public class TaskEditorCommentPart extends AbstractTaskEditorPart {
 			formHyperlink.setBackground(null);
 			formHyperlink.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
 			IRepositoryPerson author = taskComment.getAuthor();
-			if (author != null
-					&& author.getPersonId().equalsIgnoreCase(getTaskEditorPage().getTaskRepository().getUserName())) {
+			if (author != null && author.matchesUsername(getTaskEditorPage().getTaskRepository().getUserName())) {
 				formHyperlink.setImage(CommonImages.getImage(CommonImages.PERSON_ME_NARROW));
 			} else {
 				formHyperlink.setImage(CommonImages.getImage(CommonImages.PERSON_NARROW));
@@ -572,8 +571,8 @@ public class TaskEditorCommentPart extends AbstractTaskEditorPart {
 	private boolean hasIncoming;
 
 	/**
-	 * We can't use the reflow flag in AbstractTaskEditorPage because it gets set at various points where we
-	 * might not want to reflow.
+	 * We can't use the reflow flag in AbstractTaskEditorPage because it gets set at various points where we might not
+	 * want to reflow.
 	 */
 	private boolean reflow = true;
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlineNodeLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlineNodeLabelProvider.java
index 07f71ee36..4fa27b17f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlineNodeLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlineNodeLabelProvider.java
@@ -54,8 +54,7 @@ public class TaskEditorOutlineNodeLabelProvider extends LabelProvider {
 						taskRepository = TasksUi.getRepositoryManager().getRepository(connectorKind, repositoryUrl);
 					}
 				}
-				if (taskRepository != null && author != null
-						&& author.getPersonId().equals(taskRepository.getUserName())) {
+				if (taskRepository != null && author != null && author.matchesUsername(taskRepository.getUserName())) {
 					return CommonImages.getImage(CommonImages.PERSON_ME);
 				} else {
 					return CommonImages.getImage(CommonImages.PERSON);