NEW - bug 182772: improve Task List table/tree layout

https://bugs.eclipse.org/bugs/show_bug.cgi?id=182772

3 files changed, 31 insertions, 68 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java
index db1f076c5..9799cfed7 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaImages.java
@@ -47,11 +47,13 @@ public class BugzillaImages {
 
 	public static final ImageDescriptor OPEN = create("", "openresult.gif");
 
-	public static final ImageDescriptor OVERLAY_MAJOR = create(T_VIEW, "overlay-bug.gif");
+	public static final ImageDescriptor OVERLAY_CRITICAL = create(T_VIEW, "overlay-critical.gif");
+	
+	public static final ImageDescriptor OVERLAY_MAJOR = create(T_VIEW, "overlay-major.gif");
 
-	public static final ImageDescriptor OVERLAY_ENHANCEMENT = create(T_VIEW, "overlay-feature.gif");
+	public static final ImageDescriptor OVERLAY_ENHANCEMENT = create(T_VIEW, "overlay-enhancement.gif");
 
-	public static final ImageDescriptor OVERLAY_NORMAL = create(T_VIEW, "overlay-normal.gif");
+	public static final ImageDescriptor OVERLAY_MINOR = create(T_VIEW, "overlay-minor.gif");
 	
 	private static ImageDescriptor create(String prefix, String name) {
 		try {
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java
index 97b8f01d3..50918c42d 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.hyperlink.IHyperlink;
@@ -25,6 +26,7 @@ import org.eclipse.mylar.internal.bugzilla.core.BugzillaReportElement;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryQuery;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaTask;
 import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants;
+import org.eclipse.mylar.internal.bugzilla.ui.BugzillaImages;
 import org.eclipse.mylar.internal.bugzilla.ui.search.BugzillaSearchPage;
 import org.eclipse.mylar.internal.bugzilla.ui.wizard.NewBugzillaTaskWizard;
 import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
@@ -44,6 +46,30 @@ import org.eclipse.mylar.tasks.ui.wizards.AbstractRepositorySettingsPage;
 public class BugzillaRepositoryUi extends AbstractRepositoryConnectorUi {
 	private static final int TASK_NUM_GROUP = 3;
 
+	@Override
+	public ImageDescriptor getTaskKindOverlay(AbstractRepositoryTask task) {
+		if (task instanceof BugzillaTask) {
+			BugzillaTask bugzillaTask = (BugzillaTask)task;
+			String severity = bugzillaTask.getSeverity();
+	
+			if (severity != null) {
+				// XXX: refactor to use configuration
+				if ("blocker".equals(severity) || "critical".equals(severity)) {
+					return BugzillaImages.OVERLAY_CRITICAL;
+				} else if ("major".equals(severity)) {
+					return BugzillaImages.OVERLAY_MAJOR;
+				} else if ("enhancement".equals(severity)) {
+					return BugzillaImages.OVERLAY_ENHANCEMENT;
+				} else if ("trivial".equals(severity) || "minor".equals(severity)) {
+					return BugzillaImages.OVERLAY_MINOR;
+				} else {
+					return null;
+				}
+			}
+		}
+		return super.getTaskKindOverlay(task);
+	}
+
 	private static final String regexp = "(duplicate of|bug|task)(\\s#|#|#\\s|\\s|)(\\s\\d+|\\d+)";
 
 	private static final Pattern PATTERN = Pattern.compile(regexp, Pattern.CASE_INSENSITIVE);
@@ -96,7 +122,6 @@ public class BugzillaRepositoryUi extends AbstractRepositoryConnectorUi {
 		}
 	}
 	
-
 	public String getTaskKindLabel(AbstractRepositoryTask repositoryTask) {
 		return IBugzillaConstants.BUGZILLA_TASK_KIND;
 	}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskDecorator.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskDecorator.java
deleted file mode 100644
index d96f53974..000000000
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskDecorator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 - 2006 Mylar eclipse.org project and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Mylar project committers - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylar.internal.bugzilla.ui.tasklist;
-
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.mylar.internal.bugzilla.core.BugzillaQueryHit;
-import org.eclipse.mylar.internal.bugzilla.core.BugzillaTask;
-import org.eclipse.mylar.internal.bugzilla.ui.BugzillaImages;
-import org.eclipse.mylar.tasks.ui.AbstractTaskDecorator;
-
-/**
- * @author Mik Kersten
- */
-public class BugzillaTaskDecorator extends AbstractTaskDecorator {
-
-	public void decorate(Object element, IDecoration decoration) {
-		if (element instanceof BugzillaTask) {
-			BugzillaTask task = (BugzillaTask) element;
-			String severity = task.getSeverity();
-
-			if (severity != null) {
-				// XXX: refactor to use configuration
-				if ("major".equals(severity) || "blocker".equals(severity) || "critical".equals(severity)) {
-					decoration.addOverlay(BugzillaImages.OVERLAY_MAJOR, getQuadrantForKind());
-				} else if ("enhancement".equals(severity)) {
-					decoration.addOverlay(BugzillaImages.OVERLAY_ENHANCEMENT, getQuadrantForKind());
-				} else {
-					decoration.addOverlay(BugzillaImages.OVERLAY_NORMAL, getQuadrantForKind());
-				}
-			}
-		} else if (element instanceof BugzillaQueryHit) {
-			BugzillaQueryHit hit = (BugzillaQueryHit) element;
-			if (hit.getCorrespondingTask() != null) {
-				decorate(hit.getCorrespondingTask(), decoration);
-			}
-		}
-	}
-
-	public void addListener(ILabelProviderListener listener) {
-		// ignore
-	}
-
-	public void dispose() {
-		// ignore
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-		// ignore
-	}
-}