Attachment #97913 for bug #168878

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 168878
Collapse All | Expand All




package org.eclipse.mylyn.internal.context.ui;

import java.util.Calendar;
import java.util.Collection;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;

					}
				}
			} else if (child instanceof AbstractTaskContainer) {
				Collection<AbstractTask> children = ((AbstractTaskContainer) child).getChildren();
				// Always display empty containers
				if (children.size() == 0) {
					return false;

				|| !task.isCompleted()
				&& (LocalRepositoryConnector.DEFAULT_SUMMARY.equals(task.getSummary())
						|| shouldShowInFocusedWorkweekDateContainer(parent, task)
						|| TasksUiPlugin.getTaskActivityManager().isOverdue(task)
						|| isInterestingForThisWeek(parent, task) || hasInterestingSubTasks(parent, task, depth));
	}

	private boolean hasInterestingSubTasks(Object parent, AbstractTask task, int depth) {





import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Set;

import junit.framework.TestCase;


		manager.resetTaskList();
		manager.readExistingOrCreateNewList();
		assertEquals(1, manager.getTaskList().getAllTasks().size());
		Collection<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
		AbstractTask readTask = readList.iterator().next();
		assertTrue(readTask.getSummary().equals("task 1"));
		assertTrue(readTask.getDueDate().compareTo(dueDate) == 0);

		// assertNotNull(manager.getTaskList());
		assertEquals(1, manager.getTaskList().getDefaultCategory().getChildren().size());

		Collection<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
		AbstractTask readTask = readList.iterator().next();
		assertTrue(readTask.getSummary().equals("task 1"));


Lines 170-176 Link Here

(-)src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java (-1 / +1 lines)
170	manager.setTaskListFile(originalFile);	170	manager.setTaskListFile(originalFile);
171		171
172	Collection<AbstractTask> allTasks = manager.getTaskList().getAllTasks();	172	Collection<AbstractTask> allTasks = manager.getTaskList().getAllTasks();
173	Set<AbstractTask> allRootTasks = manager.getTaskList().getDefaultCategory().getChildren();	173	Collection<AbstractTask> allRootTasks = manager.getTaskList().getDefaultCategory().getChildren();
174	Set<AbstractTaskCategory> allCategories = manager.getTaskList().getCategories();	174	Set<AbstractTaskCategory> allCategories = manager.getTaskList().getCategories();
175	Set<AbstractTaskContainer> allRoots = manager.getTaskList().getRootElements();	175	Set<AbstractTaskContainer> allRoots = manager.getTaskList().getRootElements();
176	assertEquals(0, allRootTasks.size());	176	assertEquals(0, allRootTasks.size());

Lines 11-16 Link Here

(-)src/org/eclipse/mylyn/internal/sandbox/bridge/bugs/BugzillaMylynSearchOperation.java (-2 / +3 lines)
11	package org.eclipse.mylyn.internal.sandbox.bridge.bugs;	11	package org.eclipse.mylyn.internal.sandbox.bridge.bugs;
12		12
13	import java.util.ArrayList;	13	import java.util.ArrayList;
		14	import java.util.Collection;
14	import java.util.HashSet;	15	import java.util.HashSet;
15	import java.util.Iterator;	16	import java.util.Iterator;
16	import java.util.List;	17	import java.util.List;
Lines 210-217 Link Here
210	* @param monitor	211	* @param monitor
211	* The progress monitor	212	* The progress monitor
212	*/	213	*/
213	private void searchLocal(Set<AbstractTask> tasks, ProgressQueryHitCollector searchCollector, String elementName,	214	private void searchLocal(Collection<AbstractTask> tasks, ProgressQueryHitCollector searchCollector,
214	IProgressMonitor monitor) {	215	String elementName, IProgressMonitor monitor) {
215	if (tasks == null) {	216	if (tasks == null) {
216	return;	217	return;
217	}	218	}




package org.eclipse.mylyn.internal.tasks.ui.views;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;

		if (containsNoFilterText((this.taskListView.getFilteredTree().getFilterControl()).getText())) {
			List<AbstractTaskContainer> children = new ArrayList<AbstractTaskContainer>();
			if (parent instanceof AbstractTask) {
				Collection<AbstractTask> subTasks = ((AbstractTask) parent).getChildren();
				for (AbstractTask t : subTasks) {
					if (!filter(parent, t)) {
						children.add(t);

	private List<AbstractTaskContainer> getFilteredRootChildren(AbstractTaskContainer parent) {
		List<AbstractTaskContainer> result = new ArrayList<AbstractTaskContainer>();
		if (TasksUiPlugin.getDefault().groupSubtasks(parent)) {
			Collection<AbstractTask> parentTasks = parent.getChildren();
			Set<AbstractTaskContainer> parents = new HashSet<AbstractTaskContainer>();
			Set<AbstractTask> children = new HashSet<AbstractTask>();
			// get all children




package org.eclipse.mylyn.internal.tasks.ui.search;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.eclipse.jface.viewers.Viewer;
import org.eclipse.mylyn.internal.tasks.core.Person;


	public Object[] getChildren(Object parentElement) {
		if (selectedGroup == GroupBy.OWNER && parentElement instanceof Person) {
			Collection<AbstractTask> children = ((Person) parentElement).getChildren();
			if (children != null) {
				return children.toArray();
			} else {
				return EMPTY_ARR;
			}
		} else if (selectedGroup == GroupBy.COMPLETION && parentElement instanceof TaskGroup) {
			Collection<AbstractTask> children = ((TaskGroup) parentElement).getChildren();
			if (children != null) {
				return children.toArray();
			} else {


	public boolean hasChildren(Object element) {
		if (selectedGroup == GroupBy.OWNER && element instanceof String) {
			Collection<AbstractTask> children = ((Person) element).getChildren();
			if (children != null) {
				return !children.isEmpty();
			} else {




 *******************************************************************************/
package org.eclipse.mylyn.internal.tasks.ui;

import java.util.Collection;

import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
import org.eclipse.mylyn.tasks.core.AbstractTask;

	}

	private static boolean hasDescendantIncoming(AbstractTaskContainer container, int depth) {
		Collection<AbstractTask> children = container.getChildren();
		if (children == null || depth <= 0) {
			return false;
		}

	}

	private static boolean hasIncompleteDescendant(AbstractTaskContainer container, int depth) {
		Collection<AbstractTask> children = container.getChildren();
		if (children == null || depth <= 0) {
			return false;
		}




import java.io.IOException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;

		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), task.getConnectorKind(),
				task.getRepositoryUrl(), task.getTaskId(), task.getTaskKind());
		TasksUiPlugin.getTaskDataStorageManager().setNewTaskData(taskData);
		assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task.getRepositoryUrl(),
				task.getTaskId()));

		RepositoryTaskData taskData2 = new RepositoryTaskData(new MockAttributeFactory(), task2.getConnectorKind(),
				task2.getRepositoryUrl(), task2.getTaskId(), task2.getTaskKind());
		taskData2.setNewComment("TEST");
		TasksUiPlugin.getTaskDataStorageManager().setNewTaskData(taskData2);
		assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task2.getRepositoryUrl(),
				task2.getTaskId()));
		assertEquals("TEST", TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task2.getRepositoryUrl(),
				task2.getTaskId()).getNewComment());


		assertNull(manager.getTaskList().getTask("http://a-123"));
		assertNotNull(manager.getTaskList().getTask("http://b-123"));
		assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData("http://b", "123"));
		RepositoryTaskData otherData = TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(
				task2.getRepositoryUrl(), task2.getTaskId());
		assertNotNull(otherData);
		assertEquals("TEST", otherData.getNewComment());
	}

//		assertTrue(rootTasks.containsAll(manager.getTaskList().getOrphanContainer(
//				LocalRepositoryConnector.REPOSITORY_URL).getChildren()));

		Collection<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
		for (AbstractTask task : readList) {
			if (task.equals(task1)) {
				assertEquals(task1.getSummary(), task.getSummary());

//		assertTrue(rootTasks.containsAll(manager.getTaskList().getOrphanContainer(
//				LocalRepositoryConnector.REPOSITORY_URL).getChildren()));

		Collection<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
		for (AbstractTask task : readList) {
			if (task.equals(task1)) {
				assertEquals(task1.getSummary(), task.getSummary());

Lines 8-14 Link Here

(-)src/org/eclipse/mylyn/tasks/tests/TaskListDnDTest.java (-2 / +2 lines)
8		8
9	package org.eclipse.mylyn.tasks.tests;	9	package org.eclipse.mylyn.tasks.tests;
10		10
11	import java.util.Set;	11	import java.util.Collection;
12		12
13	import junit.framework.TestCase;	13	import junit.framework.TestCase;
14		14
Lines 65-71 Link Here
65	String urlData = url + "\n" + title;	65	String urlData = url + "\n" + title;
66		66
67	dropAdapter.performDrop(urlData);	67	dropAdapter.performDrop(urlData);
68	Set<AbstractTask> tasks = manager.getTaskList().getDefaultCategory().getChildren();	68	Collection<AbstractTask> tasks = manager.getTaskList().getDefaultCategory().getChildren();
69	assertNotNull(tasks);	69	assertNotNull(tasks);
70	assertEquals(1, tasks.size());	70	assertEquals(1, tasks.size());
71	assertEquals(url, tasks.iterator().next().getUrl());	71	assertEquals(url, tasks.iterator().next().getUrl());

Lines 7-16 Link Here

(-)src/org/eclipse/mylyn/tasks/core/AbstractTaskContainer.java (-9 / +12 lines)
7	*******************************************************************************/	7	*******************************************************************************/
8	package org.eclipse.mylyn.tasks.core;	8	package org.eclipse.mylyn.tasks.core;
9		9
		10	import java.util.Collection;
10	import java.util.Collections;	11	import java.util.Collections;
11	import java.util.HashSet;	12	import java.util.HashSet;
12	import java.util.Set;	13	import java.util.Set;
13	import java.util.concurrent.CopyOnWriteArraySet;	14	import java.util.concurrent.CopyOnWriteArrayList;
14		15
15	import org.eclipse.core.runtime.Assert;	16	import org.eclipse.core.runtime.Assert;
16	import org.eclipse.core.runtime.PlatformObject;	17	import org.eclipse.core.runtime.PlatformObject;
Lines 27-33 Link Here
27		28
28	private String handleIdentifier = "";	29	private String handleIdentifier = "";
29		30
30	private final Set<AbstractTask> children = new CopyOnWriteArraySet<AbstractTask>();	31	private final Collection<AbstractTask> children = new CopyOnWriteArrayList<AbstractTask>();
31		32
32	/**	33	/**
33	* Optional URL corresponding to the web resource associated with this container.	34	* Optional URL corresponding to the web resource associated with this container.
Lines 61-69 Link Here
61	* Removes any cyclic dependencies in children.	62	* Removes any cyclic dependencies in children.
62	*	63	*
63	* TODO: review to make sure that this is too expensive, or move to creation.	64	* TODO: review to make sure that this is too expensive, or move to creation.
		65	*
		66	* @since 3.0
64	*/	67	*/
65	public Set<AbstractTask> getChildren() {	68	public Collection<AbstractTask> getChildren() {
66	return Collections.unmodifiableSet(children);	69	return Collections.unmodifiableCollection(children);
67	}	70	}
68		71
69	/**	72	/**
Lines 71-80 Link Here
71	*	74	*
72	* API-3.0: remove this method (bug 207659)	75	* API-3.0: remove this method (bug 207659)
73	*	76	*
74	* @since 2.2	77	* @since 3.0
75	*/	78	*/
76	public Set<AbstractTask> getChildrenInternal() {	79	public Collection<AbstractTask> getChildrenInternal() {
77	return Collections.unmodifiableSet(children);	80	return Collections.unmodifiableCollection(children);
78	}	81	}
79		82
80	/**	83	/**
Lines 87-93 Link Here
87	return containsHelper(getChildrenInternal(), handle, new HashSet<AbstractTaskContainer>());	90	return containsHelper(getChildrenInternal(), handle, new HashSet<AbstractTaskContainer>());
88	}	91	}
89		92
90	private boolean containsHelper(Set<AbstractTask> children, String handle,	93	private boolean containsHelper(Collection<AbstractTask> children, String handle,
91	Set<AbstractTaskContainer> visitedContainers) {	94	Set<AbstractTaskContainer> visitedContainers) {
92	for (AbstractTask child : children) {	95	for (AbstractTask child : children) {
93	if (visitedContainers.contains(child)) {	96	if (visitedContainers.contains(child)) {
Lines 155-161 Link Here
155		158
156	public String getPriority() {	159	public String getPriority() {
157	String highestPriority = PriorityLevel.P5.toString();	160	String highestPriority = PriorityLevel.P5.toString();
158	Set<AbstractTask> tasks = getChildren();	161	Collection<AbstractTask> tasks = getChildren();
159	if (tasks.isEmpty()) {	162	if (tasks.isEmpty()) {
160	return PriorityLevel.P1.toString();	163	return PriorityLevel.P1.toString();
161	}	164	}




package org.eclipse.mylyn.internal.tasks.core;

import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.Set;


	}

	@Override
	public Collection<AbstractTask> getChildren() {
		return task.getChildren();
	}


	}

	@Override
	public Collection<AbstractTask> getChildrenInternal() {
		return task.getChildrenInternal();
	}





package org.eclipse.mylyn.internal.tasks.core;

import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashSet;

	}

	@Override
	public Collection<AbstractTask> getChildren() {
		Set<AbstractTask> children = new HashSet<AbstractTask>();
		Calendar beginning = TaskActivityUtil.getCalendar();
		beginning.setTimeInMillis(0);

	}

	@Override
	public Collection<AbstractTask> getChildrenInternal() {
		return getChildren();
	}


Lines 1-2 Link Here

(-).refactorings/2008/4/18/refactorings.index (+2 lines)
1	1209358992572 Rename method 'createWorkingCopy'	1	1209358992572 Rename method 'createWorkingCopy'
2	1209364083738 Rename method 'getStatus'	2	1209364083738 Rename method 'getStatus'
		3	1209451931458 Change method 'getChildren'
		4	1209451956451 Change method 'getChildrenInternal'

Lines 1-3 Link Here

(-).refactorings/2008/4/18/refactorings.history (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<session version="1.0"> <refactoring comment="Rename method 'org.eclipse.mylyn.tasks.core.data.ITaskDataManager.createWorkingCopy(...)' to 'getWorkingCopy' - Original project: 'org.eclipse.mylyn.tasks.core' - Original element: 'org.eclipse.mylyn.tasks.core.data.ITaskDataManager.createWorkingCopy(...)' - Renamed element: 'org.eclipse.mylyn.tasks.core.data.ITaskDataManager.getWorkingCopy(...)' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'createWorkingCopy'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.tasks.core.data{ITaskDataManager.java[ITaskDataManager~createWorkingCopy~QAbstractTask;~QString;" name="getWorkingCopy" references="true" stamp="1209358992572" version="1.0"/> <refactoring comment="Rename method 'org.eclipse.mylyn.tasks.core.sync.SubmitJob.getStatus()' to 'getError' - Original project: 'org.eclipse.mylyn.tasks.core' - Original element: 'org.eclipse.mylyn.tasks.core.sync.SubmitJob.getStatus()' - Renamed element: 'org.eclipse.mylyn.tasks.core.sync.SubmitJob.getError()' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'getStatus'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.tasks.core.sync{SubmitJob.java[SubmitJob~getStatus" name="getError" references="true" stamp="1209364083738" version="1.0"/>	2	<session version="1.0"> <refactoring comment="Rename method 'org.eclipse.mylyn.tasks.core.data.ITaskDataManager.createWorkingCopy(...)' to 'getWorkingCopy' - Original project: 'org.eclipse.mylyn.tasks.core' - Original element: 'org.eclipse.mylyn.tasks.core.data.ITaskDataManager.createWorkingCopy(...)' - Renamed element: 'org.eclipse.mylyn.tasks.core.data.ITaskDataManager.getWorkingCopy(...)' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'createWorkingCopy'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.tasks.core.data{ITaskDataManager.java[ITaskDataManager~createWorkingCopy~QAbstractTask;~QString;" name="getWorkingCopy" references="true" stamp="1209358992572" version="1.0"/> <refactoring comment="Rename method 'org.eclipse.mylyn.tasks.core.sync.SubmitJob.getStatus()' to 'getError' - Original project: 'org.eclipse.mylyn.tasks.core' - Original element: 'org.eclipse.mylyn.tasks.core.sync.SubmitJob.getStatus()' - Renamed element: 'org.eclipse.mylyn.tasks.core.sync.SubmitJob.getError()' - Update references to refactored element" delegate="false" deprecate="false" description="Rename method 'getStatus'" flags="589830" id="org.eclipse.jdt.ui.rename.method" input="/src<org.eclipse.mylyn.tasks.core.sync{SubmitJob.java[SubmitJob~getStatus" name="getError" references="true" stamp="1209364083738" version="1.0"/> <refactoring comment="Change method 'public Set<AbstractTask> org.eclipse.mylyn.tasks.core.AbstractTaskContainer.getChildren()' to 'public Collection<AbstractTask> getChildren()' - Original project: 'org.eclipse.mylyn.tasks.core' - Original element: 'org.eclipse.mylyn.tasks.core.AbstractTaskContainer.getChildren()' - New return type: 'Collection<AbstractTask>'" delegate="false" deprecate="true" description="Change method 'getChildren'" flags="589830" id="org.eclipse.jdt.ui.change.method.signature" input="/src<org.eclipse.mylyn.tasks.core{AbstractTaskContainer.java[AbstractTaskContainer~getChildren" name="getChildren" return="Collection<AbstractTask>" stamp="1209451931458" version="1.0"/> <refactoring comment="Change method 'public Set<AbstractTask> org.eclipse.mylyn.tasks.core.AbstractTaskContainer.getChildrenInternal()' to 'public Collection<AbstractTask> getChildrenInternal()' - Original project: 'org.eclipse.mylyn.tasks.core' - Original element: 'org.eclipse.mylyn.tasks.core.AbstractTaskContainer.getChildrenInternal()' - New return type: 'Collection<AbstractTask>'" delegate="false" deprecate="true" description="Change method 'getChildrenInternal'" flags="589830" id="org.eclipse.jdt.ui.change.method.signature" input="/src<org.eclipse.mylyn.tasks.core{AbstractTaskContainer.java[AbstractTaskContainer~getChildrenInternal" name="getChildrenInternal" return="Collection<AbstractTask>" stamp="1209451956451" version="1.0"/>
3	</session>	3	</session>

Return to bug 168878

Lines 9-15 Link Here

(-)src/org/eclipse/mylyn/internal/context/ui/TaskListInterestFilter.java (-4 / +4 lines)
9	package org.eclipse.mylyn.internal.context.ui;	9	package org.eclipse.mylyn.internal.context.ui;
10		10
11	import java.util.Calendar;	11	import java.util.Calendar;
12	import java.util.Set;	12	import java.util.Collection;
13		13
14	import org.eclipse.core.runtime.IStatus;	14	import org.eclipse.core.runtime.IStatus;
15	import org.eclipse.core.runtime.Status;	15	import org.eclipse.core.runtime.Status;
Lines 51-57 Link Here
51	}	51	}
52	}	52	}
53	} else if (child instanceof AbstractTaskContainer) {	53	} else if (child instanceof AbstractTaskContainer) {
54	Set<AbstractTask> children = ((AbstractTaskContainer) child).getChildren();	54	Collection<AbstractTask> children = ((AbstractTaskContainer) child).getChildren();
55	// Always display empty containers	55	// Always display empty containers
56	if (children.size() == 0) {	56	if (children.size() == 0) {
57	return false;	57	return false;
Lines 95-102 Link Here
95	\|\| !task.isCompleted()	95	\|\| !task.isCompleted()
96	&& (LocalRepositoryConnector.DEFAULT_SUMMARY.equals(task.getSummary())	96	&& (LocalRepositoryConnector.DEFAULT_SUMMARY.equals(task.getSummary())
97	\|\| shouldShowInFocusedWorkweekDateContainer(parent, task)	97	\|\| shouldShowInFocusedWorkweekDateContainer(parent, task)
98	\|\| TasksUiPlugin.getTaskActivityManager().isOverdue(task) \|\| isInterestingForThisWeek(parent, task) \|\| hasInterestingSubTasks(	98	\|\| TasksUiPlugin.getTaskActivityManager().isOverdue(task)
99	parent, task, depth));	99	\|\| isInterestingForThisWeek(parent, task) \|\| hasInterestingSubTasks(parent, task, depth));
100	}	100	}
101		101
102	private boolean hasInterestingSubTasks(Object parent, AbstractTask task, int depth) {	102	private boolean hasInterestingSubTasks(Object parent, AbstractTask task, int depth) {

Lines 9-14 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java (-2 / +3 lines)
9	package org.eclipse.mylyn.internal.tasks.ui.views;	9	package org.eclipse.mylyn.internal.tasks.ui.views;
10		10
11	import java.util.ArrayList;	11	import java.util.ArrayList;
		12	import java.util.Collection;
12	import java.util.Collections;	13	import java.util.Collections;
13	import java.util.HashSet;	14	import java.util.HashSet;
14	import java.util.Iterator;	15	import java.util.Iterator;
Lines 138-144 Link Here
138	if (containsNoFilterText((this.taskListView.getFilteredTree().getFilterControl()).getText())) {	139	if (containsNoFilterText((this.taskListView.getFilteredTree().getFilterControl()).getText())) {
139	List<AbstractTaskContainer> children = new ArrayList<AbstractTaskContainer>();	140	List<AbstractTaskContainer> children = new ArrayList<AbstractTaskContainer>();
140	if (parent instanceof AbstractTask) {	141	if (parent instanceof AbstractTask) {
141	Set<AbstractTask> subTasks = ((AbstractTask) parent).getChildren();	142	Collection<AbstractTask> subTasks = ((AbstractTask) parent).getChildren();
142	for (AbstractTask t : subTasks) {	143	for (AbstractTask t : subTasks) {
143	if (!filter(parent, t)) {	144	if (!filter(parent, t)) {
144	children.add(t);	145	children.add(t);
Lines 164-170 Link Here
164	private List<AbstractTaskContainer> getFilteredRootChildren(AbstractTaskContainer parent) {	165	private List<AbstractTaskContainer> getFilteredRootChildren(AbstractTaskContainer parent) {
165	List<AbstractTaskContainer> result = new ArrayList<AbstractTaskContainer>();	166	List<AbstractTaskContainer> result = new ArrayList<AbstractTaskContainer>();
166	if (TasksUiPlugin.getDefault().groupSubtasks(parent)) {	167	if (TasksUiPlugin.getDefault().groupSubtasks(parent)) {
167	Set<AbstractTask> parentTasks = parent.getChildren();	168	Collection<AbstractTask> parentTasks = parent.getChildren();
168	Set<AbstractTaskContainer> parents = new HashSet<AbstractTaskContainer>();	169	Set<AbstractTaskContainer> parents = new HashSet<AbstractTaskContainer>();
169	Set<AbstractTask> children = new HashSet<AbstractTask>();	170	Set<AbstractTask> children = new HashSet<AbstractTask>();
170	// get all children	171	// get all children

Lines 12-17 Link Here

(-)src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java (-6 / +9 lines)
12	import java.io.IOException;	12	import java.io.IOException;
13	import java.util.ArrayList;	13	import java.util.ArrayList;
14	import java.util.Calendar;	14	import java.util.Calendar;
		15	import java.util.Collection;
15	import java.util.Date;	16	import java.util.Date;
16	import java.util.HashSet;	17	import java.util.HashSet;
17	import java.util.Iterator;	18	import java.util.Iterator;
Lines 229-241 Link Here
229	RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), task.getConnectorKind(),	230	RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), task.getConnectorKind(),
230	task.getRepositoryUrl(), task.getTaskId(), task.getTaskKind());	231	task.getRepositoryUrl(), task.getTaskId(), task.getTaskKind());
231	TasksUiPlugin.getTaskDataStorageManager().setNewTaskData(taskData);	232	TasksUiPlugin.getTaskDataStorageManager().setNewTaskData(taskData);
232	assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()));	233	assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task.getRepositoryUrl(),
		234	task.getTaskId()));
233		235
234	RepositoryTaskData taskData2 = new RepositoryTaskData(new MockAttributeFactory(), task2.getConnectorKind(),	236	RepositoryTaskData taskData2 = new RepositoryTaskData(new MockAttributeFactory(), task2.getConnectorKind(),
235	task2.getRepositoryUrl(), task2.getTaskId(), task2.getTaskKind());	237	task2.getRepositoryUrl(), task2.getTaskId(), task2.getTaskKind());
236	taskData2.setNewComment("TEST");	238	taskData2.setNewComment("TEST");
237	TasksUiPlugin.getTaskDataStorageManager().setNewTaskData(taskData2);	239	TasksUiPlugin.getTaskDataStorageManager().setNewTaskData(taskData2);
238	assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task2.getRepositoryUrl(), task2.getTaskId()));	240	assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task2.getRepositoryUrl(),
		241	task2.getTaskId()));
239	assertEquals("TEST", TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task2.getRepositoryUrl(),	242	assertEquals("TEST", TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task2.getRepositoryUrl(),
240	task2.getTaskId()).getNewComment());	243	task2.getTaskId()).getNewComment());
241		244
Lines 243-250 Link Here
243	assertNull(manager.getTaskList().getTask("http://a-123"));	246	assertNull(manager.getTaskList().getTask("http://a-123"));
244	assertNotNull(manager.getTaskList().getTask("http://b-123"));	247	assertNotNull(manager.getTaskList().getTask("http://b-123"));
245	assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData("http://b", "123"));	248	assertNotNull(TasksUiPlugin.getTaskDataStorageManager().getNewTaskData("http://b", "123"));
246	RepositoryTaskData otherData = TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(task2.getRepositoryUrl(),	249	RepositoryTaskData otherData = TasksUiPlugin.getTaskDataStorageManager().getNewTaskData(
247	task2.getTaskId());	250	task2.getRepositoryUrl(), task2.getTaskId());
248	assertNotNull(otherData);	251	assertNotNull(otherData);
249	assertEquals("TEST", otherData.getNewComment());	252	assertEquals("TEST", otherData.getNewComment());
250	}	253	}
Lines 672-678 Link Here
672	// assertTrue(rootTasks.containsAll(manager.getTaskList().getOrphanContainer(	675	// assertTrue(rootTasks.containsAll(manager.getTaskList().getOrphanContainer(
673	// LocalRepositoryConnector.REPOSITORY_URL).getChildren()));	676	// LocalRepositoryConnector.REPOSITORY_URL).getChildren()));
674		677
675	Set<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();	678	Collection<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
676	for (AbstractTask task : readList) {	679	for (AbstractTask task : readList) {
677	if (task.equals(task1)) {	680	if (task.equals(task1)) {
678	assertEquals(task1.getSummary(), task.getSummary());	681	assertEquals(task1.getSummary(), task.getSummary());
Lines 737-743 Link Here
737	// assertTrue(rootTasks.containsAll(manager.getTaskList().getOrphanContainer(	740	// assertTrue(rootTasks.containsAll(manager.getTaskList().getOrphanContainer(
738	// LocalRepositoryConnector.REPOSITORY_URL).getChildren()));	741	// LocalRepositoryConnector.REPOSITORY_URL).getChildren()));
739		742
740	Set<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();	743	Collection<AbstractTask> readList = manager.getTaskList().getDefaultCategory().getChildren();
741	for (AbstractTask task : readList) {	744	for (AbstractTask task : readList) {
742	if (task.equals(task1)) {	745	if (task.equals(task1)) {
743	assertEquals(task1.getSummary(), task.getSummary());	746	assertEquals(task1.getSummary(), task.getSummary());