Progress on: Bug 119300: fix setting of elapsed time to 0

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

14 files changed, 102 insertions, 101 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaImages.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaImages.java
index c953ce5f4..6e3d97ee8 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaImages.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaImages.java
@@ -15,7 +15,7 @@ import java.net.URL;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.mylar.tasklist.TasklistImages.MylarTasklistOverlayDescriptor;
+import org.eclipse.mylar.tasklist.ui.TaskListImages.MylarTasklistOverlayDescriptor;
 import org.eclipse.swt.graphics.Image;
 
 /**
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 17d0c1874..76c1dae38 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,7 +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.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IViewActionDelegate;
@@ -59,8 +59,8 @@ public class CreateBugzillaQueryCategoryAction extends Action implements IViewAc
         	} else {
         		queryCategory = new BugzillaCustomQuery(sqd.getName(), sqd.getUrl(), sqd.getMaxHits());
         	}
-    		MylarTasklistPlugin.getTaskListManager().addQuery(queryCategory);
-        	boolean offline = MylarTasklistPlugin.getPrefs().getBoolean(MylarPlugin.WORK_OFFLINE);
+    		MylarTaskListPlugin.getTaskListManager().addQuery(queryCategory);
+        	boolean offline = MylarTaskListPlugin.getPrefs().getBoolean(MylarPlugin.WORK_OFFLINE);
     		if(!offline){
 	            WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
 	            	protected void execute(IProgressMonitor monitor) throws CoreException {
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaTaskAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaTaskAction.java
index 0ff1d8f7f..bb9faa031 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaTaskAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateBugzillaTaskAction.java
@@ -20,7 +20,7 @@ import org.eclipse.mylar.bugzilla.ui.BugzillaUiPlugin;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask;
 import org.eclipse.mylar.tasklist.ITask;
 import org.eclipse.mylar.tasklist.ITaskHandler;
-import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.internal.TaskCategory;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.ui.IViewActionDelegate;
@@ -78,7 +78,7 @@ public class CreateBugzillaTaskAction extends Action implements IViewActionDeleg
 	    		"<bugzilla info>", true, true);				
 	    Object selectedObject = ((IStructuredSelection)TaskListView.getDefault().getViewer().getSelection()).getFirstElement();
     	
-	    ITaskHandler taskHandler = MylarTasklistPlugin.getDefault().getTaskHandlerForElement(newTask);
+	    ITaskHandler taskHandler = MylarTaskListPlugin.getDefault().getTaskHandlerForElement(newTask);
 	    if(taskHandler != null){
 	    	ITask addedTask = taskHandler.taskAdded(newTask);
 	    	if(addedTask instanceof BugzillaTask){
@@ -96,7 +96,7 @@ public class CreateBugzillaTaskAction extends Action implements IViewActionDeleg
 	    if (selectedObject instanceof TaskCategory){
 	        ((TaskCategory)selectedObject).addTask(newTask);
 	    } else { 
-	        MylarTasklistPlugin.getTaskListManager().addRootTask(newTask);
+	        MylarTaskListPlugin.getTaskListManager().addRootTask(newTask);
 	    }
 	    BugzillaUiPlugin.getDefault().getBugzillaTaskListManager().addToBugzillaTaskRegistry((BugzillaTask)newTask);
 //	    
@@ -109,7 +109,7 @@ public class CreateBugzillaTaskAction extends Action implements IViewActionDeleg
 //	    if (selectedObject instanceof TaskCategory){
 //	        ((TaskCategory)selectedObject).addTask((ITask)bugTask);
 //	    } else { 
-//	        MylarTasklistPlugin.getTaskListManager().getTaskList().addRootTask((ITask)bugTask);
+//	        MylarTaskListPlugin.getTaskListManager().getTaskList().addRootTask((ITask)bugTask);
 //	    }
 	    if(TaskListView.getDefault() != null)
 			TaskListView.getDefault().getViewer().refresh();
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateNewBugzillaTaskAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateNewBugzillaTaskAction.java
index 271860cd5..9f770f199 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateNewBugzillaTaskAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/CreateNewBugzillaTaskAction.java
@@ -24,7 +24,7 @@ import org.eclipse.mylar.bugzilla.ui.wizard.NewBugWizard;
 import org.eclipse.mylar.core.MylarPlugin;
 import org.eclipse.mylar.tasklist.ITask;
 import org.eclipse.mylar.tasklist.ITaskHandler;
-import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.internal.TaskCategory;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.widgets.Shell;
@@ -49,7 +49,7 @@ public class CreateNewBugzillaTaskAction extends Action implements IViewActionDe
 	@Override
 	public void run() {
 		
-		boolean offline = MylarTasklistPlugin.getPrefs().getBoolean(MylarPlugin.WORK_OFFLINE);
+		boolean offline = MylarTaskListPlugin.getPrefs().getBoolean(MylarPlugin.WORK_OFFLINE);
 		if(offline){
 			MessageDialog.openInformation(null, "Unable to create bug report", "Unable to create a new bug report since you are currently offline");
 			return;
@@ -91,7 +91,7 @@ public class CreateNewBugzillaTaskAction extends Action implements IViewActionDe
 		    if(TaskListView.getDefault() != null)
 		    	selectedObject = ((IStructuredSelection)TaskListView.getDefault().getViewer().getSelection()).getFirstElement();
 	    	
-		    ITaskHandler taskHandler = MylarTasklistPlugin.getDefault().getTaskHandlerForElement(newTask);
+		    ITaskHandler taskHandler = MylarTaskListPlugin.getDefault().getTaskHandlerForElement(newTask);
 		    if(taskHandler != null){
 		    	ITask addedTask = taskHandler.taskAdded(newTask);
 		    	if(addedTask instanceof BugzillaTask){
@@ -105,7 +105,7 @@ public class CreateNewBugzillaTaskAction extends Action implements IViewActionDe
 		    if (selectedObject instanceof TaskCategory){
 		        ((TaskCategory)selectedObject).addTask(newTask);
 		    } else { 
-		        MylarTasklistPlugin.getTaskListManager().addRootTask(newTask);
+		        MylarTaskListPlugin.getTaskListManager().addRootTask(newTask);
 		    }
 		    BugzillaUiPlugin.getDefault().getBugzillaTaskListManager().addToBugzillaTaskRegistry((BugzillaTask)newTask);
 		    newTask.openTaskInEditor(false);
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaAction.java
index c6a44d982..afcabb813 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaAction.java
@@ -28,7 +28,7 @@ import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask;
 import org.eclipse.mylar.core.MylarPlugin;
 import org.eclipse.mylar.tasklist.IQueryHit;
 import org.eclipse.mylar.tasklist.ITask;
-import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.internal.TaskCategory;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.widgets.Display;
@@ -60,7 +60,7 @@ public class RefreshBugzillaAction extends Action implements IViewActionDelegate
 	@Override
 	public void run() {
 		
-		boolean offline = MylarTasklistPlugin.getPrefs().getBoolean(MylarPlugin.WORK_OFFLINE);
+		boolean offline = MylarTaskListPlugin.getPrefs().getBoolean(MylarPlugin.WORK_OFFLINE);
 		if(offline){
 			MessageDialog.openInformation(null, "Unable to refresh query", "Unable to refresh the query since you are currently offline");
 			return;
@@ -121,11 +121,11 @@ public class RefreshBugzillaAction extends Action implements IViewActionDelegate
 				BugzillaUiPlugin.getDefault().getBugzillaRefreshManager().requestRefresh(hit.getAssociatedTask());
 			}
 		}
-		for(ITask task: MylarTasklistPlugin.getTaskListManager().getTaskList().getActiveTasks()){
+		for(ITask task: MylarTaskListPlugin.getTaskListManager().getTaskList().getActiveTasks()){
 			if(task instanceof BugzillaTask){
-				ITask found = MylarTasklistPlugin.getTaskListManager().getTaskForHandle(task.getHandleIdentifier(), false);
+				ITask found = MylarTaskListPlugin.getTaskListManager().getTaskForHandle(task.getHandleIdentifier(), false);
 				if(found == null){
-					MylarTasklistPlugin.getTaskListManager().addRootTask(task);
+					MylarTaskListPlugin.getTaskListManager().addRootTask(task);
 					MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Bugzilla Task Moved To Root", "Bugzilla Task " + 
 							BugzillaTask.getBugId(task.getHandleIdentifier()) + 
 							" has been moved to the root since it is activated and has disappeared from a query.");
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaReportsAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaReportsAction.java
index b1b25f942..cc3ad6474 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaReportsAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/RefreshBugzillaReportsAction.java
@@ -26,11 +26,11 @@ import org.eclipse.mylar.bugzilla.ui.BugzillaUiPlugin;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaQueryCategory;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask;
 import org.eclipse.mylar.core.MylarPlugin;
-import org.eclipse.mylar.tasklist.ITaskListCategory;
+import org.eclipse.mylar.tasklist.ITaskCategory;
 import org.eclipse.mylar.tasklist.IQuery;
 import org.eclipse.mylar.tasklist.IQueryHit;
 import org.eclipse.mylar.tasklist.ITask;
-import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.internal.TaskCategory;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.widgets.Display;
@@ -59,7 +59,7 @@ public class RefreshBugzillaReportsAction extends Action implements IViewActionD
 
 	@Override
 	public void run() {
-		boolean offline = MylarTasklistPlugin.getPrefs().getBoolean(MylarPlugin.WORK_OFFLINE);
+		boolean offline = MylarTaskListPlugin.getPrefs().getBoolean(MylarPlugin.WORK_OFFLINE);
 		if(offline){
 			MessageDialog.openInformation(null, "Unable to refresh query", "Unable to refresh the query since you are currently offline");
 			return;
@@ -69,11 +69,11 @@ public class RefreshBugzillaReportsAction extends Action implements IViewActionD
 		// perform the update in an operation so that we get a progress monitor
 		// update the structure bridge cache with the reference provider cached
 		// bugs
-		for(ITask task: MylarTasklistPlugin.getTaskListManager().getTaskList().getActiveTasks()){
+		for(ITask task: MylarTaskListPlugin.getTaskListManager().getTaskList().getActiveTasks()){
 			if(task instanceof BugzillaTask){
-				ITask found = MylarTasklistPlugin.getTaskListManager().getTaskForHandle(task.getHandleIdentifier(), false);
+				ITask found = MylarTaskListPlugin.getTaskListManager().getTaskForHandle(task.getHandleIdentifier(), false);
 				if(found == null){
-					MylarTasklistPlugin.getTaskListManager().addRootTask(task);
+					MylarTaskListPlugin.getTaskListManager().addRootTask(task);
 					MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Bugzilla Task Moved To Root", "Bugzilla Task " + 
 							BugzillaTask.getBugId(task.getHandleIdentifier()) + 
 							" has been moved to the root since it is activated and has disappeared from a query.");
@@ -100,11 +100,11 @@ public class RefreshBugzillaReportsAction extends Action implements IViewActionD
 //// XXX refactored active search
 //				// clear the caches
 ////				Set<String> cachedHandles = new HashSet<String>();
-////				cachedHandles.addAll(MylarTasklistPlugin.getDefault().getStructureBridge().getCachedHandles());
-////				cachedHandles.addAll(MylarTasklistPlugin.getReferenceProvider().getCachedHandles());
-////				MylarTasklistPlugin.getDefault().getStructureBridge().clearCache();
-////				MylarTasklistPlugin.getReferenceProvider().clearCachedReports();
-////				BugzillaStructureBridge bridge = MylarTasklistPlugin.getDefault().getStructureBridge();
+////				cachedHandles.addAll(MylarTaskListPlugin.getDefault().getStructureBridge().getCachedHandles());
+////				cachedHandles.addAll(MylarTaskListPlugin.getReferenceProvider().getCachedHandles());
+////				MylarTaskListPlugin.getDefault().getStructureBridge().clearCache();
+////				MylarTaskListPlugin.getReferenceProvider().clearCachedReports();
+////				BugzillaStructureBridge bridge = MylarTaskListPlugin.getDefault().getStructureBridge();
 //				
 ////				monitor.beginTask("Downloading Bugs", cachedHandles.size());
 ////				for (String key : cachedHandles) {
@@ -154,14 +154,14 @@ public class RefreshBugzillaReportsAction extends Action implements IViewActionD
 	}
 
 	private void refreshTasksAndQueries() {
-		List<ITask> tasks = MylarTasklistPlugin.getTaskListManager().getTaskList().getRootTasks();
+		List<ITask> tasks = MylarTaskListPlugin.getTaskListManager().getTaskList().getRootTasks();
 
 		for (ITask task : tasks) {
 			if (task instanceof BugzillaTask && !task.isCompleted()) {
 				BugzillaUiPlugin.getDefault().getBugzillaRefreshManager().requestRefresh((BugzillaTask)task);
 			}
 		}
-		for (ITaskListCategory cat : MylarTasklistPlugin.getTaskListManager().getTaskList().getCategories()) {
+		for (ITaskCategory cat : MylarTaskListPlugin.getTaskListManager().getTaskList().getCategories()) {
 			
 			if (cat instanceof TaskCategory) {
 				for (ITask task : ((TaskCategory) cat).getChildren()) {
@@ -180,7 +180,7 @@ public class RefreshBugzillaReportsAction extends Action implements IViewActionD
 				}
 			}
 		}	
-		for(IQuery query: MylarTasklistPlugin
+		for(IQuery query: MylarTaskListPlugin
 				.getTaskListManager().getTaskList().getQueries()){
 			if(!(query instanceof BugzillaQueryCategory)){
 				continue;
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 b7c76499c..39090e524 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
@@ -58,7 +58,7 @@ 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.tasklist.ITask;
-import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
@@ -442,11 +442,11 @@ public class ExistingBugEditor extends AbstractBugEditor {
 					public void run() {
 						if (TaskListView.getDefault() != null && TaskListView.getDefault().getViewer() != null) {
 							String handle = BugzillaUiPlugin.getDefault().createBugHandleIdentifier(bug.getId());
-							ITask task = MylarTasklistPlugin.getTaskListManager().getTaskForHandle(handle, false);
+							ITask task = MylarTaskListPlugin.getTaskListManager().getTaskForHandle(handle, false);
 							if (task instanceof BugzillaTask) {
 								BugzillaUiPlugin.getDefault().getBugzillaRefreshManager().requestRefresh(
 										(BugzillaTask)task);
-//								ITaskHandler taskHandler = MylarTasklistPlugin.getDefault().getTaskHandlerForElement(task);
+//								ITaskHandler taskHandler = MylarTaskListPlugin.getDefault().getTaskHandlerForElement(task);
 //							    if(taskHandler != null) { 
 //						    		taskHandler.itemOpened(task);
 //							    }
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaHit.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaHit.java
index 44076904c..419aea889 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaHit.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaHit.java
@@ -17,13 +17,14 @@ import org.eclipse.mylar.bugzilla.ui.BugzillaImages;
 import org.eclipse.mylar.bugzilla.ui.BugzillaUiPlugin;
 import org.eclipse.mylar.tasklist.IQueryHit;
 import org.eclipse.mylar.tasklist.ITask;
-import org.eclipse.mylar.tasklist.TasklistImages;
+import org.eclipse.mylar.tasklist.ui.TaskListImages;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
 
 /**
  * @author Ken Sueda
+ * @author Mik Kersten (hardening of prototype)
  */
 public class BugzillaHit implements IQueryHit {
 
@@ -66,7 +67,7 @@ public class BugzillaHit implements IQueryHit {
 		if (hasCorrespondingActivatableTask()) {
     		return task.getStatusIcon();
     	} else {
-    		return TasklistImages.getImage(TasklistImages.TASK_INACTIVE);
+    		return TaskListImages.getImage(TaskListImages.TASK_INACTIVE);
     	}  
 	}
 
@@ -143,7 +144,7 @@ public class BugzillaHit implements IQueryHit {
 
 	public Color getForeground() {
         if ((task != null && task.isCompleted()) || isCompleted()){
-        	return GRAY_LIGHT;
+        	return TaskListImages.GRAY_LIGHT;
         } else {
         	return null;
         }
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryCategory.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryCategory.java
index 1160bb320..3ac44058d 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryCategory.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryCategory.java
@@ -34,8 +34,8 @@ import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaCategorySearchOperation.IC
 import org.eclipse.mylar.tasklist.IQuery;
 import org.eclipse.mylar.tasklist.IQueryHit;
 import org.eclipse.mylar.tasklist.ITaskListElement;
-import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
-import org.eclipse.mylar.tasklist.TasklistImages;
+import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
+import org.eclipse.mylar.tasklist.ui.TaskListImages;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
@@ -109,7 +109,7 @@ public class BugzillaQueryCategory implements IQuery {
 	}
 
 	public Image getIcon() {
-		return TasklistImages.getImage(BugzillaImages.CATEGORY_QUERY);
+		return TaskListImages.getImage(BugzillaImages.CATEGORY_QUERY);
 	}
 
 	public String getQueryString() {
@@ -219,7 +219,7 @@ public class BugzillaQueryCategory implements IQuery {
 				BugzillaHit hit = (BugzillaHit) child;
 				BugzillaTask task = hit.getAssociatedTask();
 				if (task != null && task.isActive()) {
-					return MylarTasklistPlugin.ACTIVE_TASK;
+					return MylarTaskListPlugin.ACTIVE_TASK;
 				}
 			}
 		}
@@ -232,7 +232,7 @@ public class BugzillaQueryCategory implements IQuery {
 				BugzillaHit hit = (BugzillaHit) child;
 				BugzillaTask task = hit.getAssociatedTask();
 				if (task != null && task.isActive()) {
-					return BOLD;
+					return TaskListImages.BOLD;
 				}
 			}
 		}
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 0d05408b5..2abb00d15 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,9 +34,9 @@ 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.tasklist.MylarTasklistPlugin;
-import org.eclipse.mylar.tasklist.Task;
-import org.eclipse.mylar.tasklist.TasklistImages;
+import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
+import org.eclipse.mylar.tasklist.internal.Task;
+import org.eclipse.mylar.tasklist.ui.TaskListImages;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
@@ -330,8 +330,8 @@ public class BugzillaTask extends Task {
 		Workbench.getInstance().getDisplay().asyncExec(new Runnable() {
 			public void run() {
 				try {
-					MylarTasklistPlugin.ReportOpenMode mode = MylarTasklistPlugin.getDefault().getReportMode();
-					if (mode == MylarTasklistPlugin.ReportOpenMode.EDITOR) {
+					MylarTaskListPlugin.ReportOpenMode mode = MylarTaskListPlugin.getDefault().getReportMode();
+					if (mode == MylarTaskListPlugin.ReportOpenMode.EDITOR) {
 						// if we can reach the server, get the latest for the bug
 						if (!isBugDownloaded() && offline) {
 							MessageDialog.openInformation(null, "Unable to open bug",
@@ -345,12 +345,12 @@ public class BugzillaTask extends Task {
 						}
 					}
 					// get the active workbench page
-					IWorkbenchPage page = MylarTasklistPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+					IWorkbenchPage page = MylarTaskListPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
 					if (page == null)
 						return;
 					page.openEditor(input, "org.eclipse.mylar.bugzilla.ui.tasklist.bugzillaTaskEditor");
 
-					//					else if (mode == MylarTasklistPlugin.ReportOpenMode.INTERNAL_BROWSER) {
+					//					else if (mode == MylarTaskListPlugin.ReportOpenMode.INTERNAL_BROWSER) {
 					//						String title = "Bug #" + BugzillaTask.getBugId(getHandle());
 					//						BugzillaUITools.openUrl(title, title, getBugUrl());	    			
 					//					}
@@ -562,15 +562,15 @@ public class BugzillaTask extends Task {
 	@Override
 	public Image getIcon() {
 		if (syncState == BugReportSyncState.OK) {
-			return TasklistImages.getImage(BugzillaImages.TASK_BUGZILLA);
+			return TaskListImages.getImage(BugzillaImages.TASK_BUGZILLA);
 		} else if (syncState == BugReportSyncState.OUTGOING) {
-			return TasklistImages.getImage(BugzillaImages.TASK_BUGZILLA_OUTGOING);
+			return TaskListImages.getImage(BugzillaImages.TASK_BUGZILLA_OUTGOING);
 		} else if (syncState == BugReportSyncState.INCOMMING) {
-			return TasklistImages.getImage(BugzillaImages.TASK_BUGZILLA_INCOMMING);
+			return TaskListImages.getImage(BugzillaImages.TASK_BUGZILLA_INCOMMING);
 		} else if (syncState == BugReportSyncState.CONFLICT) {
-			return TasklistImages.getImage(BugzillaImages.TASK_BUGZILLA_CONFLICT);
+			return TaskListImages.getImage(BugzillaImages.TASK_BUGZILLA_CONFLICT);
 		} else {
-			return TasklistImages.getImage(BugzillaImages.TASK_BUGZILLA);
+			return TaskListImages.getImage(BugzillaImages.TASK_BUGZILLA);
 		}
 
 	}
@@ -612,7 +612,7 @@ public class BugzillaTask extends Task {
 			return f;
 
 		if (getState() != BugzillaTask.BugTaskState.FREE || bugReport == null) {
-			return ITALIC;
+			return TaskListImages.ITALIC;
 		}
 		return null;
 	}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskEditor.java
index 0059c8648..6116f38f2 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskEditor.java
@@ -21,9 +21,9 @@ import org.eclipse.mylar.bugzilla.core.IBugzillaAttributeListener;
 import org.eclipse.mylar.bugzilla.ui.BugzillaImages;
 import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor;
 import org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditor;
-import org.eclipse.mylar.tasklist.TasklistImages;
 import org.eclipse.mylar.tasklist.ui.MylarTaskEditor;
 import org.eclipse.mylar.tasklist.ui.TaskEditorInput;
+import org.eclipse.mylar.tasklist.ui.TaskListImages;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -51,7 +51,7 @@ public class BugzillaTaskEditor extends MylarTaskEditor {
 
 	private BugzillaTaskEditorInput bugzillaEditorInput;
 	
-//    private TaskSummaryEditor taskSummaryEditor = new TaskSummaryEditor();
+//    private TaskInfoEditor taskSummaryEditor = new TaskInfoEditor();
     
 	protected IContentOutlinePage outlinePage = null;
 	
@@ -68,7 +68,7 @@ public class BugzillaTaskEditor extends MylarTaskEditor {
 		super();
 
 		// get the workbench page and add a listener so we can detect when it closes
-//		IWorkbench wb = MylarTasklistPlugin.getDefault().getWorkbench();
+//		IWorkbench wb = MylarTaskListPlugin.getDefault().getWorkbench();
 //		IWorkbenchWindow aw = wb.getActiveWorkbenchWindow();
 //		IWorkbenchPage ap = aw.getActivePage();
 //		BugzillaTaskEditorListener listener = new BugzillaTaskEditorListener();
@@ -77,7 +77,7 @@ public class BugzillaTaskEditor extends MylarTaskEditor {
 		bugzillaEditor = new ExistingBugEditor();
 		bugzillaEditor.setParentEditor(this);
 		bugzillaEditor.addAttributeListener(ATTRIBUTE_LISTENER);
-//        taskSummaryEditor = new TaskSummaryEditor();
+//        taskSummaryEditor = new TaskInfoEditor();
 //        taskSummaryEditor.setParentEditor(this);
 	}
 
@@ -85,7 +85,7 @@ public class BugzillaTaskEditor extends MylarTaskEditor {
         return bugzillaEditor;
     }
     
-//    public TaskSummaryEditor getTaskEditor(){
+//    public TaskInfoEditor getTaskEditor(){
 //        return taskSummaryEditor;
 //    }
     
@@ -171,7 +171,7 @@ public class BugzillaTaskEditor extends MylarTaskEditor {
 		// Set the title on the editor's tab
 //		this.setPartName("Bug #" + bugzillaEditorInput.getBugId());
 		this.setPartName(bugTask.getDescription(true));
-		this.setTitleImage(TasklistImages.getImage(BugzillaImages.TASK_BUGZILLA));
+		this.setTitleImage(TaskListImages.getImage(BugzillaImages.TASK_BUGZILLA));
 	}
 	
 	@Override
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 89a3f3b99..399b0da67 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
@@ -17,13 +17,13 @@ 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.tasklist.ITaskListCategory;
+import org.eclipse.mylar.tasklist.ITaskCategory;
 import org.eclipse.mylar.tasklist.IQuery;
 import org.eclipse.mylar.tasklist.ITask;
 import org.eclipse.mylar.tasklist.ITaskHandler;
-import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
-import org.eclipse.mylar.tasklist.internal.DefaultTaskListExternalizer;
-import org.eclipse.mylar.tasklist.internal.MylarExternalizerException;
+import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
+import org.eclipse.mylar.tasklist.internal.DelegatingLocalTaskExternalizer;
+import org.eclipse.mylar.tasklist.internal.TaskListExternalizerException;
 import org.eclipse.mylar.tasklist.internal.TaskCategory;
 import org.eclipse.mylar.tasklist.internal.TaskList;
 import org.w3c.dom.Document;
@@ -37,9 +37,9 @@ import org.w3c.dom.NodeList;
  * 
  * @author Mik Kersten and Ken Sueda
  */
-public class BugzillaTaskExternalizer extends DefaultTaskListExternalizer {
+public class BugzillaTaskExternalizer extends DelegatingLocalTaskExternalizer {
 
-	public static final String BUGZILLA_ARCHIVE_LABEL = "Archived Reports " + DefaultTaskListExternalizer.LABEL_AUTOMATIC;
+	public static final String BUGZILLA_ARCHIVE_LABEL = "Archived Reports " + DelegatingLocalTaskExternalizer.LABEL_AUTOMATIC;
 	private static final String BUGZILLA = "Bugzilla";
 	private static final String LAST_DATE = "LastDate";
 	private static final String DIRTY = "Dirty";
@@ -77,7 +77,7 @@ public class BugzillaTaskExternalizer extends DefaultTaskListExternalizer {
 	}
 
 	@Override
-	public void readCategory(Node node, TaskList taskList)  throws MylarExternalizerException {
+	public void readCategory(Node node, TaskList taskList) throws TaskListExternalizerException {
 		Element e = (Element) node;
 		if (e.getNodeName().equals(BUGZILLA_TASK_REGISTRY)) {
 			readRegistry(node, taskList);
@@ -100,7 +100,7 @@ public class BugzillaTaskExternalizer extends DefaultTaskListExternalizer {
 		return node.getNodeName().equals(TAG_BUGZILLA_CUSTOM_QUERY) || node.getNodeName().equals(TAG_BUGZILLA_QUERY);
 	}
 
-	public void readQuery(Node node, TaskList tlist) throws MylarExternalizerException {
+	public void readQuery(Node node, TaskList tlist) throws TaskListExternalizerException {
 		boolean hasCaughtException = false;
 		Element element = (Element) node;
 		IQuery cat = null;
@@ -117,14 +117,14 @@ public class BugzillaTaskExternalizer extends DefaultTaskListExternalizer {
 			Node child = list.item(i);
 			try {
 				readQueryHit(child, tlist, cat);
-			} catch (MylarExternalizerException e) {
+			} catch (TaskListExternalizerException e) {
 				hasCaughtException = true;
 			}
 		}
-		if (hasCaughtException) throw new MylarExternalizerException("Failed to load all tasks");
+		if (hasCaughtException) throw new TaskListExternalizerException("Failed to load all tasks");
 	}
 	
-	public void readRegistry(Node node, TaskList taskList)  throws MylarExternalizerException {
+	public void readRegistry(Node node, TaskList taskList) throws TaskListExternalizerException {
 		boolean hasCaughtException = false;
 		NodeList list = node.getChildNodes();
 		TaskCategory cat = new TaskCategory(BUGZILLA_ARCHIVE_LABEL);
@@ -139,15 +139,15 @@ public class BugzillaTaskExternalizer extends DefaultTaskListExternalizer {
 					BugzillaUiPlugin.getDefault().getBugzillaTaskListManager()
 							.addToBugzillaTaskRegistry((BugzillaTask) task);
 				}
-			} catch (MylarExternalizerException e) {
+			} catch (TaskListExternalizerException e) {
 				hasCaughtException = true;
 			}
 		}
 		
-		if (hasCaughtException) throw new MylarExternalizerException("Failed to restore all tasks");
+		if (hasCaughtException) throw new TaskListExternalizerException("Failed to restore all tasks");
 	}
 	
-	public boolean canCreateElementFor(ITaskListCategory cat) {
+	public boolean canCreateElementFor(ITaskCategory cat) {
 		return false;
 	}
 
@@ -183,19 +183,19 @@ public class BugzillaTaskExternalizer extends DefaultTaskListExternalizer {
 	}
 
 	@Override
-	public ITask readTask(Node node, TaskList tlist, ITaskListCategory category, ITask parent)  throws MylarExternalizerException{
+	public ITask readTask(Node node, TaskList tlist, ITaskCategory category, ITask parent)  throws TaskListExternalizerException{
 		Element element = (Element) node;
 		String handle;
 		String label;
 		if (element.hasAttribute(HANDLE)) {
 			handle = element.getAttribute(HANDLE);
 		} else {
-			throw new MylarExternalizerException("Handle not stored for bug report");
+			throw new TaskListExternalizerException("Handle not stored for bug report");
 		}
 		if (element.hasAttribute(LABEL)) {
 			label = element.getAttribute(LABEL);
 		} else {
-			throw new MylarExternalizerException("Description not stored for bug report");
+			throw new TaskListExternalizerException("Description not stored for bug report");
 		}
 		BugzillaTask task = new BugzillaTask(handle, label, true, false);		
 		readTaskInfo(task, tlist, element, category, parent);
@@ -230,7 +230,7 @@ public class BugzillaTaskExternalizer extends DefaultTaskListExternalizer {
 			}
 		}
 		
-		ITaskHandler taskHandler = MylarTasklistPlugin.getDefault().getTaskHandlerForElement(task);
+		ITaskHandler taskHandler = MylarTaskListPlugin.getDefault().getTaskHandlerForElement(task);
 	    if(taskHandler != null){
     		ITask addedTask = taskHandler.taskAdded(task);
     		if(addedTask instanceof BugzillaTask) task = (BugzillaTask)addedTask;
@@ -244,7 +244,7 @@ public class BugzillaTaskExternalizer extends DefaultTaskListExternalizer {
 		return node.getNodeName().equals(getQueryHitTagName());
 	}
 
-	public void readQueryHit(Node node, TaskList tlist, IQuery query) throws MylarExternalizerException {
+	public void readQueryHit(Node node, TaskList tlist, IQuery query) throws TaskListExternalizerException {
 		Element element = (Element) node;
 		String handle;
 		String label;
@@ -253,17 +253,17 @@ public class BugzillaTaskExternalizer extends DefaultTaskListExternalizer {
 		if (element.hasAttribute(HANDLE)) {
 			handle = element.getAttribute(HANDLE);
 		} else {
-			throw new MylarExternalizerException("Handle not stored for bug report");
+			throw new TaskListExternalizerException("Handle not stored for bug report");
 		}
 		if (element.hasAttribute(NAME)) {
 			label = element.getAttribute(NAME);
 		} else {
-			throw new MylarExternalizerException("Description not stored for bug report");
+			throw new TaskListExternalizerException("Description not stored for bug report");
 		}
 		if (element.hasAttribute(PRIORITY)) {
 			priority = element.getAttribute(PRIORITY);
 		} else {
-			throw new MylarExternalizerException("Description not stored for bug report");
+			throw new TaskListExternalizerException("Description not stored for bug report");
 		}
 		if (element.hasAttribute(COMPLETE)) {
 			status = element.getAttribute(COMPLETE);
@@ -272,7 +272,7 @@ public class BugzillaTaskExternalizer extends DefaultTaskListExternalizer {
 			else
 				status = "NEW";
 		} else {
-			throw new MylarExternalizerException("Description not stored for bug report");
+			throw new TaskListExternalizerException("Description not stored for bug report");
 		}
 		BugzillaHit hit = new BugzillaHit(label, priority, BugzillaTask.getBugId(handle), null, status);
 		query.addHit(hit);
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 12164021f..18493ee2e 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
@@ -27,9 +27,9 @@ import org.eclipse.mylar.bugzilla.ui.actions.RefreshBugzillaReportsAction;
 import org.eclipse.mylar.core.MylarPlugin;
 import org.eclipse.mylar.tasklist.ITask;
 import org.eclipse.mylar.tasklist.ITaskHandler;
-import org.eclipse.mylar.tasklist.ITaskListCategory;
+import org.eclipse.mylar.tasklist.ITaskCategory;
 import org.eclipse.mylar.tasklist.ITaskListElement;
-import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.internal.TaskCategory;
 import org.eclipse.mylar.tasklist.ui.actions.CopyDescriptionAction;
 import org.eclipse.mylar.tasklist.ui.actions.DeleteAction;
@@ -58,7 +58,7 @@ public class BugzillaTaskHandler implements ITaskHandler {
 			if (!deleteConfirmed) 
 				return false;
 			BugzillaQueryCategory query = (BugzillaQueryCategory) element;
-			MylarTasklistPlugin.getTaskListManager().deleteQuery(query);
+			MylarTaskListPlugin.getTaskListManager().deleteQuery(query);
 		} else if (element instanceof BugzillaTask) {
 			BugzillaTask task = (BugzillaTask) element;
 			if (task.isActive()) {
@@ -76,9 +76,9 @@ public class BugzillaTaskHandler implements ITaskHandler {
 				return false;  
 									
 //			task.removeReport();
-			MylarTasklistPlugin.getTaskListManager().deleteTask(task);
-			MylarPlugin.getContextManager().contextDeleted(task.getHandleIdentifier(), task.getPath());
-			IWorkbenchPage page = MylarTasklistPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+			MylarTaskListPlugin.getTaskListManager().deleteTask(task);
+			MylarPlugin.getContextManager().contextDeleted(task.getHandleIdentifier(), task.getContextPath());
+			IWorkbenchPage page = MylarTaskListPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
 
 			// if we couldn't get the page, get out of here
 			if (page == null)
@@ -99,14 +99,14 @@ public class BugzillaTaskHandler implements ITaskHandler {
 
 	public void itemOpened(ITaskListElement element) {
 
-		boolean offline = MylarTasklistPlugin.getPrefs().getBoolean(MylarPlugin.WORK_OFFLINE);
+		boolean offline = MylarTaskListPlugin.getPrefs().getBoolean(MylarPlugin.WORK_OFFLINE);
 		
 		if (element instanceof BugzillaTask) {
 			BugzillaTask t = (BugzillaTask) element;
-			MylarTasklistPlugin.ReportOpenMode mode = MylarTasklistPlugin.getDefault().getReportMode();
-			if (mode == MylarTasklistPlugin.ReportOpenMode.EDITOR) {
+			MylarTaskListPlugin.ReportOpenMode mode = MylarTaskListPlugin.getDefault().getReportMode();
+			if (mode == MylarTaskListPlugin.ReportOpenMode.EDITOR) {
 				t.openTaskInEditor(offline);
-			} else if (mode == MylarTasklistPlugin.ReportOpenMode.INTERNAL_BROWSER) {
+			} else if (mode == MylarTaskListPlugin.ReportOpenMode.INTERNAL_BROWSER) {
 				if(offline){
 					MessageDialog.openInformation(null, "Unable to open bug", "Unable to open the selected bugzilla task since you are currently offline");
 	    			return;
@@ -146,8 +146,8 @@ public class BugzillaTaskHandler implements ITaskHandler {
         	}
 	    } else if(element instanceof BugzillaHit){
 	    	BugzillaHit hit = (BugzillaHit)element;
-	    	MylarTasklistPlugin.ReportOpenMode mode = MylarTasklistPlugin.getDefault().getReportMode();
-	    	if (mode == MylarTasklistPlugin.ReportOpenMode.EDITOR) {
+	    	MylarTaskListPlugin.ReportOpenMode mode = MylarTaskListPlugin.getDefault().getReportMode();
+	    	if (mode == MylarTaskListPlugin.ReportOpenMode.EDITOR) {
 	    		if(hit.hasCorrespondingActivatableTask()){
 		    		hit.getAssociatedTask().openTaskInEditor(offline);
 		    	} else {
@@ -161,7 +161,7 @@ public class BugzillaTaskHandler implements ITaskHandler {
 			    	ViewBugzillaAction viewBugs = new ViewBugzillaAction("Display bugs in editor", selectedBugs);
 					viewBugs.schedule();
 		    	}
-    		} else if (mode == MylarTasklistPlugin.ReportOpenMode.INTERNAL_BROWSER) {
+    		} else if (mode == MylarTaskListPlugin.ReportOpenMode.INTERNAL_BROWSER) {
     			if(offline){
     				MessageDialog.openInformation(null, "Unable to open bug", "Unable to open the selected bugzilla report since you are currently offline");
 	    			return;
@@ -257,7 +257,7 @@ public class BugzillaTaskHandler implements ITaskHandler {
 		return false;
 	}
 
-	public void itemRemoved(ITaskListElement element, ITaskListCategory category) {
+	public void itemRemoved(ITaskListElement element, ITaskCategory category) {
 		if (element instanceof BugzillaTask){
 			BugzillaTask task = (BugzillaTask) element;
 			if (category != null) {
@@ -269,7 +269,7 @@ public class BugzillaTaskHandler implements ITaskHandler {
 			            "Confirm delete", message);
 				if (!deleteConfirmed) 
 					return;
-				MylarTasklistPlugin.getTaskListManager().deleteTask(task);
+				MylarTaskListPlugin.getTaskListManager().deleteTask(task);
 			}
 		}
 	}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskListManager.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskListManager.java
index ede9abbdf..4f982e10e 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskListManager.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskListManager.java
@@ -18,7 +18,7 @@ import org.eclipse.mylar.bugzilla.core.IBugzillaBug;
 import org.eclipse.mylar.bugzilla.core.IOfflineBugListener;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask.BugReportSyncState;
 import org.eclipse.mylar.tasklist.ITask;
-import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.internal.TaskCategory;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 
@@ -71,7 +71,7 @@ public class BugzillaTaskListManager implements IOfflineBugListener {
 		}
 		
 		String handle = BugzillaTask.getHandle(bug);
-		ITask task = MylarTasklistPlugin.getTaskListManager().getTaskForHandle(handle, true);
+		ITask task = MylarTaskListPlugin.getTaskListManager().getTaskForHandle(handle, true);
 		if(task != null && task instanceof BugzillaTask){
 			BugzillaTask bugTask = (BugzillaTask) task;
 			bugTask.setSyncState(state);