NEW - bug 210801: [api] provide access to parent queries from AbststractTask via AbstractTaskContainer.getParentContainers()

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

20 files changed, 79 insertions, 52 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java
index 7ce943976..573a536e6 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java
@@ -15,14 +15,13 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.mylyn.tasks.core.AbstractTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskCategory;
 import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
 
 /**
  * @author Rob Elves
  * @author Mik Kersten
  */
-public class ScheduledTaskContainer extends AbstractTaskCategory {
+public class ScheduledTaskContainer extends AbstractTaskContainer {
 
 	private Set<ScheduledTaskDelegate> dateRangeDelegates = new HashSet<ScheduledTaskDelegate>();
 
@@ -161,7 +160,7 @@ public class ScheduledTaskContainer extends AbstractTaskCategory {
 	}
 
 	@Override
-	public boolean isUserDefined() {
+	public boolean isUserManaged() {
 		return false;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskCategory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskCategory.java
index f0668fe54..90d79440c 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskCategory.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskCategory.java
@@ -10,7 +10,9 @@
  */
 package org.eclipse.mylyn.internal.tasks.core;
 
+import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.AbstractTaskCategory;
+import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
 
 /**
  * NOTE: this class is likely to change or become API for 3.0
@@ -27,4 +29,19 @@ public final class TaskCategory extends AbstractTaskCategory {
 	public boolean isUserDefined() {
 		return true;
 	}
+	
+	/**
+	 * null if no parent category
+	 */
+	public static AbstractTaskCategory getParentTaskCategory(AbstractTask task) {
+		AbstractTaskCategory category = null;
+		if(task != null) {
+			for (AbstractTaskContainer container: task.getParentContainers()) {
+				if(container instanceof AbstractTaskCategory) {
+					category = (AbstractTaskCategory)container;
+				}
+			}
+		}
+		return category;
+	}
 }
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskGroup.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskGroup.java
index 660dc7145..cd9c1fb79 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskGroup.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskGroup.java
@@ -7,7 +7,7 @@
  *******************************************************************************/
 package org.eclipse.mylyn.internal.tasks.core;
 
-import org.eclipse.mylyn.tasks.core.AbstractTaskCategory;
+import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
 
 /**
  * NOTE: this class is likely to change or become API for 3.0
@@ -15,7 +15,7 @@ import org.eclipse.mylyn.tasks.core.AbstractTaskCategory;
  * @author Eugene Kuleshov
  * @since 2.1
  */
-public class TaskGroup extends AbstractTaskCategory {
+public class TaskGroup extends AbstractTaskContainer {
 
 	private final String summary;
 
@@ -31,8 +31,9 @@ public class TaskGroup extends AbstractTaskCategory {
 	public String getSummary() {
 		return summary; 
 	} 
-
-	public boolean isUserDefined() {
+	
+	@Override
+	public boolean isUserManaged() {
 		return false;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnfiledCategory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnfiledCategory.java
index 0217afa14..a1c9d1124 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnfiledCategory.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnfiledCategory.java
@@ -42,8 +42,13 @@ public class UnfiledCategory extends AbstractTaskCategory {
 	}
 
 	@Override
-	public boolean isUserDefined() {
-		// ignore
+	public boolean isUserManaged() {
 		return false;
 	}
+	
+	@Override
+	@Deprecated
+	public boolean isUserDefined() {
+		return isUserManaged();
+	}
 }
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java
index 39bdaae52..cdbdfe14b 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java
@@ -334,6 +334,9 @@ public abstract class AbstractRepositoryConnector {
 		this.userManaged = userManaged;
 	}
 
+	/**
+	 * If false, user is unable to manipulate (i.e. rename/delete), no preferences are available.
+	 */
 	public boolean isUserManaged() {
 		return userManaged;
 	}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java
index bea961bbd..64f76051f 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java
@@ -340,19 +340,21 @@ public abstract class AbstractTask extends AbstractTaskContainer {
 	}
 
 	/**
-	 * Limitation: can currently only add one container.
+	 * @API 3.0: Rename to internalAddParentContainer
 	 */
 	public void addParentContainer(AbstractTaskContainer container) {
-		containers.clear();
 		containers.add(container);
 	}
 
+	/**
+	 * @API 3.0: Rename to internalremoveParentContainer
+	 */
 	public void removeParentContainer(AbstractTaskContainer container) {
 		containers.remove(container);
 	}
 
 	public Set<AbstractTaskContainer> getParentContainers() {
-		return containers;
+		return new HashSet<AbstractTaskContainer>(containers);
 	}
 
 	@Override
@@ -454,14 +456,14 @@ public abstract class AbstractTask extends AbstractTaskContainer {
 	}
 
 	/**
-	 * deprecated
+	 * @API 3.0: deprecate?
 	 */
 	public String getCategoryHandle() {
 		return categoryHandle;
 	}
 
 	/**
-	 * deprecated
+	 * @API 3.0: deprecate?
 	 */
 	public void setCategoryHandle(String categoryHandle) {
 		this.categoryHandle = categoryHandle;
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskCategory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskCategory.java
index 82fbdca6b..0c4071ee1 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskCategory.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskCategory.java
@@ -9,7 +9,8 @@
 package org.eclipse.mylyn.tasks.core;
 
 /**
- * A container that stores tasks from any repository.
+ * A container that stores tasks from any repository. A task can only have a single
+ * AbstractTaskCategory parent (only be in one category at a time).
  * 
  * @author Mik Kersten
  * @since 2.0
@@ -23,18 +24,9 @@ public abstract class AbstractTaskCategory extends AbstractTaskContainer {
 	/**
 	 * Override to return true for categories that the user creates, deletes, and renames. Return false for categories
 	 * that are managed
-	 * 
-	 * @API-3.0: Move up into AbstractTaskContainer
+	 * @deprecated
+	 * @API-3.0: Use AbstractTaskContainer.isUserManaged
 	 */
 	public abstract boolean isUserDefined();
 
-	@Override
-	public boolean equals(Object object) {
-		return super.equals(object);
-	}
-
-	@Override
-	public int hashCode() {
-		return super.hashCode();
-	}
 }
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java
index 11ab0ca10..91ab5e19c 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java
@@ -53,6 +53,7 @@ public abstract class AbstractTaskContainer extends PlatformObject implements Co
 	}
 
 	/**
+	 * Remove all children held by this container
 	 * Does not delete tasks from TaskList
 	 */
 	public void clear() {
@@ -179,4 +180,13 @@ public abstract class AbstractTaskContainer extends PlatformObject implements Co
 	public int compareTo(AbstractTaskContainer taskListElement) {
 		return getHandleIdentifier().compareTo(taskListElement.getHandleIdentifier());
 	}
+	
+	/**
+	 * If false, user is unable to manipulate (i.e. rename/delete), no preferences are available.
+	 * @since 2.3
+	 */
+	public boolean isUserManaged() {
+		return true;
+	}
+		
 }
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java
index 78066b828..91a4cd751 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java
@@ -821,7 +821,8 @@ public class TaskList {
 	}
 
 	/**
-	 * @
+	 * @since 2.3
+	 * @API 3.0 move to AbstractRepositoryQuery and make static?
 	 */
 	public Set<AbstractRepositoryQuery> getParentQueries(AbstractTask task) {
 		Set<AbstractRepositoryQuery> parentQueries = new HashSet<AbstractRepositoryQuery>();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java
index 2f048e386..cb850bbbb 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java
@@ -66,9 +66,9 @@ public class RemoveFromCategoryAction extends Action {
 					}
 //						TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(task,
 //								TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
-					else if (!parentContainers.isEmpty() && parentContainers.iterator().next() instanceof TaskCategory) {
+					else if (!parentContainers.isEmpty() && TaskCategory.getParentTaskCategory(task) != null) {
 						TasksUiPlugin.getTaskListManager().getTaskList().removeFromCategory(
-								(TaskCategory) parentContainers.iterator().next(), task);
+								TaskCategory.getParentTaskCategory(task), task);
 						//TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(task, null);
 					} else if (!task.isLocal()) {
 						TasksUiPlugin.getTaskListManager().getTaskList().moveTask(task, null);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RenameAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RenameAction.java
index 14c8b9dea..aa81e5c49 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RenameAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RenameAction.java
@@ -50,7 +50,7 @@ public class RenameAction extends BaseSelectionListenerAction {
 		Object selectedObject = selection.getFirstElement();
 		if (selectedObject instanceof AbstractTaskCategory) {
 			AbstractTaskCategory container = (AbstractTaskCategory) selectedObject;
-			return container.isUserDefined();
+			return container.isUserManaged();
 		} else if (selectedObject instanceof AbstractRepositoryQuery) {
 			return true;
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
index df0327a37..c949928fa 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
@@ -220,7 +220,7 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 		categoryViewer.setContentProvider(new ArrayContentProvider());
 		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
 		LinkedList<AbstractTaskContainer> categories = new LinkedList<AbstractTaskContainer>(
-				taskList.getUserCategories());
+				taskList.getCategories());
 		categories.addFirst(taskList.getDefaultCategory());
 		categoryViewer.setInput(categories);
 		categoryViewer.setLabelProvider(new LabelProvider() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
index b2cadd297..e5bcdb2df 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
@@ -8,6 +8,7 @@
 
 package org.eclipse.mylyn.internal.tasks.ui.editors;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
@@ -199,7 +200,7 @@ public class TaskEditorActionPart extends AbstractTaskEditorPart {
 		toolkit.adapt(categoryChooser, true, true);
 		categoryChooser.setFont(TEXT_FONT);
 		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
-		List<AbstractTaskCategory> categories = taskList.getUserCategories();
+		List<AbstractTaskCategory> categories = new ArrayList<AbstractTaskCategory>(taskList.getCategories());
 		Collections.sort(categories, new Comparator<AbstractTaskContainer>() {
 
 			public int compare(AbstractTaskContainer c1, AbstractTaskContainer c2) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java
index 0c70bfa32..2b8808372 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java
@@ -215,7 +215,7 @@ public class TaskActivityWizardPage extends WizardPage {
 		}
 
 		List<AbstractTaskContainer> containers = new ArrayList<AbstractTaskContainer>();
-		containers.addAll(manager.getTaskList().getUserCategories());
+		containers.addAll(manager.getTaskList().getCategories());
 		containers.addAll(manager.getTaskList().getQueries());
 		//containers.add(manager.getTaskList().getArchiveContainer());
 		Collections.sort(containers, new Comparator<AbstractTaskContainer>() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java
index 571112731..ab91750ec 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java
@@ -168,11 +168,8 @@ final class DelegatingTaskExternalizer {
 		node.setAttribute(KEY_HANDLE, task.getHandleIdentifier());
 		node.setAttribute(KEY_REPOSITORY_URL, task.getRepositoryUrl());
 
-		AbstractTaskContainer container = null;
+		AbstractTaskContainer container = TaskCategory.getParentTaskCategory(task);
 
-		if (task.getParentContainers().size() > 0) {
-			container = task.getParentContainers().iterator().next();
-		}
 		if (container != null) {
 			if (container.getHandleIdentifier().equals(UnfiledCategory.HANDLE)) {
 				node.setAttribute(KEY_CATEGORY, VAL_ROOT);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
index b50736165..4631f892d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
@@ -174,15 +174,13 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 			} else if (currentTarget instanceof AbstractTask) {
 				AbstractTask targetTask = (AbstractTask) currentTarget;
 				AbstractTaskCategory targetCategory = null;
-				// TODO: just look for categories?
-				if (targetTask.getParentContainers().size() > 0) {
-					AbstractTaskContainer container = targetTask.getParentContainers().iterator().next();
-					if (container instanceof TaskCategory || container instanceof UnfiledCategory) {
+				// TODO: TaskCategory only used what about AbstractTaskCategory descendants?
+				AbstractTaskContainer container = TaskCategory.getParentTaskCategory(targetTask);
+				if (container instanceof TaskCategory || container instanceof UnfiledCategory) {
+					targetCategory = (AbstractTaskCategory) container;
+				} else if (container instanceof OrphanedTasksContainer) {
+					if (((OrphanedTasksContainer) container).getRepositoryUrl().equals(task.getRepositoryUrl())) {
 						targetCategory = (AbstractTaskCategory) container;
-					} else if (container instanceof OrphanedTasksContainer) {
-						if (((OrphanedTasksContainer) container).getRepositoryUrl().equals(task.getRepositoryUrl())) {
-							targetCategory = (AbstractTaskCategory) container;
-						}
 					}
 				}
 				if (targetCategory != null) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
index fef8470d8..936613ece 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
@@ -1298,7 +1298,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 			} else if (action instanceof RenameAction) {
 				if (element instanceof AbstractTaskCategory) {
 					AbstractTaskCategory container = (AbstractTaskCategory) element;
-					action.setEnabled(container.isUserDefined());
+					action.setEnabled(container.isUserManaged());
 				} else if (element instanceof AbstractRepositoryQuery) {
 					action.setEnabled(true);
 				}
@@ -1702,7 +1702,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 			// TODO: move logic into deltas
 			refreshJob.refreshTask(task);
 			Set<AbstractTaskContainer> containers = new HashSet<AbstractTaskContainer>(
-					TasksUiPlugin.getTaskListManager().getTaskList().getQueriesForHandle(task.getHandleIdentifier()));
+					TasksUiPlugin.getTaskListManager().getTaskList().getParentQueries(task));
 			containers.addAll(task.getParentContainers());
 			containers.add(TasksUiPlugin.getTaskListManager().getTaskList().getOrphanContainer(task.getRepositoryUrl()));
 //			containers.add(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer());
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java
index 626a54ce2..9b81aecc6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java
@@ -541,10 +541,8 @@ public class TaskListManager implements IPropertyChangeListener {
 		} else if (selectedObject instanceof AbstractTask) {
 			AbstractTask task = (AbstractTask) selectedObject;
 
-			AbstractTaskContainer container = null;
-			if (task.getChildren().size() > 0 && task.getParentContainers().iterator().hasNext()) {
-				container = task.getParentContainers().iterator().next();
-			}
+			AbstractTaskContainer container = TaskCategory.getParentTaskCategory(task);
+			
 			if (container instanceof TaskCategory) {
 				taskList.addTask(newTask, container);
 			} else if (view != null && view.getDrilledIntoCategory() instanceof TaskCategory) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java
index c11c19a21..6abc8334c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java
@@ -7,6 +7,7 @@
  *******************************************************************************/
 package org.eclipse.mylyn.tasks.ui.editors;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
@@ -361,7 +362,7 @@ public abstract class AbstractNewRepositoryTaskEditor extends AbstractRepository
 		getManagedForm().getToolkit().adapt(categoryChooser, true, true);
 		categoryChooser.setFont(TEXT_FONT);
 		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
-		List<AbstractTaskCategory> categories = taskList.getUserCategories();
+		List<AbstractTaskCategory> categories = new ArrayList<AbstractTaskCategory>(taskList.getCategories());
 		Collections.sort(categories, new Comparator<AbstractTaskContainer>() {
 
 			public int compare(AbstractTaskContainer c1, AbstractTaskContainer c2) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
index d88687d21..90f0a42f9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
@@ -294,6 +294,8 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage {
 	 * WARNING: This is present for backward compatibility only. You can get and set text on this widget but all ui
 	 * related changes to this widget will have no affect as ui is now being presented with a StyledText widget. This
 	 * simply proxies get/setText calls to the StyledText widget.
+	 * 
+	 * API 3.0: Eliminate this field
 	 */
 	protected Text summaryText;