Progress on: 148205: Bugzilla connector polutting Eclipse logR_0_6_0_prerefactoring

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

7 files changed, 16 insertions, 15 deletions

diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java
index a27bd08a8..cb226e6a2 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java
@@ -54,7 +54,7 @@ public class AbstractReportFactory {
 
 	protected void collectResults(URL url, Proxy proxySettings, String characterEncoding,
 			DefaultHandler contentHandler, boolean clean) throws IOException, LoginException, KeyManagementException,
-			NoSuchAlgorithmException {
+			NoSuchAlgorithmException, BugzillaException {
 		URLConnection cntx = BugzillaPlugin.getUrlConnection(url, proxySettings);
 		if (cntx == null || !(cntx instanceof HttpURLConnection)) {
 			throw new IOException("Could not form URLConnection.");
@@ -134,11 +134,11 @@ public class AbstractReportFactory {
 					}
 				}
 			} else if (connection.getContentType().contains(CONTENT_TYPE_TEXT_HTML)) {
-				try {
+//				try {
 					BugzillaRepositoryUtil.parseHtmlError(in);
-				} catch (BugzillaException e) {
-					throw new IOException(e.getMessage());
-				}
+//				} catch (BugzillaException e) {
+//					throw new IOException(e.getMessage());
+//				}
 			} else {
 				throw new IOException("Unrecognized content type: " + connection.getContentType());
 			}
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaPlugin.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaPlugin.java
index 66b2774ca..65f53b2c5 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaPlugin.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaPlugin.java
@@ -98,10 +98,11 @@ public class BugzillaPlugin extends Plugin {
 
 	/**
 	 * Retrieves the latest repository configuration from the server
+	 * @throws BugzillaException 
 	 */
 	public static RepositoryConfiguration getRepositoryConfiguration(boolean forceRefresh, String repositoryUrl,
 			Proxy proxySettings, String userName, String password, String encoding) throws IOException,
-			KeyManagementException, LoginException, NoSuchAlgorithmException {
+			KeyManagementException, LoginException, NoSuchAlgorithmException, BugzillaException {
 		if (!cacheFileRead) {
 			readRepositoryConfigurationFile();
 			cacheFileRead = true;
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryUtil.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryUtil.java
index 4cece8d45..3c737d48d 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryUtil.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryUtil.java
@@ -81,7 +81,7 @@ public class BugzillaRepositoryUtil {
 
 	public static RepositoryTaskData getBug(String repositoryUrl, String userName, String password,
 			Proxy proxySettings, String characterEncoding, int id) throws IOException, MalformedURLException,
-			LoginException, GeneralSecurityException {
+			LoginException, GeneralSecurityException, BugzillaException {
 
 		RepositoryTaskData bugReport = new RepositoryTaskData(new BugzillaAttributeFactory(),
 				BugzillaPlugin.REPOSITORY_KIND, repositoryUrl, ""+id);
@@ -196,7 +196,7 @@ public class BugzillaRepositoryUtil {
 
 			// MylarStatusHandler.log("Unrecognized Reponse: " + body,
 			// BugzillaRepositoryUtil.class);
-			throw new UnrecognizedReponseException("Unrecognized Response From Server: " + body);
+			throw new UnrecognizedReponseException(body);
 
 		} catch (ParseException e) {
 			throw new IOException("Unable to parse result from repository:\n" + e.getMessage());
@@ -215,10 +215,11 @@ public class BugzillaRepositoryUtil {
 	 * @throws NoSuchAlgorithmException
 	 * @throws LoginException
 	 * @throws KeyManagementException
+	 * @throws BugzillaException 
 	 */
 	public static void setupNewBugAttributes(String repositoryUrl, Proxy proxySettings, String userName,
 			String password, NewBugzillaReport newReport, String characterEncoding) throws IOException,
-			KeyManagementException, LoginException, NoSuchAlgorithmException {
+			KeyManagementException, LoginException, NoSuchAlgorithmException, BugzillaException {
 
 		newReport.removeAllAttributes();
 
@@ -358,7 +359,7 @@ public class BugzillaRepositoryUtil {
 
 	private static void updateBugAttributeOptions(String repositoryUrl, Proxy proxySettings, String userName,
 			String password, RepositoryTaskData existingReport, String characterEncoding) throws IOException,
-			KeyManagementException, LoginException, NoSuchAlgorithmException {
+			KeyManagementException, LoginException, NoSuchAlgorithmException, BugzillaException {
 		String product = existingReport.getAttributeValue(BugzillaReportElement.PRODUCT.getKeyString());
 		for (RepositoryTaskAttribute attribute : existingReport.getAttributes()) {
 			BugzillaReportElement element = BugzillaReportElement.valueOf(attribute.getID().trim().toUpperCase());
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java
index 544075d26..1c786ab42 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java
@@ -15,7 +15,7 @@ package org.eclipse.mylar.internal.bugzilla.core;
  */
 public interface IBugzillaConstants {
 
-	static final String ERROR_MIDAIR_COLLISION = "A mid-air collision has occurred, please synchronize.";
+	static final String ERROR_MIDAIR_COLLISION = "A mid-air collision has occurred. Please synchronize by selecting Synchronize in the task's context menu.";
 	
 	// Error response from bugzilla server upon bug request
 	static final String ERROR_INVALID_BUG_ID = "InvalidBugId";
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfigurationFactory.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfigurationFactory.java
index 0b953d9ec..ea9fb08e4 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfigurationFactory.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfigurationFactory.java
@@ -34,7 +34,7 @@ public class RepositoryConfigurationFactory extends AbstractReportFactory {
 
 	public RepositoryConfiguration getConfiguration(String repositoryUrl, Proxy proxySettings, String userName,
 			String password, String encoding) throws IOException, KeyManagementException, LoginException,
-			NoSuchAlgorithmException {
+			NoSuchAlgorithmException, BugzillaException {
 		String configUrlStr = repositoryUrl + CONFIG_RDF_URL;
 		configUrlStr = BugzillaRepositoryUtil.addCredentials(configUrlStr, userName, password);
 		URL url = new URL(configUrlStr);
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryReportFactory.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryReportFactory.java
index fa757257a..44e91347b 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryReportFactory.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryReportFactory.java
@@ -34,7 +34,7 @@ public class RepositoryReportFactory extends AbstractReportFactory {
 
 	public void populateReport(RepositoryTaskData bugReport, String repositoryUrl, Proxy proxySettings,
 			String userName, String password, String characterEncoding) throws LoginException, KeyManagementException,
-			NoSuchAlgorithmException, IOException {
+			NoSuchAlgorithmException, IOException, BugzillaException {
 
 		SaxBugReportContentHandler contentHandler = new SaxBugReportContentHandler(bugzillaAttributeFactory, bugReport);
 
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/UnrecognizedReponseException.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/UnrecognizedReponseException.java
index 8a1bd7f9a..a99baa931 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/UnrecognizedReponseException.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/UnrecognizedReponseException.java
@@ -11,12 +11,11 @@
 
 package org.eclipse.mylar.internal.bugzilla.core;
 
-import java.io.IOException;
 
 /**
  * @author Rob Elves
  */
-public class UnrecognizedReponseException extends IOException {
+public class UnrecognizedReponseException extends BugzillaException {
 	private static final long serialVersionUID = 8419167415822022988L;
 
 	public UnrecognizedReponseException(String message) {