completed name refactoring for tasklist and bugs

11 files changed, 80 insertions, 77 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
index b71f68108..54c336629 100644
--- a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
@@ -1,23 +1,23 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylar Tasklist Tests Plug-in
-Bundle-SymbolicName: org.eclipse.mylar.tasks.tests
+Bundle-SymbolicName: org.eclipse.mylar.tasklist.tests
 Bundle-Version: 0.0.0
-Bundle-Activator: org.eclipse.mylar.tasks.tests.MylarTasksTestsPlugin
+Bundle-Activator: org.eclipse.mylar.tasklist.tests.MylarTasksTestsPlugin
 Bundle-Vendor: University of British Columbia
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
  org.eclipse.mylar.core,
  org.eclipse.mylar.core.tests,
- org.eclipse.mylar.tasks,
  org.eclipse.jdt.core,
  org.eclipse.core.resources,
  org.eclipse.ui,
  org.eclipse.mylar.bugzilla.core,
  org.eclipse.mylar.bugzilla.ui,
- org.eclipse.mylar.bugzilla
+ org.eclipse.mylar.bugs,
+ org.eclipse.mylar.tasklist
 Eclipse-AutoStart: true
 Bundle-ClassPath: mylar-tasklist-tests.jar
-Export-Package: org.eclipse.mylar.tasks.bugzilla.tests,
- org.eclipse.mylar.tasks.tests
+Export-Package: org.eclipse.mylar.tasklist.bugzilla.tests,
+ org.eclipse.mylar.tasklist.tests
diff --git a/org.eclipse.mylyn.tasks.tests/build.properties b/org.eclipse.mylyn.tasks.tests/build.properties
index 7ca24197e..74cab5999 100644
--- a/org.eclipse.mylyn.tasks.tests/build.properties
+++ b/org.eclipse.mylyn.tasks.tests/build.properties
@@ -9,7 +9,10 @@
 #     University Of British Columbia - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               mylar-tasklist-tests.jar
+               mylar-tasklist-tests.jar,\
+               about.html
 jars.compile.order = mylar-tasklist-tests.jar
 source.mylar-tasklist-tests.jar = src/
 output.mylar-tasklist-tests.jar = bin/
+src.includes = about.html,\
+               src/
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/BugzillaSearchPluginTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/BugzillaSearchPluginTest.java
index 44bee8f24..77c74b26f 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/BugzillaSearchPluginTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/BugzillaSearchPluginTest.java
@@ -11,7 +11,7 @@
 /*
  * Created on Nov 19, 2004
  */
-package org.eclipse.mylar.tasks.bugzilla.tests;
+package org.eclipse.mylar.tasklist.bugzilla.tests;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,17 +20,17 @@ import junit.framework.TestCase;
 
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IType;
-import org.eclipse.mylar.bugzilla.MylarBugzillaPlugin;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaTask;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaTask.BugTaskState;
+import org.eclipse.mylar.bugs.MylarBugzillaPlugin;
+import org.eclipse.mylar.bugs.search.BugzillaMylarSearch;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask.BugTaskState;
 import org.eclipse.mylar.core.search.IActiveSearchListener;
 import org.eclipse.mylar.core.tests.support.WorkspaceSetupHelper;
 import org.eclipse.mylar.core.tests.support.search.SearchPluginTestHelper;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.TaskListManager;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.search.BugzillaMylarSearch;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.TaskListManager;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
 
 /*TEST CASES TO HANDLE
  * 1. what is here
@@ -213,9 +213,9 @@ public class BugzillaSearchPluginTest extends TestCase{
 
 		String bugPrefix = "Bugzilla-";
 		
-//		TaskList t = MylarTasksPlugin.getTaskListManager().getTaskList();
-//		MylarTasksPlugin.getTaskListManager().setTaskList(t);
-		TaskListManager manager = MylarTasksPlugin.getTaskListManager();
+//		TaskList t = MylarTasklistPlugin.getTaskListManager().getTaskList();
+//		MylarTasklistPlugin.getTaskListManager().setTaskList(t);
+		TaskListManager manager = MylarTasklistPlugin.getTaskListManager();
 		TaskCategory cat = new TaskCategory("Testing Category");
 		manager.addCategory(cat);
 		BugzillaTask bugTask1 = new BugzillaTask(bugPrefix +94185, "<bugzilla info>");
@@ -266,7 +266,7 @@ public class BugzillaSearchPluginTest extends TestCase{
 		assertEquals("Results not the right size", 3, c.size());
 		
 		MylarBugzillaPlugin.getBridge().removeFromLandmarksHash(astNodeType);
-        MylarTasksPlugin.getTaskListManager().deleteCategory(cat);
+        MylarTasklistPlugin.getTaskListManager().deleteCategory(cat);
 	}
 	
 	//TODO need to test a bug that wraps...should fail since we can only search on a single line
@@ -276,9 +276,9 @@ public class BugzillaSearchPluginTest extends TestCase{
 		String bugPrefix = "Bugzilla-";
 		
 		
-//		TaskList t = MylarTasksPlugin.getTaskListManager().getTaskList();
-//		MylarTasksPlugin.getTaskListManager().setTaskList(t);
-		TaskListManager manager = MylarTasksPlugin.getTaskListManager();
+//		TaskList t = MylarTasklistPlugin.getTaskListManager().getTaskList();
+//		MylarTasklistPlugin.getTaskListManager().setTaskList(t);
+		TaskListManager manager = MylarTasklistPlugin.getTaskListManager();
 		TaskCategory cat = new TaskCategory("Testing Category");
 		manager.addCategory(cat);
 		BugzillaTask bugTask1 = new BugzillaTask(bugPrefix + 94185, "<bugzilla info>");
@@ -325,7 +325,7 @@ public class BugzillaSearchPluginTest extends TestCase{
 		assertEquals("Results not the right size", 1, c.size());
 		
 		MylarBugzillaPlugin.getBridge().removeFromLandmarksHash(astNodeType);
-        MylarTasksPlugin.getTaskListManager().deleteCategory(cat);
+        MylarTasklistPlugin.getTaskListManager().deleteCategory(cat);
 	}
 	
 }
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/BugzillaStackTraceTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/BugzillaStackTraceTest.java
index d8d5f1f81..c7edde6ad 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/BugzillaStackTraceTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/BugzillaStackTraceTest.java
@@ -9,7 +9,7 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 ////Created on Oct 12, 2004
-package org.eclipse.mylar.tasks.bugzilla.tests;
+package org.eclipse.mylar.tasklist.bugzilla.tests;
 
 import java.io.File;
 import java.io.FileReader;
@@ -20,13 +20,13 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.Path;
+import org.eclipse.mylar.bugs.search.BugzillaMylarSearchOperation;
 import org.eclipse.mylar.bugzilla.core.internal.BugParser;
 import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit;
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
-import org.eclipse.mylar.bugzilla.ui.tasks.StackTrace;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
+import org.eclipse.mylar.bugzilla.ui.tasklist.StackTrace;
 import org.eclipse.mylar.core.tests.MylarCoreTestsPlugin;
 import org.eclipse.mylar.core.tests.support.FileTool;
-import org.eclipse.mylar.tasks.search.BugzillaMylarSearchOperation;
 
 
 /**
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/MylarBugzillaTestsPlugin.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/MylarBugzillaTestsPlugin.java
index 87a99779a..ad5b78c1d 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/bugzilla/tests/MylarBugzillaTestsPlugin.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/MylarBugzillaTestsPlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.bugzilla.tests;
+package org.eclipse.mylar.tasklist.bugzilla.tests;
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/Job.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/Job.java
index 62d95fcce..1ba2a09c6 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/Job.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/Job.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.tests;
+package org.eclipse.mylar.tasklist.tests;
 
 public class Job {
 	private String company;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/MylarTasksTestsPlugin.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/MylarTasksTestsPlugin.java
index 7d420e1fd..1f544f371 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/MylarTasksTestsPlugin.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/MylarTasksTestsPlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.tests;
+package org.eclipse.mylar.tasklist.tests;
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/People.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/People.java
index 2e88dcca4..e4f43ae51 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/People.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/People.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.tests;
+package org.eclipse.mylar.tasklist.tests;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/Person.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/Person.java
index b4064f1b1..0bbe010c5 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/Person.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/Person.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylar.tasks.tests;
+package org.eclipse.mylar.tasklist.tests;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskListManagerTest.java
index f301b3465..c0de614a8 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskListManagerTest.java
@@ -11,20 +11,20 @@
 /*
  * Created on Dec 21, 2004
   */
-package org.eclipse.mylar.tasks.tests;
+package org.eclipse.mylar.tasklist.tests;
 
-import java.util.List;
 import java.io.File;
+import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaTask;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.Task;
-import org.eclipse.mylar.tasks.TaskListManager;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.internal.TaskList;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.Task;
+import org.eclipse.mylar.tasklist.TaskListManager;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.internal.TaskList;
 
 /**
  * @author Mik Kersten
@@ -32,34 +32,34 @@ import org.eclipse.mylar.tasks.internal.TaskList;
 public class TaskListManagerTest extends TestCase {
 
     public void testCreationAndExternalization() {
-        File file = new File("foo" + MylarTasksPlugin.FILE_EXTENSION);
+        File file = new File("foo" + MylarTasklistPlugin.FILE_EXTENSION);
         file.deleteOnExit();
         TaskListManager manager = new TaskListManager(file);
         
 //        TaskList tlist = manager.getTaskList();
-        Task task1 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 1");
+        Task task1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 1");
         manager.addRootTask(task1);
-        Task sub1 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "sub 1");
+        Task sub1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "sub 1");
         task1.addSubTask(sub1);    
         sub1.setParent(task1);
-        Task task2 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 2");
+        Task task2 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 2");
         manager.addRootTask(task2);
 
         TaskCategory cat1 = new TaskCategory("Category 1");
         manager.addCategory(cat1);
-        Task task3 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 3");
+        Task task3 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 3");
         cat1.addTask(task3);
-        Task sub2 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "sub 2");
+        Task sub2 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "sub 2");
         task3.addSubTask(sub2);
         sub2.setParent(task3);
-        Task task4 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 4");
+        Task task4 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 4");
         cat1.addTask(task4);
         
         TaskCategory cat2 = new TaskCategory("Category 2");
         manager.addCategory(cat2);
-        Task task5 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 5");
+        Task task5 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 5");
         cat2.addTask(task5);
-        Task task6 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 6");
+        Task task6 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 6");
         cat2.addTask(task6);    
         
         BugzillaTask report = new BugzillaTask("123", "label 123", true);
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskListUiTest.java
index d53c5f161..a54e48c9f 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskListUiTest.java
@@ -9,18 +9,18 @@
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.mylar.tasks.tests;
+package org.eclipse.mylar.tasklist.tests;
 
 import junit.framework.TestCase;
 
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.mylar.tasks.ITask;
-import org.eclipse.mylar.tasks.MylarTasksPlugin;
-import org.eclipse.mylar.tasks.Task;
-import org.eclipse.mylar.tasks.TaskListManager;
-import org.eclipse.mylar.tasks.internal.TaskCategory;
-import org.eclipse.mylar.tasks.internal.TaskPriorityFilter;
-import org.eclipse.mylar.tasks.ui.views.TaskListView;
+import org.eclipse.mylar.tasklist.ITask;
+import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
+import org.eclipse.mylar.tasklist.Task;
+import org.eclipse.mylar.tasklist.TaskListManager;
+import org.eclipse.mylar.tasklist.internal.TaskCategory;
+import org.eclipse.mylar.tasklist.internal.TaskPriorityFilter;
+import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.PartInitException;
 
@@ -54,41 +54,41 @@ public class TaskListUiTest extends TestCase {
 	
 	public void setUp() throws PartInitException{
 		try {
-		MylarTasksPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().showView("org.eclipse.mylar.tasks.ui.views.TaskListView");
-//		File file = new File("foo" + MylarTasksPlugin.FILE_EXTENSION);
-        TaskListManager manager = MylarTasksPlugin.getTaskListManager();        
+		MylarTasklistPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().showView("org.eclipse.mylar.tasks.ui.views.TaskListView");
+//		File file = new File("foo" + MylarTasklistPlugin.FILE_EXTENSION);
+        TaskListManager manager = MylarTasklistPlugin.getTaskListManager();        
 //        tlist = manager.getTaskList();        
         cat1 = new TaskCategory("First Category");
         
-        cat1task1 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 1");
+        cat1task1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 1");
         cat1task1.setPriority("P1");
         cat1task1.setCompleted(true);
         cat1task1.setCategory(cat1);
 		cat1.addTask(cat1task1);
 		
-		cat1task1sub1 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "sub task 1");
+		cat1task1sub1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "sub task 1");
 		cat1task1sub1.setPriority("P1");
 		cat1task1sub1.setCompleted(true);
 		cat1task1sub1.setParent(cat1task1);
         cat1task1.addSubTask(cat1task1sub1);
 		
-		cat1task2 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 2");
+		cat1task2 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 2");
 		cat1task2.setPriority("P2");
 		cat1task2.setCategory(cat1);
 		cat1.addTask(cat1task2);		
 		
-		cat1task3 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 3");
+		cat1task3 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 3");
 		cat1task3.setPriority("P3");
 		cat1task3.setCompleted(true);
 		cat1task3.setCategory(cat1);
 		cat1.addTask(cat1task3);
 		
-		cat1task4 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 4");
+		cat1task4 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 4");
 		cat1task4.setPriority("P4");
 		cat1task4.setCategory(cat1);
 		cat1.addTask(cat1task4);
 		
-		cat1task5 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 5");
+		cat1task5 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 5");
 		cat1task5.setPriority("P5");
 		cat1task5.setCompleted(true);
 		cat1task5.setCategory(cat1);
@@ -99,34 +99,34 @@ public class TaskListUiTest extends TestCase {
 		
 		cat2 = new TaskCategory("Second Category");
         
-        cat2task1 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 1");
+        cat2task1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 1");
         cat2task1.setPriority("P1");
         cat2task1.setCategory(cat2);
 		cat2.addTask(cat2task1);
 		
-		cat2task1sub1 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "sub task 1");
+		cat2task1sub1 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "sub task 1");
 		cat2task1sub1.setPriority("P1");
 		cat2task1sub1.setParent(cat2task1);
 		cat2task1.addSubTask(cat2task1sub1);
 		
-		cat2task2 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 2");
+		cat2task2 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 2");
 		cat2task2.setPriority("P2");
 		cat2task2.setCompleted(true);
 		cat2task2.setCategory(cat2);
 		cat2.addTask(cat2task2);
 		
-		cat2task3 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 3");
+		cat2task3 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 3");
 		cat2task3.setPriority("P3");
 		cat2task3.setCategory(cat2);
 		cat2.addTask(cat2task3);
 		
-		cat2task4 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 4");
+		cat2task4 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 4");
 		cat2task4.setPriority("P4");
 		cat2task4.setCompleted(true);
 		cat2task4.setCategory(cat2);
 		cat2.addTask(cat2task4);
 		
-		cat2task5 = new Task(MylarTasksPlugin.getTaskListManager().genUniqueTaskId(), "task 5");
+		cat2task5 = new Task(MylarTasklistPlugin.getTaskListManager().genUniqueTaskId(), "task 5");
 		cat2task5.setPriority("P5");
 		cat2task5.setCategory(cat2);
 		cat2.addTask(cat2task5);
@@ -156,12 +156,12 @@ public class TaskListUiTest extends TestCase {
 		TaskListView.getDefault().removeFilter(TaskListView.getDefault().getCompleteFilter());
 		
 		
-//		MylarTasksPlugin.getTaskListManager().getTaskList().addFilter(TaskListView.getDefault().getInCompleteFilter());
+//		MylarTasklistPlugin.getTaskListManager().getTaskList().addFilter(TaskListView.getDefault().getInCompleteFilter());
 //		viewer.refresh();
 //		viewer.expandAll();
 //		items = viewer.getTree().getItems();
 //		assertTrue(checkFilter(CHECK_INCOMPLETE_FILTER, items));
-//		MylarTasksPlugin.getTaskListManager().getTaskList().removeFilter(TaskListView.getDefault().getInCompleteFilter());
+//		MylarTasklistPlugin.getTaskListManager().getTaskList().removeFilter(TaskListView.getDefault().getInCompleteFilter());
 		// check incomplte tasks
 		
 		
@@ -240,7 +240,7 @@ public class TaskListUiTest extends TestCase {
 //        	// don't care if we are disposed
 //        }
 //        public Object[] getElements(Object parent) {
-//            return applyFilter(MylarTasksPlugin.getTaskListManager().getTaskList().getRoots()).toArray();
+//            return applyFilter(MylarTasklistPlugin.getTaskListManager().getTaskList().getRoots()).toArray();
 //        }
 //        public Object getParent(Object child) {
 //            if (child instanceof ITask) {