NEW - bug 277401: support reporting bugs to places other than task repositories

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

9 files changed, 80 insertions, 48 deletions

diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/DefaultSupportHandler.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/DefaultSupportHandler.java
index 48339bbec..3b52620fb 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/DefaultSupportHandler.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/DefaultSupportHandler.java
@@ -110,15 +110,15 @@ public class DefaultSupportHandler extends AbstractSupportHandler {
 		sb.append(Messages.DefaultTaskContributor_Error_Details);
 		if (date != null) {
 			sb.append("\n"); //$NON-NLS-1$
-			sb.append(NLS.bind("Date: {0}", date));
+			sb.append(NLS.bind(Messages.DefaultSupportHandler_Date_X, date));
 		}
 		sb.append("\n"); //$NON-NLS-1$
-		sb.append(NLS.bind("Message: {0}", status.getMessage()));
+		sb.append(NLS.bind(Messages.DefaultSupportHandler_Message_X, status.getMessage()));
 		sb.append("\n"); //$NON-NLS-1$
-		sb.append(NLS.bind("Severity: {0}", getSeverityText(status.getSeverity())));
+		sb.append(NLS.bind(Messages.DefaultSupportHandler_Severity_X, getSeverityText(status.getSeverity())));
 		appendProductInformation(sb);
 		sb.append("\n"); //$NON-NLS-1$
-		sb.append(NLS.bind("Plugin: {0}", status.getPlugin()));
+		sb.append(NLS.bind(Messages.DefaultSupportHandler_Plugin_X, status.getPlugin()));
 	}
 
 	private void appendProductInformation(StringBuilder sb) {
@@ -126,9 +126,9 @@ public class DefaultSupportHandler extends AbstractSupportHandler {
 		if (product != null) {
 			sb.append("\n"); //$NON-NLS-1$
 			if (product.getName() != null) {
-				sb.append(NLS.bind("Product: {0}", product.getName()));
+				sb.append(NLS.bind(Messages.DefaultSupportHandler_Product_X, product.getName()));
 			} else {
-				sb.append(NLS.bind("Product: {0}", product.getId()));
+				sb.append(NLS.bind(Messages.DefaultSupportHandler_Product_X, product.getId()));
 			}
 			Bundle definingBundle = product.getDefiningBundle();
 			if (definingBundle != null) {
@@ -150,10 +150,10 @@ public class DefaultSupportHandler extends AbstractSupportHandler {
 			if (product.getBundleGroup() != null) {
 				StringBuilder sb = new StringBuilder();
 				sb.append("\n\n\n"); //$NON-NLS-1$
-				sb.append("-- Configuration Details --");
+				sb.append(Messages.DefaultSupportHandler_Configuration_Details);
 				appendProductInformation(sb);
 				sb.append("\n"); //$NON-NLS-1$
-				sb.append("Installed Features:");
+				sb.append(Messages.DefaultSupportHandler_Installed_Features);
 				sb.append("\n"); //$NON-NLS-1$
 				for (IBundleGroup bundleGroup : new IBundleGroup[] { product.getBundleGroup() }) {
 					sb.append(" "); //$NON-NLS-1$
@@ -183,11 +183,11 @@ public class DefaultSupportHandler extends AbstractSupportHandler {
 			ErrorLogStatus errorLogStatus = (ErrorLogStatus) status;
 			StringBuilder sb = new StringBuilder();
 			sb.append("\n\n"); //$NON-NLS-1$
-			sb.append("What steps will reproduce the problem?");
+			sb.append(Messages.DefaultSupportHandler_What_steps_message);
 			sb.append("\n"); //$NON-NLS-1$
-			sb.append("1. \n");
-			sb.append("2. \n");
-			sb.append("3. \n");
+			sb.append(Messages.DefaultSupportHandler_Step_1);
+			sb.append(Messages.DefaultSupportHandler_Step_2);
+			sb.append(Messages.DefaultSupportHandler_Step_3);
 			appendErrorDetails(sb, errorLogStatus, errorLogStatus.getDate());
 			if (errorLogStatus.getLogSessionData() != null) {
 				sb.append(Messages.DefaultTaskContributor_SESSION_DATA);
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 c4073408c..ffdae0d19 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
@@ -50,6 +50,6 @@ public class IRepositoryConstants {
 
 	public static final String SUMMARY = "summary"; //$NON-NLS-1$
 
-	public static final String PRIORITY = "priority";
+	public static final String PRIORITY = "priority"; //$NON-NLS-1$
 
 }
diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/Messages.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/Messages.java
index 8b9629510..e87bc887b 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/Messages.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/Messages.java
@@ -25,9 +25,27 @@ public class Messages extends NLS {
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
 	}
 
-	public static String DefaultTaskContributor_Bundle_Version;
+	public static String DefaultSupportHandler_Configuration_Details;
 
-	public static String DefaultTaskContributor_DATE;
+	public static String DefaultSupportHandler_Date_X;
+
+	public static String DefaultSupportHandler_Installed_Features;
+
+	public static String DefaultSupportHandler_Message_X;
+
+	public static String DefaultSupportHandler_Plugin_X;
+
+	public static String DefaultSupportHandler_Product_X;
+
+	public static String DefaultSupportHandler_Severity_X;
+
+	public static String DefaultSupportHandler_Step_1;
+
+	public static String DefaultSupportHandler_Step_2;
+
+	public static String DefaultSupportHandler_Step_3;
+
+	public static String DefaultSupportHandler_What_steps_message;
 
 	public static String DefaultTaskContributor_Error;
 
@@ -37,17 +55,15 @@ public class Messages extends NLS {
 
 	public static String DefaultTaskContributor_Info;
 
-	public static String DefaultTaskContributor_INSTALLED_FEATURES_AND_PLUGINS;
-
-	public static String DefaultTaskContributor_MESSAGE;
-
 	public static String DefaultTaskContributor_OK;
 
-	public static String DefaultTaskContributor_PLUGIN;
-
 	public static String DefaultTaskContributor_SESSION_DATA;
 
-	public static String DefaultTaskContributor_SEVERITY;
-
 	public static String DefaultTaskContributor_Warning;
+
+	public static String TaskErrorReporter_Create_Task_Error_Message;
+
+	public static String TaskErrorReporter_Create_Task_Error_Title;
+
+	public static String TaskErrorReporter_Job_Progress_Process_support_request;
 }
diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/TaskErrorReporter.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/TaskErrorReporter.java
index 54b051c6a..7960a3837 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/TaskErrorReporter.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/TaskErrorReporter.java
@@ -61,7 +61,7 @@ public class TaskErrorReporter {
 		ICoreRunnable runner = new ICoreRunnable() {
 			public void run(IProgressMonitor monitor) throws CoreException {
 				try {
-					monitor.beginTask("Processing support request", IProgressMonitor.UNKNOWN);
+					monitor.beginTask(Messages.TaskErrorReporter_Job_Progress_Process_support_request, IProgressMonitor.UNKNOWN);
 					process((AttributeTaskMapper) response, monitor);
 				} finally {
 					monitor.done();
@@ -71,8 +71,8 @@ public class TaskErrorReporter {
 		try {
 			CommonUiUtil.run(context, runner);
 		} catch (CoreException e) {
-			TasksUiInternal.logAndDisplayStatus("Error Reporting", new Status(IStatus.ERROR, TasksBugsPlugin.ID_PLUGIN,
-					"Unexpected error while creating task for error report", e));
+			TasksUiInternal.logAndDisplayStatus(Messages.TaskErrorReporter_Create_Task_Error_Title, new Status(IStatus.ERROR, TasksBugsPlugin.ID_PLUGIN,
+					Messages.TaskErrorReporter_Create_Task_Error_Message, e));
 			return false;
 		} catch (OperationCanceledException e) {
 			return false;
diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/messages.properties b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/messages.properties
index fd49b72aa..f71a2eb84 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/messages.properties
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/messages.properties
@@ -1,13 +1,21 @@
-DefaultTaskContributor_Bundle_Version=Bundle-Version
-DefaultTaskContributor_DATE=\nDate: 
+DefaultSupportHandler_Configuration_Details=-- Configuration Details --
+DefaultSupportHandler_Date_X=Date: {0}
+DefaultSupportHandler_Installed_Features=Installed Features:
+DefaultSupportHandler_Message_X=Message: {0}
+DefaultSupportHandler_Plugin_X=Plugin: {0}
+DefaultSupportHandler_Product_X=Product: {0}
+DefaultSupportHandler_Severity_X=Severity: {0}
+DefaultSupportHandler_Step_1=1. \n
+DefaultSupportHandler_Step_2=2. \n
+DefaultSupportHandler_Step_3=3. \n
+DefaultSupportHandler_What_steps_message=What steps will reproduce the problem?
 DefaultTaskContributor_Error=Error
 DefaultTaskContributor_Error_Details=-- Error Details --
 DefaultTaskContributor_EXCEPTION_STACK_TRACE=\nException Stack Trace:\n
 DefaultTaskContributor_Info=Info
-DefaultTaskContributor_INSTALLED_FEATURES_AND_PLUGINS=-- Installed Features and Plug-ins --\n
-DefaultTaskContributor_MESSAGE=\nMessage: 
 DefaultTaskContributor_OK=OK
-DefaultTaskContributor_PLUGIN=\nPlugin: 
 DefaultTaskContributor_SESSION_DATA=\nSession Data:\n
-DefaultTaskContributor_SEVERITY=\nSeverity: 
 DefaultTaskContributor_Warning=Warning
+TaskErrorReporter_Create_Task_Error_Message=Unexpected error while creating task for error report
+TaskErrorReporter_Create_Task_Error_Title=Error Reporting
+TaskErrorReporter_Job_Progress_Process_support_request=Processing support request
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 9df2c1f84..874fdf446 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
@@ -31,17 +31,23 @@ public class Messages extends NLS {
 
 	public static String ReportErrorPage_Report_as_Bug;
 
-	public static String ReportErrorPage_Report_to_;
+	public static String ReportErrorPage_Report_to;
 
 	public static String ReportErrorPage_Select_repository;
 
 	public static String ReportErrorPage_AN_UNEXPETED_ERROR_HAS_OCCURED_IN_PLUGIN;
 
+	public static String ReportErrorPage_Xprovider_Xproduct;
+
 	public static String ReportErrorWizard_Report_as_Bug;
 
-	public static String SelectFeaturePage_SELECT_FEATURE;
+	public static String SelectSupportElementPage_No_products_Message;
+
+	public static String SelectSupportElementPage_Support_Product_Description;
+
+	public static String SelectSupportElementPage_Support_Provider_Description;
 
-	public static String SelectProductPage_Other;
+	public static String SelectSupportElementPage_Support_Provider_Title;
 
-	public static String SelectProductPage_SELECT_PRODUCT;
+	public static String SelectSupportElementPage_Supported_Product_Title;
 }
diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/ReportErrorPage.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/ReportErrorPage.java
index 806260935..41bbd7632 100644
--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/ReportErrorPage.java
+++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/wizards/ReportErrorPage.java
@@ -94,7 +94,7 @@ public class ReportErrorPage extends WizardPage {
 			defaultRepositoryButton.setSelection(true);
 			selectedContribution = contributions.get(0);
 			if (contributions.size() == 1) {
-				defaultRepositoryButton.setText(NLS.bind("Report to: {0}", getLabel(selectedContribution)));
+				defaultRepositoryButton.setText(NLS.bind(Messages.ReportErrorPage_Report_to, getLabel(selectedContribution)));
 				GridDataFactory.fillDefaults().span(2, 1).applyTo(defaultRepositoryButton);
 			} else {
 				contributionCombo = new Combo(composite, SWT.READ_ONLY);
@@ -145,7 +145,7 @@ public class ReportErrorPage extends WizardPage {
 	private String getLabel(AttributeTaskMapper contribution) {
 		IProduct product = contribution.getProduct();
 		if (product.getName() != null) {
-			return NLS.bind("{0} - {1}", product.getProvider().getName(), product.getName());
+			return NLS.bind(Messages.ReportErrorPage_Xprovider_Xproduct, product.getProvider().getName(), product.getName());
 		} else {
 			return product.getProvider().getName();
 		}
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 a0e7d6378..59f25daef 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
@@ -283,11 +283,11 @@ public class SelectSupportElementPage extends WizardPage {
 		this.input = input;
 
 		if (input instanceof IProvider) {
-			setTitle("Supported Product");
-			setMessage("Select a supported product from the list.");
+			setTitle(Messages.SelectSupportElementPage_Supported_Product_Title);
+			setMessage(Messages.SelectSupportElementPage_Support_Product_Description);
 		} else {
-			setTitle("Support Provider");
-			setMessage("Select a support provider from the list.");
+			setTitle(Messages.SelectSupportElementPage_Support_Provider_Title);
+			setMessage(Messages.SelectSupportElementPage_Support_Provider_Description);
 		}
 	}
 
@@ -371,7 +371,7 @@ public class SelectSupportElementPage extends WizardPage {
 				setErrorMessage(null);
 				setPageComplete(true);
 			} else {
-				setErrorMessage("The selected provider does not specify supported products.");
+				setErrorMessage(Messages.SelectSupportElementPage_No_products_Message);
 				setPageComplete(false);
 			}
 		} else if (selectedElement instanceof SupportProduct) {
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 20cce279c..a9310a4f3 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
@@ -2,13 +2,15 @@ ReportBugOrEnhancementWizard_Report_Bug_or_Enhancement=Report Bug or Enhancement
 
 ReportErrorPage_Details=Details:
 ReportErrorPage_Report_as_Bug=Report as Bug
-ReportErrorPage_Report_to_=Report to: 
+ReportErrorPage_Report_to=Report to: {0}
 ReportErrorPage_Select_repository=Select repository
 ReportErrorPage_AN_UNEXPETED_ERROR_HAS_OCCURED_IN_PLUGIN=An unexpected error has occured in plug-in {0}
+ReportErrorPage_Xprovider_Xproduct={0} - {1}
 
 ReportErrorWizard_Report_as_Bug=Report as Bug
 
-SelectFeaturePage_SELECT_FEATURE=Select a feature
-
-SelectProductPage_Other=Other
-SelectProductPage_SELECT_PRODUCT=Select a product
+SelectSupportElementPage_No_products_Message=The selected provider does not specify supported products.
+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
+SelectSupportElementPage_Supported_Product_Title=Supported Product