Completed: streamline migration

8 files changed, 59 insertions, 45 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskRepositoryClient.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskRepositoryClient.java
index aa7534b2d..e326c1a6f 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskRepositoryClient.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskRepositoryClient.java
@@ -23,7 +23,7 @@ public class BugzillaTaskRepositoryClient implements ITaskRepositoryClient {
 	public static final String KIND = "bugzilla";
 	
 	public String getLabel() {
-		return "Bugzilla (uncustomized 2.16-2.20)";
+		return "Bugzilla (supports uncustomized 2.16-2.20)";
 	}
 	
 	public String toString() {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugsPlugin.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugsPlugin.java
index b367c7765..9b9a7fc59 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugsPlugin.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugsPlugin.java
@@ -12,7 +12,6 @@ package org.eclipse.mylar.bugs;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.mylar.bugs.search.BugzillaReferencesProvider;
-import org.eclipse.mylar.core.MylarPlugin;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -28,12 +27,17 @@ import org.osgi.framework.BundleContext;
 public class MylarBugsPlugin extends AbstractUIPlugin {
 
 	public static ImageDescriptor EDGE_REF_BUGZILLA = getImageDescriptor("icons/elcl16/edge-ref-bug.gif");
-	private BugzillaEditingMonitor bugzillaEditingMonitor;
+
+	// private BugzillaEditingMonitor bugzillaEditingMonitor;
+	
 	private static BugzillaSearchManager bridge = null;
-    private static BugzillaReferencesProvider referencesProvider = new BugzillaReferencesProvider();
+
+	private static BugzillaReferencesProvider referencesProvider = new BugzillaReferencesProvider();
+
 	private static MylarBugsPlugin plugin;
+
 	private BugzillaReportCache cache;
-	
+
 	public MylarBugsPlugin() {
 		plugin = this;
 	}
@@ -45,19 +49,19 @@ public class MylarBugsPlugin extends AbstractUIPlugin {
 		super.start(context);
 		cache = new BugzillaReportCache();
 		cache.readCacheFile();
-        
-        IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-        if (window != null) {
-            // create a new bridge and initialize it
-            bridge = new BugzillaSearchManager();
-        }
+
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		if (window != null) {
+			// create a new bridge and initialize it
+			bridge = new BugzillaSearchManager();
+		}
 		final IWorkbench workbench = PlatformUI.getWorkbench();
-        workbench.getDisplay().asyncExec(new Runnable() {
-            public void run() {
-//            	bugzillaEditingMonitor = new BugzillaEditingMonitor();
-//            	MylarPlugin.getDefault().getSelectionMonitors().add(bugzillaEditingMonitor);   
-            }
-        });
+		workbench.getDisplay().asyncExec(new Runnable() {
+			public void run() {
+				// bugzillaEditingMonitor = new BugzillaEditingMonitor();
+				// MylarPlugin.getDefault().getSelectionMonitors().add(bugzillaEditingMonitor);
+			}
+		});
 	}
 
 	/**
@@ -66,7 +70,7 @@ public class MylarBugsPlugin extends AbstractUIPlugin {
 	public void stop(BundleContext context) throws Exception {
 		super.stop(context);
 		plugin = null;
-//		MylarPlugin.getDefault().getSelectionMonitors().remove(bugzillaEditingMonitor); 
+		// MylarPlugin.getDefault().getSelectionMonitors().remove(bugzillaEditingMonitor);
 	}
 
 	/**
@@ -77,27 +81,28 @@ public class MylarBugsPlugin extends AbstractUIPlugin {
 	}
 
 	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
+	 * Returns an image descriptor for the image file at the given plug-in
+	 * relative path.
+	 * 
+	 * @param path
+	 *            the path
 	 * @return the image descriptor
 	 */
 	public static ImageDescriptor getImageDescriptor(String path) {
 		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.mylar.bugs.bridge", path);
 	}
-	
-    public static BugzillaSearchManager getBridge() {
-        // make sure that the bridge initialized, if not, make a new one
-        if (bridge == null) {
-            bridge = new BugzillaSearchManager();
-        }
-        return bridge;
-    }
+
+	public static BugzillaSearchManager getBridge() {
+		// make sure that the bridge initialized, if not, make a new one
+		if (bridge == null) {
+			bridge = new BugzillaSearchManager();
+		}
+		return bridge;
+	}
 
 	public static BugzillaReferencesProvider getReferenceProvider() {
 		return referencesProvider;
-		
+
 	}
 
 	public BugzillaReportCache getCache() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskActivityListener.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskActivityListener.java
index f23517fbf..50655f0a0 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskActivityListener.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ITaskActivityListener.java
@@ -30,5 +30,5 @@ public interface ITaskActivityListener {
     
 	public abstract void tasklistRead();
 
-	public abstract void tasklistModified();
+	public abstract void taskListModified();
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java
index ae6b6d0ed..efa086f98 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java
@@ -199,7 +199,7 @@ public class MylarTaskListPlugin extends AbstractUIPlugin implements IStartup {
 
 		}
 
-		public void tasklistModified() {
+		public void taskListModified() {
 			// TODO Auto-generated method stub
 
 		}
@@ -362,6 +362,8 @@ public class MylarTaskListPlugin extends AbstractUIPlugin implements IStartup {
 						hit.setRepositoryUrl(repositoryUrl);
 					}
 				}
+				taskListManager.saveTaskList();
+				taskListManager.readOrCreateTaskList();
 			}
 		}
 		if (migrated) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListManager.java
index 57a70932f..5d53c4dc6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListManager.java
@@ -75,6 +75,7 @@ public class TaskListManager {
 	public boolean readOrCreateTaskList() {
 		try {
 			if (taskListFile.exists()) {
+				taskList = new TaskList();
 				taskListWriter.readTaskList(taskList, taskListFile);
 				int maxHandle = taskList.findLargestTaskHandle();
 				if (maxHandle >= nextTaskId) {
@@ -123,7 +124,7 @@ public class TaskListManager {
 		}
 		task.setCategory(null);
 		if (!taskList.getRootTasks().contains(task)) taskList.addRootTask(task);
-		for (ITaskActivityListener listener : listeners) listener.tasklistModified();
+		for (ITaskActivityListener listener : listeners) listener.taskListModified();
 	}
 
 	public void moveToCategory(TaskCategory category, ITask task) {
@@ -135,12 +136,12 @@ public class TaskListManager {
 			category.addTask(task);
 		}
 		task.setCategory(category);
-		for (ITaskActivityListener listener : listeners) listener.tasklistModified();
+		for (ITaskActivityListener listener : listeners) listener.taskListModified();
 	}
 
 	public void addCategory(ITaskCategory cat) {
 		taskList.addCategory(cat);
-		for (ITaskActivityListener listener : listeners) listener.tasklistModified();
+		for (ITaskActivityListener listener : listeners) listener.taskListModified();
 	}
 	
 	public void removeFromCategory(TaskCategory category, ITask task) {
@@ -148,17 +149,17 @@ public class TaskListManager {
 			category.removeTask(task);
 			task.setCategory(null);
 		}
-		for (ITaskActivityListener listener : listeners) listener.tasklistModified();
+		for (ITaskActivityListener listener : listeners) listener.taskListModified();
 	}
 	
 	public void removeFromRoot(ITask task) {
 		taskList.removeFromRoot(task);
-		for (ITaskActivityListener listener : listeners) listener.tasklistModified();
+		for (ITaskActivityListener listener : listeners) listener.taskListModified();
 	}
 	
 	public void addQuery(ITaskQuery cat) {
 		taskList.addQuery(cat);
-		for (ITaskActivityListener listener : listeners) listener.tasklistModified();
+		for (ITaskActivityListener listener : listeners) listener.taskListModified();
 	}
 
 	public void deleteTask(ITask task) {
@@ -166,17 +167,17 @@ public class TaskListManager {
 		if (taskTimer != null) taskTimer.stopTimer();
 		taskList.setActive(task, false);
 		taskList.deleteTask(task);
-		for (ITaskActivityListener listener : listeners) listener.tasklistModified();
+		for (ITaskActivityListener listener : listeners) listener.taskListModified();
 	}
 
 	public void deleteCategory(ITaskCategory cat) {
 		taskList.deleteCategory(cat);
-		for (ITaskActivityListener listener : listeners) listener.tasklistModified();
+		for (ITaskActivityListener listener : listeners) listener.taskListModified();
 	}
 
 	public void deleteQuery(ITaskQuery query) {
 		taskList.deleteQuery(query);
-		for (ITaskActivityListener listener : listeners) listener.tasklistModified();
+		for (ITaskActivityListener listener : listeners) listener.taskListModified();
 	}
 
 	public void addListener(ITaskActivityListener listener) {
@@ -225,6 +226,12 @@ public class TaskListManager {
 		}
 	}
 	
+	public void notifyListUpdated() {
+		for (ITaskActivityListener listener : new ArrayList<ITaskActivityListener>(listeners)) {
+			listener.taskListModified();
+		}
+	}
+	
 	public void setTaskListFile(File f) {
 		this.taskListFile = f;
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListSaveManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListSaveManager.java
index c2ee615b3..97c2c7db0 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListSaveManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListSaveManager.java
@@ -157,7 +157,7 @@ public class TaskListSaveManager implements ITaskActivityListener, DisposeListen
 		// ignore
 	}
 
-	public void tasklistModified() {
+	public void taskListModified() {
 		saveTaskListAndContexts();
 	}
 	
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskInfoEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskInfoEditor.java
index 60a6c6718..c28af1b23 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskInfoEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskInfoEditor.java
@@ -170,7 +170,7 @@ public class TaskInfoEditor extends EditorPart {
 			}
 		}
 
-		public void tasklistModified() {
+		public void taskListModified() {
 			// TODO Auto-generated method stub
 
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java
index 67e073f5f..fa528dbc4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/views/TaskListView.java
@@ -242,7 +242,7 @@ public class TaskListView extends ViewPart {
 			refresh(null);
 		}
 
-		public void tasklistModified() {
+		public void taskListModified() {
 			if (!getViewer().getControl().isDisposed())
 				getViewer().refresh();
 		}