RESOLVED - bug 278856: selecting a support repository in the report bug from error dialog doesnt always use the selected one

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

6 files changed, 14 insertions, 2 deletions

diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/provisional/tasks/bugs/ITaskContribution.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/provisional/tasks/bugs/ITaskContribution.java
index 9f28a26bb..0e56d271c 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/provisional/tasks/bugs/ITaskContribution.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/provisional/tasks/bugs/ITaskContribution.java
@@ -19,7 +19,6 @@ import org.eclipse.core.runtime.IStatus;
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  */
-// FIXME 3.2 rename to ISupportContribution
 public interface ITaskContribution {
 
 	/**
diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/AttributeTaskMapper.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/AttributeTaskMapper.java
index ab3b86c5a..d58f6dede 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/AttributeTaskMapper.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/AttributeTaskMapper.java
@@ -97,7 +97,7 @@ public class AttributeTaskMapper implements ITaskContribution, ISupportResponse
 	}
 
 	public boolean isMappingComplete() {
-		return getTaskRepository() != null;
+		return getAttribute(IRepositoryConstants.MAPPING_COMPLETE) != null || getTaskRepository() != null;
 	}
 
 	public void setAttribute(String name, String value) {
diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/IRepositoryConstants.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/IRepositoryConstants.java
index ffdae0d19..910ccc5b1 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/IRepositoryConstants.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/IRepositoryConstants.java
@@ -52,4 +52,6 @@ public class IRepositoryConstants {
 
 	public static final String PRIORITY = "priority"; //$NON-NLS-1$
 
+	public static final String MAPPING_COMPLETE = "org.eclipse.mylyn.tasks.bugs.mappingComplete"; //$NON-NLS-1$
+
 }
diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/Messages.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/Messages.java
index b35e71cfd..ab95627e7 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/Messages.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/Messages.java
@@ -45,6 +45,8 @@ public class Messages extends NLS {
 
 	public static String SelectSupportElementPage_No_products_Message;
 
+	public static String SelectSupportElementPage_No_support_providers_Error0;
+
 	public static String SelectSupportElementPage_Support_Product_Description;
 
 	public static String SelectSupportElementPage_Support_Provider_Description;
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 59f25daef..0e900e0e2 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
@@ -250,6 +250,14 @@ public class SelectSupportElementPage extends WizardPage {
 			return new SupportElementItem(parent, SWT.NONE, element);
 		}
 
+		@Override
+		protected void doCreateNoEntryArea(Composite parent) {
+			parent.setLayout(new FillLayout());
+
+			Label label = new Label(parent, SWT.WRAP);
+			label.setText(Messages.SelectSupportElementPage_No_support_providers_Error0);
+		}
+
 	}
 
 	private static final int TABLE_HEIGHT = 200;
diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/messages.properties b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/messages.properties
index 17e4df45c..366e9a62b 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/messages.properties
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/messages.properties
@@ -11,6 +11,7 @@ ReportErrorPage_Xprovider_Xproduct={0} - {1}
 ReportErrorWizard_Report_as_Bug=Report as Bug
 
 SelectSupportElementPage_No_products_Message=The selected provider does not specify supported products.
+SelectSupportElementPage_No_support_providers_Error0=No support providers are available.
 SelectSupportElementPage_Support_Product_Description=Select a supported product from the list.
 SelectSupportElementPage_Support_Provider_Description=Select a support provider from the list.
 SelectSupportElementPage_Support_Provider_Title=Support Provider