499581: My Task icon added to legend

Change-Id: Ied32a8508292082c740c7bee1b8a6528462a7a65
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=499581

3 files changed, 7 insertions, 45 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/Messages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/Messages.java
index a3cc7b66e..0bd7b3a60 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/Messages.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/Messages.java
@@ -123,6 +123,8 @@ public class Messages extends NLS {
 
 	public static String UiLegendControl_Task;
 
+	public static String UiLegendControl_Task_Owned;
+
 	public static String UiLegendControl_Task_Activity;
 
 	public static String UiLegendControl_Task_Context;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/UiLegendControl.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/UiLegendControl.java
index 375f8cd02..bcdade78f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/UiLegendControl.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/UiLegendControl.java
@@ -22,8 +22,6 @@ import org.eclipse.mylyn.commons.ui.CommonImages;
 import org.eclipse.mylyn.commons.ui.compatibility.CommonFonts;
 import org.eclipse.mylyn.commons.ui.compatibility.CommonThemes;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.IRepositoryElement;
-import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.ITask.PriorityLevel;
 import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
 import org.eclipse.mylyn.tasks.ui.ITasksUiConstants;
@@ -196,6 +194,10 @@ public class UiLegendControl extends Composite {
 		toolkit.createLabel(tasksClient, Messages.UiLegendControl_Task);
 
 		imageLabel = toolkit.createLabel(tasksClient, ""); //$NON-NLS-1$
+		imageLabel.setImage(CommonImages.getImage(TasksUiImages.TASK_OWNED));
+		toolkit.createLabel(tasksClient, Messages.UiLegendControl_Task_Owned);
+
+		imageLabel = toolkit.createLabel(tasksClient, ""); //$NON-NLS-1$
 		imageLabel.setImage(CommonImages.getImage(TasksUiImages.CATEGORY));
 		toolkit.createLabel(tasksClient, Messages.UiLegendControl_Category);
 
@@ -469,11 +471,6 @@ public class UiLegendControl extends Composite {
 				if (elements != null && elements.size() > 0) {
 					legendElements.addAll(elements);
 					addLegendElements(composite.getBody(), connector, elements);
-				} else {
-					List<ITask> items = connectorUi.getLegendItems();
-					if (items != null && !items.isEmpty()) {
-						addLegacyLegendItems(composite, connector, items);
-					}
 				}
 			}
 		}
@@ -523,44 +520,6 @@ public class UiLegendControl extends Composite {
 		}
 	}
 
-	private void addLegacyLegendItems(Composite composite, AbstractRepositoryConnector connector,
-			List<ITask> elements) {
-		Section connectorSection = toolkit.createSection(composite, ExpandableComposite.TITLE_BAR);
-		connectorSection.setLayout(new TableWrapLayout());
-		connectorSection.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-
-		String label = connector.getLabel();
-		int parenIndex = label.indexOf('(');
-		if (parenIndex != -1) {
-			label = label.substring(0, parenIndex);
-		}
-		connectorSection.setText(label);
-
-		TableWrapLayout clientLayout = new TableWrapLayout();
-		clientLayout.numColumns = 2;
-		clientLayout.makeColumnsEqualWidth = false;
-		clientLayout.verticalSpacing = 1;
-		clientLayout.topMargin = 1;
-		clientLayout.bottomMargin = 1;
-
-		Composite connectorClient = toolkit.createComposite(connectorSection);
-		connectorClient.setLayout(clientLayout);
-		connectorClient.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		connectorSection.setClient(connectorClient);
-
-		Label imageLabel;
-		for (IRepositoryElement taskListElement : elements) {
-			imageLabel = toolkit.createLabel(connectorClient, ""); //$NON-NLS-1$
-			imageLabel.setImage(labelProvider.getImage(taskListElement));
-			toolkit.createLabel(connectorClient, taskListElement.getSummary());
-		}
-
-		if (elements.size() < 4) {
-			imageLabel = toolkit.createLabel(connectorClient, ""); //$NON-NLS-1$
-			toolkit.createLabel(connectorClient, ""); //$NON-NLS-1$
-		}
-	}
-
 	private void createGettingStartedSection(Composite parent) {
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.verticalSpacing = 0;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/messages.properties b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/messages.properties
index 55bff2a2a..62029787b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/messages.properties
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/messages.properties
@@ -59,6 +59,7 @@ UiLegendControl_Synchronization=Synchronization
 UiLegendControl_Synchronization_failed=Synchronization failed, mouse over for details
 UiLegendControl_Synchronization_error=Synchronization error, mouse over for details
 UiLegendControl_Task=Task
+UiLegendControl_Task_Owned=Task Assigned to You
 UiLegendControl_Task_Activity=Task Activity
 UiLegendControl_Task_Context=Task Context
 UiLegendControl_Tasks=Tasks