REOPENED - bug 284155: support overlay of product and component on attributes section header

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

3 files changed, 9 insertions, 7 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-minor.gif b/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-trivial.gif
index 376dbb403..376dbb403 100644
--- a/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-minor.gif
+++ b/org.eclipse.mylyn.bugzilla.ui/icons/eview16/overlay-trivial.gif
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 b49311aee..128bc9325 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
@@ -54,7 +54,7 @@ public class BugzillaImages {
 
 	public static final ImageDescriptor OVERLAY_ENHANCEMENT = create(T_VIEW, "overlay-enhancement.gif"); //$NON-NLS-1$
 
-	public static final ImageDescriptor OVERLAY_MINOR = create(T_VIEW, "overlay-minor.gif"); //$NON-NLS-1$
+	public static final ImageDescriptor OVERLAY_TRIVIAL = create(T_VIEW, "overlay-trivial.gif"); //$NON-NLS-1$
 
 	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/BugzillaConnectorUi.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
index ed87a2cb3..370d8660a 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
@@ -87,9 +87,11 @@ public class BugzillaConnectorUi extends AbstractRepositoryConnectorUi {
 		List<LegendElement> legendItems = new ArrayList<LegendElement>();
 		legendItems.add(LegendElement.createTask("blocker", BugzillaImages.OVERLAY_CRITICAL)); //$NON-NLS-1$
 		legendItems.add(LegendElement.createTask("critical", BugzillaImages.OVERLAY_CRITICAL)); //$NON-NLS-1$
-		legendItems.add(LegendElement.createTask("major", BugzillaImages.OVERLAY_MAJOR)); //$NON-NLS-1$
+		legendItems.add(LegendElement.createTask("major", BugzillaImages.OVERLAY_CRITICAL)); //$NON-NLS-1$
+		legendItems.add(LegendElement.createTask("minor", BugzillaImages.OVERLAY_MAJOR)); //$NON-NLS-1$
+		legendItems.add(LegendElement.createTask("normal", null)); //$NON-NLS-1$
 		legendItems.add(LegendElement.createTask("enhancement", BugzillaImages.OVERLAY_ENHANCEMENT)); //$NON-NLS-1$
-		legendItems.add(LegendElement.createTask("trivial", BugzillaImages.OVERLAY_MINOR)); //$NON-NLS-1$
+		legendItems.add(LegendElement.createTask("trivial", BugzillaImages.OVERLAY_TRIVIAL)); //$NON-NLS-1$
 		return legendItems;
 	}
 
@@ -98,14 +100,14 @@ public class BugzillaConnectorUi extends AbstractRepositoryConnectorUi {
 		String severity = task.getAttribute(BugzillaAttribute.BUG_SEVERITY.getKey());
 		if (severity != null) {
 			// XXX: refactor to use configuration
-			if ("blocker".equals(severity) || "critical".equals(severity)) { //$NON-NLS-1$ //$NON-NLS-2$
+			if ("blocker".equals(severity) || "critical".equals(severity) || "major".equals(severity)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				return BugzillaImages.OVERLAY_CRITICAL;
-			} else if ("major".equals(severity)) { //$NON-NLS-1$
+			} else if ("minor".equals(severity)) { //$NON-NLS-1$
 				return BugzillaImages.OVERLAY_MAJOR;
 			} else if ("enhancement".equals(severity)) { //$NON-NLS-1$
 				return BugzillaImages.OVERLAY_ENHANCEMENT;
-			} else if ("trivial".equals(severity) || "minor".equals(severity)) { //$NON-NLS-1$ //$NON-NLS-2$
-				return BugzillaImages.OVERLAY_MINOR;
+			} else if ("trivial".equals(severity)) { //$NON-NLS-1$ 
+				return BugzillaImages.OVERLAY_TRIVIAL;
 			} else {
 				return null;
 			}