NEW - bug 277542: exceptions with new integrated bug reporting

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

2 files changed, 6 insertions, 3 deletions

diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/SupportProduct.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/SupportProduct.java
index 1c3e2e2a2..26080cbc3 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/SupportProduct.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/SupportProduct.java
@@ -11,7 +11,6 @@
 
 package org.eclipse.mylyn.internal.tasks.bugs;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
@@ -62,7 +61,7 @@ public class SupportProduct extends AbstractSupportElement implements IProduct {
 		if (attributes != null) {
 			return attributes;
 		} else {
-			return Collections.emptyMap();
+			return new HashMap<String, String>();
 		}
 	}
 
@@ -102,6 +101,7 @@ public class SupportProduct extends AbstractSupportElement implements IProduct {
 	/**
 	 * @deprecated Use {@link #isInstalled()} instead
 	 */
+	@Deprecated
 	public boolean isEnabled() {
 		return isInstalled();
 	}
@@ -117,6 +117,7 @@ public class SupportProduct extends AbstractSupportElement implements IProduct {
 	/**
 	 * @deprecated Use {@link #setInstalled(boolean)} instead
 	 */
+	@Deprecated
 	public void setEnabled(boolean enabled) {
 		setInstalled(enabled);
 	}
diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/SelectSupportElementPage.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/SelectSupportElementPage.java
index f11664b3f..4fb935fa1 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/SelectSupportElementPage.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/SelectSupportElementPage.java
@@ -320,7 +320,9 @@ public class SelectSupportElementPage extends WizardPage {
 				if (element instanceof SupportCategory) {
 					return ((SupportCategory) element).getWeight() * 2;
 				} else if (element instanceof SupportProvider) {
-					return ((SupportProvider) element).getCategory().getWeight() * 2 + 1;
+					if (((SupportProvider) element).getCategory() != null) {
+						return ((SupportProvider) element).getCategory().getWeight() * 2 + 1;
+					}
 				}
 				return super.category(element);
 			}