NEW - bug 229487: [api] manage task list structure internally

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

5 files changed, 19 insertions, 18 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetAdapterFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetAdapterFactory.java
index 829a40b70..0ed9a4852 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetAdapterFactory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetAdapterFactory.java
@@ -10,7 +10,7 @@ package org.eclipse.mylyn.internal.tasks.ui.workingsets;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.ITaskElement;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.IPersistableElement;
 
@@ -32,10 +32,10 @@ public class TaskWorkingSetAdapterFactory implements IAdapterFactory {
 	}
 
 	public Object getAdapter(final Object adaptableObject, @SuppressWarnings("unchecked") Class adapterType) {
-		if (adapterType == IPersistableElement.class && adaptableObject instanceof AbstractTaskContainer) {
+		if (adapterType == IPersistableElement.class && adaptableObject instanceof ITaskElement) {
 			return new IPersistableElement() {
 				public void saveState(IMemento memento) {
-					AbstractTaskContainer container = (AbstractTaskContainer) adaptableObject;
+					ITaskElement container = (ITaskElement) adaptableObject;
 					memento.putString(TaskWorkingSetElementFactory.HANDLE_TASK, container.getHandleIdentifier());
 				}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementAdapter.java
index 17961c65e..236d88c62 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementAdapter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementAdapter.java
@@ -13,7 +13,7 @@ import java.util.List;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.ITaskElement;
 import org.eclipse.ui.IWorkingSet;
 import org.eclipse.ui.IWorkingSetElementAdapter;
 
@@ -25,7 +25,7 @@ public class TaskWorkingSetElementAdapter implements IWorkingSetElementAdapter {
 
 	public IAdaptable[] adaptElements(IWorkingSet workingSet, IAdaptable[] elements) {
 		for (IAdaptable adaptable : elements) {
-			if (!(adaptable instanceof AbstractTaskContainer)) {
+			if (!(adaptable instanceof ITaskElement)) {
 				return selectContainers(elements);
 			}
 		}
@@ -35,7 +35,7 @@ public class TaskWorkingSetElementAdapter implements IWorkingSetElementAdapter {
 	private IAdaptable[] selectContainers(IAdaptable[] elements) {
 		List<IAdaptable> containers = new ArrayList<IAdaptable>(elements.length);
 		for (IAdaptable adaptable : elements) {
-			if (adaptable instanceof AbstractTaskContainer) {
+			if (adaptable instanceof ITaskElement) {
 				containers.add(adaptable);
 			} else if (adaptable instanceof IProject) {
 				containers.add(adaptable);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementFactory.java
index e9968f3b5..7b25fc3df 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementFactory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementFactory.java
@@ -14,9 +14,9 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.mylyn.commons.core.StatusHandler;
+import org.eclipse.mylyn.internal.tasks.core.AbstractTaskContainer;
 import org.eclipse.mylyn.internal.tasks.core.TaskList;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
 import org.eclipse.ui.IElementFactory;
 import org.eclipse.ui.IMemento;
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java
index e2018c37f..e12159eee 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java
@@ -31,12 +31,13 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.mylyn.internal.tasks.core.AbstractRepositoryQuery;
+import org.eclipse.mylyn.internal.tasks.core.AbstractTaskContainer;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoryLabelProvider;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.ITaskElement;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TasksUi;
 import org.eclipse.swt.SWT;
@@ -224,7 +225,7 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage {
 		private final WorkbenchLabelProvider workbenchLabelProvider = new WorkbenchLabelProvider();
 
 		public Image getImage(Object element) {
-			if (element instanceof AbstractTaskContainer) {
+			if (element instanceof ITaskElement) {
 				return taskLabelProvider.getImage(element);
 			} else if (element instanceof TaskRepository) {
 				return taskRepositoryLabelProvider.getImage(element);
@@ -236,7 +237,7 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage {
 		}
 
 		public String getText(Object element) {
-			if (element instanceof AbstractTaskContainer) {
+			if (element instanceof ITaskElement) {
 				return taskLabelProvider.getText(element);
 			} else if (element instanceof TaskRepository) {
 				return taskRepositoryLabelProvider.getText(element);
@@ -290,7 +291,7 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage {
 		Object[] elements = treeViewer.getCheckedElements();
 		Set<IAdaptable> validElements = new HashSet<IAdaptable>();
 		for (Object element : elements) {
-			if (element instanceof AbstractTaskContainer || element instanceof IProject) {
+			if (element instanceof ITaskElement || element instanceof IProject) {
 				validElements.add((IAdaptable) element);
 			}
 		}
@@ -499,7 +500,7 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage {
 		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
 			public void run() {
 				IAdaptable element = (IAdaptable) event.getElement();
-				if (element instanceof AbstractTaskContainer || element instanceof IProject) {
+				if (element instanceof ITaskElement || element instanceof IProject) {
 					treeViewer.setGrayed(element, false);
 				} else if (element instanceof ElementCategory) {
 					for (Object child : ((ElementCategory) element).getChildren(null)) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java
index e92ca473e..3a130847e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java
@@ -21,10 +21,10 @@ import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.mylyn.internal.tasks.core.AbstractRepositoryQuery;
 import org.eclipse.mylyn.internal.tasks.core.TaskCategory;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.ITaskElement;
 import org.eclipse.mylyn.tasks.core.ITaskListChangeListener;
 import org.eclipse.mylyn.tasks.core.TaskContainerDelta;
 import org.eclipse.mylyn.tasks.ui.TasksUi;
@@ -97,9 +97,9 @@ public class TaskWorkingSetUpdater implements IWorkingSetUpdater, ITaskListChang
 	private void checkElementExistence(IWorkingSet workingSet) {
 		ArrayList<IAdaptable> list = new ArrayList<IAdaptable>();
 		for (IAdaptable adaptable : workingSet.getElements()) {
-			if (adaptable instanceof AbstractTaskContainer) {
-				String handle = ((AbstractTaskContainer) adaptable).getHandleIdentifier();
-				for (AbstractTaskContainer element : TasksUiPlugin.getTaskListManager().getTaskList().getRootElements()) {
+			if (adaptable instanceof ITaskElement) {
+				String handle = ((ITaskElement) adaptable).getHandleIdentifier();
+				for (ITaskElement element : TasksUiPlugin.getTaskListManager().getTaskList().getRootElements()) {
 					if (element != null && element.getHandleIdentifier().equals(handle)) {
 						list.add(adaptable);
 					}