fix review mapping initialization and add status column to table

Change-Id: I77a2a8dfd53504b11b8ca6deb594bdeced666883

6 files changed, 38 insertions, 41 deletions

diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnector.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnector.java
index d5cd8cd9c..ca6beaf7c 100644
--- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnector.java
+++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnector.java
@@ -58,6 +58,7 @@ import org.eclipse.mylyn.tasks.core.RepositoryStatus;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.core.TaskRepositoryLocationFactory;
 import org.eclipse.mylyn.tasks.core.data.AbstractTaskDataHandler;
+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
 import org.eclipse.mylyn.tasks.core.data.TaskData;
 import org.eclipse.mylyn.tasks.core.data.TaskDataCollector;
 import org.eclipse.mylyn.tasks.core.data.TaskMapper;
@@ -302,8 +303,7 @@ public class GerritConnector extends ReviewsConnector {
 	}
 
 	@Override
-	public void updateRepositoryConfiguration(TaskRepository repository, IProgressMonitor monitor)
-			throws CoreException {
+	public void updateRepositoryConfiguration(TaskRepository repository, IProgressMonitor monitor) throws CoreException {
 		try {
 			getClient(repository).refreshConfig(monitor);
 		} catch (GerritException e) {
@@ -329,13 +329,20 @@ public class GerritConnector extends ReviewsConnector {
 			task.setModificationDate(oldModificationDate);
 		}
 
-		task.setAttribute(ReviewsCoreConstants.CODE_REVIEW,
-				taskData.getRoot().getAttribute(GerritTaskSchema.getDefault().REVIEW_STATE.getKey()).getValue());
-		task.setAttribute(ReviewsCoreConstants.VERIFIED,
-				taskData.getRoot().getAttribute(GerritTaskSchema.getDefault().VERIFY_STATE.getKey()).getValue());
+		setAttribute(task, TaskAttribute.STATUS, taskData.getRoot().getMappedAttribute(TaskAttribute.STATUS));
+		setAttribute(task, ReviewsCoreConstants.CODE_REVIEW,
+				taskData.getRoot().getAttribute(GerritTaskSchema.getDefault().REVIEW_STATE.getKey()));
+		setAttribute(task, ReviewsCoreConstants.VERIFIED,
+				taskData.getRoot().getAttribute(GerritTaskSchema.getDefault().VERIFY_STATE.getKey()));
 		super.updateTaskFromTaskData(taskRepository, task, taskData);
 	}
 
+	private void setAttribute(ITask task, String key, TaskAttribute attribute) {
+		if (attribute != null) {
+			task.setAttribute(key, attribute.getValue());
+		}
+	}
+
 	public GerritSystemInfo validate(TaskRepository repository, IProgressMonitor monitor) throws CoreException {
 		// only allow user prompting in case of Open ID authentication
 		if (!Boolean.parseBoolean(repository.getProperty(GerritConnector.KEY_REPOSITORY_OPEN_ID_ENABLED))) {
@@ -446,8 +453,8 @@ public class GerritConnector extends ReviewsConnector {
 			JSonSupport support = new JSonSupport();
 			return support.toJson(config);
 		} catch (Exception e) {
-			StatusHandler
-					.log(new Status(IStatus.ERROR, GerritCorePlugin.PLUGIN_ID, "Failed to serialize configuration", e)); //$NON-NLS-1$
+			StatusHandler.log(new Status(IStatus.ERROR, GerritCorePlugin.PLUGIN_ID,
+					"Failed to serialize configuration", e)); //$NON-NLS-1$
 			return null;
 		}
 	}
@@ -483,8 +490,7 @@ public class GerritConnector extends ReviewsConnector {
 				return toStatus(repository, qualifier, (Exception) cause);
 			}
 		} else if (e instanceof GerritException && e.getMessage() != null) {
-			return createErrorStatus(repository,
-					NLS.bind("{0}Gerrit connection issue: {1}", qualifier, e.getMessage())); //$NON-NLS-1$
+			return createErrorStatus(repository, NLS.bind("{0}Gerrit connection issue: {1}", qualifier, e.getMessage())); //$NON-NLS-1$
 		}
 		String message = NLS.bind("{0}Unexpected error while connecting to Gerrit: {1}", qualifier, e.getMessage()); //$NON-NLS-1$
 		if (repository != null) {
diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/TaskReviewsMappingsStore.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/TaskReviewsMappingsStore.java
index 06f5fc964..7e25619d9 100644
--- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/TaskReviewsMappingsStore.java
+++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/TaskReviewsMappingsStore.java
@@ -55,7 +55,7 @@ public class TaskReviewsMappingsStore implements ITaskListChangeListener {
 		for (AbstractTask review : taskList.getAllTasks()) {
 			String task = getTaskUrl(review);
 			if (task != null) {
-				taskReviewsMap.put(review.getUrl(), task);
+				taskReviewsMap.put(task, review.getUrl());
 			}
 		}
 	}
diff --git a/org.eclipse.mylyn.reviews.tests/src/org/eclipse/mylyn/reviews/tests/ui/ReviewColumnLabelProviderTest.java b/org.eclipse.mylyn.reviews.tests/src/org/eclipse/mylyn/reviews/tests/ui/ReviewColumnLabelProviderTest.java
index 74e78009d..65e3b01a7 100644
--- a/org.eclipse.mylyn.reviews.tests/src/org/eclipse/mylyn/reviews/tests/ui/ReviewColumnLabelProviderTest.java
+++ b/org.eclipse.mylyn.reviews.tests/src/org/eclipse/mylyn/reviews/tests/ui/ReviewColumnLabelProviderTest.java
@@ -53,7 +53,7 @@ public class ReviewColumnLabelProviderTest {
 
 		myTaskReview2 = new TaskReview(mockTask2);
 
-		myLabelProvider = new ReviewColumnLabelProvider(null, null);
+		myLabelProvider = new ReviewColumnLabelProvider();
 	}
 
 	@Test
diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/ReviewColumnLabelProvider.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/ReviewColumnLabelProvider.java
index 560644dda..5b0678ebe 100644
--- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/ReviewColumnLabelProvider.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/ReviewColumnLabelProvider.java
@@ -16,8 +16,6 @@ import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.mylyn.commons.ui.CommonImages;
 import org.eclipse.mylyn.internal.reviews.ui.editors.parts.TaskReview;
 import org.eclipse.mylyn.tasks.core.ITask.SynchronizationState;
-import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
-import org.eclipse.mylyn.tasks.ui.editors.AttributeEditorToolkit;
 import org.eclipse.swt.graphics.Image;
 
 /**
@@ -29,31 +27,23 @@ public class ReviewColumnLabelProvider extends ColumnLabelProvider {
 
 	private final int NOT_VERIFIED = -1;
 
-	private final TaskDataModel model;
+	private static final int DESCRIPTION_COLUMN = 0;
 
-	private final AttributeEditorToolkit attributeEditorToolkit;
+	private static final int CODE_REVIEW_COLUMN = 1;
 
-	private final int DESCRIPTION_COLUMN = 0;
+	private static final int VERIFIED_COLUMN = 2;
 
-	private final int CODE_REVIEW_COLUMN = 1;
+	private static final int STATUS_COLUMN = 3;
 
-	private final int VERIFIED_COLUMN = 2;
+	private static final int MINUS_TWO = -2;
 
-	private final int INCOMING_CHANGES_COLUMN = 3;
+	private static final int MINUS_ONE = -1;
 
-	private final int MINUS_TWO = -2;
+	private static final int PLUS_ONE = 1;
 
-	private final int MINUS_ONE = -1;
+	private static final int PLUS_TWO = 2;
 
-	private final int ZERO = 0;
-
-	private final int PLUS_ONE = 1;
-
-	private final int PLUS_TWO = 2;
-
-	public ReviewColumnLabelProvider(TaskDataModel model, AttributeEditorToolkit attributeEditorToolkit) {
-		this.model = model;
-		this.attributeEditorToolkit = attributeEditorToolkit;
+	public ReviewColumnLabelProvider() {
 	}
 
 	public Image getColumnImage(Object element, int columnIndex) {
@@ -66,8 +56,6 @@ public class ReviewColumnLabelProvider extends ColumnLabelProvider {
 			return getReviewStateImage(reviewContainer);
 		case VERIFIED_COLUMN:
 			return getVerifiedStateImage(reviewContainer);
-		case INCOMING_CHANGES_COLUMN:
-			return CommonImages.getImage(CommonImages.OVERLAY_CLEAR);
 		}
 
 		return null;
@@ -118,10 +106,10 @@ public class ReviewColumnLabelProvider extends ColumnLabelProvider {
 		switch (columnIndex) {
 		case DESCRIPTION_COLUMN:
 			return reviewContainer.getSummary();
-		case INCOMING_CHANGES_COLUMN:
-			return reviewContainer.getIncomingChanges();
+		case STATUS_COLUMN:
+			return reviewContainer.getStatus();
 		default:
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 	}
 
diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/TaskEditorReviewsPart.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/TaskEditorReviewsPart.java
index 4ac1a8277..3df250bb6 100644
--- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/TaskEditorReviewsPart.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/TaskEditorReviewsPart.java
@@ -57,12 +57,11 @@ public class TaskEditorReviewsPart extends AbstractTaskEditorPart {
 	private Table reviewsTable;
 
 	private final String[] REVIEWS_COLUMNS = { Messages.TaskEditorReviewsPart_DescriptionString,
-			Messages.TaskEditorReviewsPart_CodeReviewString, Messages.TaskEditorReviewsPart_VerifiedString,
-			Messages.TaskEditorReviewsPart_IncomingChangesString };
+			Messages.TaskEditorReviewsPart_CodeReviewString, Messages.TaskEditorReviewsPart_VerifiedString, "Status" };
 
 	private SelectionProviderAdapter selectionProvider;
 
-	private final int[] REVIEWS_COLUMNS_WIDTH = { 400, 50, 50, 300, 0 };
+	private final int[] REVIEWS_COLUMNS_WIDTH = { 600, 30, 30, 90, 0 };
 
 	private TableViewer reviewsViewer;
 
@@ -161,8 +160,7 @@ public class TaskEditorReviewsPart extends AbstractTaskEditorPart {
 		ColumnViewerToolTipSupport.enableFor(reviewsViewer, ToolTip.NO_RECREATE);
 
 		reviewsViewer.setContentProvider(new ArrayContentProvider());
-		reviewsViewer.setLabelProvider(
-				new ReviewColumnLabelProvider(getModel(), getTaskEditorPage().getAttributeEditorToolkit()));
+		reviewsViewer.setLabelProvider(new ReviewColumnLabelProvider());
 
 		reviewsViewer.addOpenListener(new IOpenListener() {
 			public void open(OpenEvent event) {
diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/TaskReview.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/TaskReview.java
index 87c917b1f..253c7bced 100644
--- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/TaskReview.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/TaskReview.java
@@ -13,6 +13,7 @@ package org.eclipse.mylyn.internal.reviews.ui.editors.parts;
 
 import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.ITask.SynchronizationState;
+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
 
 public class TaskReview {
 
@@ -57,4 +58,8 @@ public class TaskReview {
 	public SynchronizationState getSyncState() {
 		return review.getSynchronizationState();
 	}
+
+	public String getStatus() {
+		return review.getAttribute(TaskAttribute.STATUS);
+	}
 }
\ No newline at end of file