Completed: Bug 118885: Decouple task list and context reading from Eclipse

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

12 files changed, 45 insertions, 40 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java
index 9a95b0376..b4b72de11 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java
@@ -42,7 +42,7 @@ import org.eclipse.mylar.bugzilla.core.offline.OfflineReportsFile;
 import org.eclipse.mylar.bugzilla.ui.actions.AbstractOfflineReportsAction;
 import org.eclipse.mylar.bugzilla.ui.actions.DeleteOfflineReportAction;
 import org.eclipse.mylar.bugzilla.ui.actions.ViewOfflineReportAction;
-import org.eclipse.mylar.core.MylarPlugin;
+import org.eclipse.mylar.core.util.ErrorLogger;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
@@ -498,7 +498,7 @@ public class OfflineView extends ViewPart {
 						file.add(bug, saveChosen);
 						bug.setOfflineState(true);
 					} catch (CoreException e) {
-						MylarPlugin.fail(e, e.getMessage(), false);
+						ErrorLogger.fail(e, e.getMessage(), false);
 					}
 		//			file.sort(OfflineReportsFile.lastSel);
 				}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaQueryCategoryAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaQueryCategoryAction.java
index 76c1dae38..8b5586e06 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaQueryCategoryAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaQueryCategoryAction.java
@@ -22,6 +22,7 @@ import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaCustomQuery;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaQueryCategory;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaQueryDialog;
 import org.eclipse.mylar.core.MylarPlugin;
+import org.eclipse.mylar.core.util.ErrorLogger;
 import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.widgets.Display;
@@ -72,7 +73,7 @@ public class CreateBugzillaQueryCategoryAction extends Action implements IViewAc
 	            try {
 	            	service.run(true, true, op);
 	            } catch (Exception e) {
-	            	MylarPlugin.log(e, "There was a problem executing the query refresh");
+	            	ErrorLogger.log(e, "There was a problem executing the query refresh");
 	            }  
     		}
             if(TaskListView.getDefault() != null)
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java
index 1e8f475fd..bf4602f10 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/AbstractBugEditor.java
@@ -55,7 +55,7 @@ import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlineNode;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlinePage;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaReportSelection;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTaskEditor;
-import org.eclipse.mylar.core.MylarPlugin;
+import org.eclipse.mylar.core.util.ErrorLogger;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.custom.ScrolledComposite;
@@ -1209,7 +1209,7 @@ public abstract class AbstractBugEditor extends EditorPart implements Listener {
 			changeDirtyStatus(false);
 			OfflineView.saveOffline(getBug(), true);
 		} catch (Exception e) {
-			MylarPlugin.fail(e, "bug save offline failed", true);
+			ErrorLogger.fail(e, "bug save offline failed", true);
 		}
 		//		OfflineView.checkWindow();
 		//		OfflineView.refreshView();
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java
index 39090e524..e726e33a0 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java
@@ -56,7 +56,7 @@ import org.eclipse.mylar.bugzilla.ui.WebBrowserDialog;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlineNode;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaReportSelection;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask;
-import org.eclipse.mylar.core.MylarPlugin;
+import org.eclipse.mylar.core.util.ErrorLogger;
 import org.eclipse.mylar.tasklist.ITask;
 import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
@@ -434,7 +434,7 @@ public class ExistingBugEditor extends AbstractBugEditor {
 				try {
 					op.run(monitor);
 				} catch (Exception e) {
-					MylarPlugin.log(e, "Failed to submit bug");
+					ErrorLogger.log(e, "Failed to submit bug");
 					return new Status(Status.ERROR, "org.eclipse.mylar.bugzilla.ui", Status.ERROR, "Failed to submit bug", e);
 				}
 
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java
index c06dd4736..925cfd62f 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/NewBugEditor.java
@@ -34,7 +34,7 @@ import org.eclipse.mylar.bugzilla.ui.WebBrowserDialog;
 import org.eclipse.mylar.bugzilla.ui.actions.RefreshBugzillaReportsAction;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlineNode;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaReportSelection;
-import org.eclipse.mylar.core.MylarPlugin;
+import org.eclipse.mylar.core.util.ErrorLogger;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -269,7 +269,7 @@ public class NewBugEditor extends AbstractBugEditor {
 				try{
 					op.run(monitor);
 				} catch (Exception e){
-					MylarPlugin.log(e, "Failed to submit bug");
+					ErrorLogger.log(e, "Failed to submit bug");
 					return new Status(Status.ERROR, "org.eclipse.mylar.bugzilla.ui", Status.ERROR, "Failed to submit bug", e);
 				}
 				
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlinePage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlinePage.java
index 2d02867e7..36f183c9e 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlinePage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlinePage.java
@@ -20,7 +20,7 @@ import org.eclipse.mylar.bugzilla.core.BugzillaTools;
 import org.eclipse.mylar.bugzilla.core.IBugzillaReportSelection;
 import org.eclipse.mylar.bugzilla.ui.BugzillaImages;
 import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor;
-import org.eclipse.mylar.core.MylarPlugin;
+import org.eclipse.mylar.core.util.ErrorLogger;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.ISelectionListener;
@@ -107,7 +107,7 @@ public class BugzillaOutlinePage extends ContentOutlinePage{
 			viewer.setComparer(new BugzillaOutlineComparer());
 			viewer.expandAll();
 		} catch (Exception e) {  
-			MylarPlugin.fail(e, "could not create bugzilla outline", true);
+			ErrorLogger.fail(e, "could not create bugzilla outline", true);
 		}
 		getSite().getPage().addSelectionListener(selectionListener);
 	}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaCategorySearchOperation.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaCategorySearchOperation.java
index 8177cf91b..8645f765a 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaCategorySearchOperation.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaCategorySearchOperation.java
@@ -25,7 +25,7 @@ import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchEngine;
 import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchQuery;
 import org.eclipse.mylar.bugzilla.core.search.IBugzillaSearchOperation;
 import org.eclipse.mylar.bugzilla.ui.search.BugzillaResultCollector;
-import org.eclipse.mylar.core.MylarPlugin;
+import org.eclipse.mylar.core.util.ErrorLogger;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 
 
@@ -98,11 +98,11 @@ public class BugzillaCategorySearchOperation extends WorkspaceModifyOperation
 		    // check the status so that we don't keep searching if there
 		    // is a problem
 		    if (status.getCode() == IStatus.CANCEL) {
-		        MylarPlugin.log("search cancelled", this);
+		        ErrorLogger.log("search cancelled", this);
 		        return null;
 		    } else if (!status.isOK()) {
-		        MylarPlugin.log("search error", this);
-		        MylarPlugin.log(status);
+		        ErrorLogger.log("search error", this);
+		        ErrorLogger.log(status);
 		        return null;
 		    }
 		    isMaxReached = engine.isMaxReached();
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTask.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTask.java
index 2abb00d15..d3f5be468 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTask.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTask.java
@@ -34,6 +34,7 @@ import org.eclipse.mylar.bugzilla.ui.BugzillaImages;
 import org.eclipse.mylar.bugzilla.ui.BugzillaUiPlugin;
 import org.eclipse.mylar.bugzilla.ui.OfflineView;
 import org.eclipse.mylar.core.MylarPlugin;
+import org.eclipse.mylar.core.util.ErrorLogger;
 import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.internal.Task;
 import org.eclipse.mylar.tasklist.ui.TaskListImages;
@@ -238,7 +239,7 @@ public class BugzillaTask extends Task {
 		try {
 			// XXX make sure to send in the server name if there are multiple repositories
 			if (BugzillaPlugin.getDefault() == null) {
-				MylarPlugin.log("Bug Beport download failed for: " + getBugId(getHandleIdentifier()) + " due to bugzilla core not existing", this);
+				ErrorLogger.log("Bug Beport download failed for: " + getBugId(getHandleIdentifier()) + " due to bugzilla core not existing", this);
 				return null;
 			}
 			return BugzillaRepository.getInstance().getBug(getBugId(getHandleIdentifier()));
@@ -376,7 +377,7 @@ public class BugzillaTask extends Task {
 						});
 					}
 				} catch (Exception ex) {
-					MylarPlugin.log(ex, "couldn't open bugzilla task");
+					ErrorLogger.log(ex, "couldn't open bugzilla task");
 					return;
 				}
 			}
@@ -414,7 +415,7 @@ public class BugzillaTask extends Task {
 				notifyTaskDataChange();
 				saveBugReport(true);
 			} catch (Exception e) {
-				MylarPlugin.fail(e, "Could not download report", false);
+				ErrorLogger.fail(e, "Could not download report", false);
 			}
 			if (BugzillaUiPlugin.getDefault() != null) {
 				BugzillaUiPlugin.getDefault().getBugzillaRefreshManager().removeRefreshingTask(BugzillaTask.this);
@@ -438,7 +439,7 @@ public class BugzillaTask extends Task {
 			} 
 			this.setDescription(HtmlStreamTokenizer.unescape(BugzillaTask.getBugId(getHandleIdentifier()) + ": " + bugReport.getSummary()));
 		} catch (NullPointerException npe) {
-			MylarPlugin.fail(npe, "Task details update failed", false);
+			ErrorLogger.fail(npe, "Task details update failed", false);
 		}
 	}
 
@@ -468,7 +469,7 @@ public class BugzillaTask extends Task {
 				return new Status(IStatus.OK, MylarPlugin.IDENTIFIER, IStatus.OK, "", null);
 			} catch (Exception e) {
 				//				MessageDialog.openError(null, "Error Opening Bug", "Unable to open Bug report: " + BugzillaTask.getBugId(bugTask.getHandle()));
-				MylarPlugin.fail(e, "Unable to open Bug report: " + BugzillaTask.getBugId(bugTask.getHandleIdentifier()), true);
+				ErrorLogger.fail(e, "Unable to open Bug report: " + BugzillaTask.getBugId(bugTask.getHandleIdentifier()), true);
 			}
 			return Status.CANCEL_STATUS;
 		}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java
index b2cc85b6e..750535ecf 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java
@@ -16,7 +16,7 @@ import java.util.Date;
 import org.eclipse.mylar.bugzilla.ui.BugzillaUiPlugin;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask.BugReportSyncState;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask.BugTaskState;
-import org.eclipse.mylar.core.MylarPlugin;
+import org.eclipse.mylar.core.util.ErrorLogger;
 import org.eclipse.mylar.tasklist.ITaskCategory;
 import org.eclipse.mylar.tasklist.IQuery;
 import org.eclipse.mylar.tasklist.ITask;
@@ -39,6 +39,10 @@ import org.w3c.dom.NodeList;
  */
 public class BugzillaTaskExternalizer extends DelegatingLocalTaskExternalizer {
 
+	private static final String STATUS_RESO = "RESO";
+
+	private static final String STATUS_NEW = "NEW";
+
 	public static final String BUGZILLA_ARCHIVE_LABEL = "Archived Reports "
 			+ DelegatingLocalTaskExternalizer.LABEL_AUTOMATIC;
 
@@ -74,7 +78,7 @@ public class BugzillaTaskExternalizer extends DelegatingLocalTaskExternalizer {
 			try {
 				createTaskElement(task, doc, node);
 			} catch (Exception e) {
-				MylarPlugin.log(e, e.getMessage());
+				ErrorLogger.log(e, e.getMessage());
 			}
 
 		}
@@ -172,23 +176,21 @@ public class BugzillaTaskExternalizer extends DelegatingLocalTaskExternalizer {
 
 	public Element createTaskElement(ITask task, Document doc, Element parent) {
 		Element node = super.createTaskElement(task, doc, parent);
-		BugzillaTask bt = (BugzillaTask) task;
+		BugzillaTask bugzillaTask = (BugzillaTask) task;
 		node.setAttribute(BUGZILLA, TRUE);
-		if (bt.getLastRefresh() != null) {
-			node.setAttribute(LAST_DATE, new Long(bt.getLastRefresh().getTime()).toString());
+		if (bugzillaTask.getLastRefresh() != null) {
+			node.setAttribute(LAST_DATE, new Long(bugzillaTask.getLastRefresh().getTime()).toString());
 		} else {
 			node.setAttribute(LAST_DATE, new Long(new Date().getTime()).toString());
 		}
 
-		node.setAttribute(SYNC_STATE, bt.getSyncState().toString());
+		node.setAttribute(SYNC_STATE, bugzillaTask.getSyncState().toString());
 
-		if (bt.isDirty()) {
+		if (bugzillaTask.isDirty()) {
 			node.setAttribute(DIRTY, TRUE);
 		} else {
 			node.setAttribute(DIRTY, FALSE);
 		}
-		// bt.saveBugReport(false); // XXX don't think that this needs to be
-		// done, should be handled already
 		return node;
 	}
 
@@ -226,10 +228,10 @@ public class BugzillaTaskExternalizer extends DelegatingLocalTaskExternalizer {
 		}
 		try {
 			if (task.readBugReport() == false) {
-				MylarPlugin.log("Failed to read bug report", null);
+				ErrorLogger.log("Failed to read bug report", null);
 			}
 		} catch (Exception e) {
-			MylarPlugin.log(e, "Failed to read bug report");
+			ErrorLogger.log(e, "Failed to read bug report");
 		}
 
 		if (element.hasAttribute(SYNC_STATE)) {
@@ -282,9 +284,9 @@ public class BugzillaTaskExternalizer extends DelegatingLocalTaskExternalizer {
 		if (element.hasAttribute(COMPLETE)) {
 			status = element.getAttribute(COMPLETE);
 			if (status.equals(TRUE))
-				status = "RESO";
+				status = STATUS_RESO;
 			else
-				status = "NEW";
+				status = STATUS_NEW;
 		} else {
 			throw new TaskListExternalizerException("Description not stored for bug report");
 		}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskHandler.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskHandler.java
index f8335a790..03d789313 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskHandler.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskHandler.java
@@ -25,6 +25,7 @@ import org.eclipse.mylar.bugzilla.ui.ViewBugzillaAction;
 import org.eclipse.mylar.bugzilla.ui.actions.RefreshBugzillaAction;
 import org.eclipse.mylar.bugzilla.ui.actions.RefreshBugzillaReportsAction;
 import org.eclipse.mylar.core.MylarPlugin;
+import org.eclipse.mylar.core.util.ErrorLogger;
 import org.eclipse.mylar.tasklist.IQueryHit;
 import org.eclipse.mylar.tasklist.ITask;
 import org.eclipse.mylar.tasklist.ITaskCategory;
@@ -87,7 +88,7 @@ public class BugzillaTaskHandler implements ITaskHandler {
 			try {
 				TaskListView.getDefault().closeTaskEditors(task, page);
 			} catch (Exception e) {
-				MylarPlugin.log(e, " deletion failed");
+				ErrorLogger.log(e, " deletion failed");
 			}
 		}
 		TaskListView.getDefault().getViewer().refresh();
@@ -215,7 +216,7 @@ public class BugzillaTaskHandler implements ITaskHandler {
 				page.closeEditor(editor, false);
 			}
 		} catch (Exception e){
-			MylarPlugin.log(e, "Error while trying to close a bugzilla task");
+			ErrorLogger.log(e, "Error while trying to close a bugzilla task");
 		}
 	}
 
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java
index bf35f20c9..4f7aef184 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractBugWizard.java
@@ -33,7 +33,7 @@ import org.eclipse.mylar.bugzilla.ui.BugzillaUiPlugin;
 import org.eclipse.mylar.bugzilla.ui.WebBrowserDialog;
 import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor;
 import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditorInput;
-import org.eclipse.mylar.core.MylarPlugin;
+import org.eclipse.mylar.core.util.ErrorLogger;
 import org.eclipse.search.internal.ui.SearchMessages;
 import org.eclipse.search.internal.ui.util.ExceptionHandler;
 import org.eclipse.swt.widgets.Display;
@@ -296,7 +296,7 @@ public abstract class AbstractBugWizard extends Wizard implements INewWizard {
 		try {
 			service.run(false, false, op);
 		} catch (Exception e) {
-			MylarPlugin.log(e, "Unable to submit bug");
+			ErrorLogger.log(e, "Unable to submit bug");
 		} 
 		return sentSuccessfully;
 	}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardDataPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardDataPage.java
index 93e43857e..f038dafb5 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardDataPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/AbstractWizardDataPage.java
@@ -23,7 +23,7 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.mylar.bugzilla.core.Attribute;
 import org.eclipse.mylar.bugzilla.core.NewBugModel;
 import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor;
-import org.eclipse.mylar.core.MylarPlugin;
+import org.eclipse.mylar.core.util.ErrorLogger;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
@@ -348,7 +348,7 @@ public abstract class AbstractWizardDataPage extends WizardPage implements Liste
 					// do nothing
 				}
 			} catch (IllegalArgumentException e) {
-				MylarPlugin.fail(e, "could not set attribute: " + attribute, false);
+				ErrorLogger.fail(e, "could not set attribute: " + attribute, false);
 			}
 		}
 		wizard.attributeCompleted = true;
@@ -719,7 +719,7 @@ public abstract class AbstractWizardDataPage extends WizardPage implements Liste
 			if (bugzillaOS != null) opSysAttribute.setValue(bugzillaOS);
 			if (bugzillaPlatform != null) platformAttribute.setValue(bugzillaPlatform);
 		} catch (Exception e) {
-			MylarPlugin.fail(e, "could not set platform options", false);
+			ErrorLogger.fail(e, "could not set platform options", false);
 		}
 	}